Patchset for gnURL microfork:gnurl-7.55.1gnurl-7_55_1

* Patches to rename libcurl to libgnurl by Christian
* Updated for latest curl using git cherry-pick by Jeff, Florian, ng0
* Patches to fix the testsuite (deleted tests/data/test1139, renamed
reference from libcurl.* to libgnurl.*) by ng0
* Added guix-gnurl.scm which can be used to build this with guix prior
to installing it. (author: ng0)
* Further adjustments by ng0
* 7.55.0: Manual addition of a7bbbb7c368c6096802007f61f19a02e9d75285b and f864bd8c880d5a916379aa4f26f1c45fe370b282 from upstream master.
* 7.55.1: Renamed include/curl to include/gnurl, a partial fix of https://gnunet.org/bugs/view.php?id=5122

Signed-off-by: ng0 <ng0@infotropique.org>

9 files changed, 25 insertions, 24 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index de188be66..6e50d82ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,7 +56,7 @@ source_group("curl header files" FILES ${CURL_HFILES})
 include_directories(
   ${CURL_SOURCE_DIR}/lib        # To be able to reach "curl_setup_once.h"
   ${CURL_BINARY_DIR}/lib        # To be able to reach "curl_config.h"
-  ${CURL_BINARY_DIR}/include    # To be able to reach "curl/curl.h"
+  ${CURL_BINARY_DIR}/include    # To be able to reach "gnurl/curl.h"
   # This is needed as tool_hugehelp.c is generated in the binary dir
   ${CURL_SOURCE_DIR}/src        # To be able to reach "tool_hugehelp.h"
   )
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 25cd3bf88..67e542d7a 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -47,7 +47,7 @@
 !ifdef %libname
 LIBNAME = $(%libname)
 !else
-LIBNAME = libcurl
+LIBNAME = libgnurl
 !endif
 
 TARGETS = curl.exe
diff --git a/src/Makefile.am b/src/Makefile.am
index bfcd877fc..a6bab6bdc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_srcdir)/lib            \
               -I$(top_srcdir)/src
 
-bin_PROGRAMS = curl
+bin_PROGRAMS = gnurl
 
 SUBDIRS = ../docs
 
@@ -52,7 +52,7 @@ endif
 include Makefile.inc
 
 # CURL_FILES comes from Makefile.inc
-curl_SOURCES = $(CURL_FILES)
+gnurl_SOURCES = $(CURL_FILES)
 
 # This might hold -Werror
 CFLAGS += @CURL_CFLAG_EXTRAS@
@@ -61,16 +61,16 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
 LIBS = $(BLANK_AT_MAKETIME)
 
 if USE_EXPLICIT_LIB_DEPS
-curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
+gnurl_LDADD = $(top_builddir)/lib/libgnurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
 else
-curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
+gnurl_LDADD = $(top_builddir)/lib/libgnurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
 endif
 
-curl_LDFLAGS = @LIBMETALINK_LDFLAGS@
-curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
+gnurl_LDFLAGS = @LIBMETALINK_LDFLAGS@
+gnurl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
 
 @CODE_COVERAGE_RULES@
-curl_LDFLAGS += $(CODE_COVERAGE_LDFLAGS)
+gnurl_LDFLAGS += $(CODE_COVERAGE_LDFLAGS)
 CFLAGS += $(CODE_COVERAGE_CFLAGS)
 
 # if unit tests are enabled, build a static library to link them with
@@ -80,7 +80,7 @@ libcurltool_la_CPPFLAGS = $(LIBMETALINK_CPPFLAGS) $(AM_CPPFLAGS) \
                           -DCURL_STATICLIB -DUNITTESTS
 libcurltool_la_CFLAGS =
 libcurltool_la_LDFLAGS = -static $(LINKFLAGS)
-libcurltool_la_SOURCES = $(curl_SOURCES)
+libcurltool_la_SOURCES = $(gnurl_SOURCES)
 endif
 
 CLEANFILES = tool_hugehelp.c
@@ -94,7 +94,8 @@ EXTRA_DIST = mkhelp.pl makefile.dj Makefile.b32		\
  curl.rc Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt
 
 # Use absolute directory to disable VPATH
-MANPAGE=$(abs_top_builddir)/docs/curl.1
+MANPAGE=$(abs_top_builddir)/docs/gnurl.1
+
 README=$(top_srcdir)/docs/MANUAL
 MKHELP=$(top_srcdir)/src/mkhelp.pl
 HUGE=tool_hugehelp.c
diff --git a/src/Makefile.b32 b/src/Makefile.b32
index a60b3db74..6bcdcd700 100644
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -72,9 +72,9 @@ LINKLIB  = $(BCCDIR)\lib\cw32mt.lib $(BCCDIR)\lib\ws2_32.lib
 DEFINES  = -DNDEBUG -DWIN32
 
 !ifdef DYNAMIC
-LIBCURL_LIB = ..\lib\libcurl_imp.lib
+LIBCURL_LIB = ..\lib\libgnurl_imp.lib
 !else
-LIBCURL_LIB = ..\lib\libcurl.lib
+LIBCURL_LIB = ..\lib\libgnurl.lib
 DEFINES = $(DEFINES) -DCURL_STATICLIB
 !endif
 
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 315cd5cb3..22e11e8e0 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -208,11 +208,11 @@ endif
 INCLUDES = -I. -I../include -I../lib
 
 ifdef DYN
-  curl_DEPENDENCIES = $(PROOT)/lib/libcurldll.a $(PROOT)/lib/libcurl.dll
-  curl_LDADD = -L$(PROOT)/lib -lcurldll
+  curl_DEPENDENCIES = $(PROOT)/lib/libgnurldll.a $(PROOT)/lib/libgnurl.dll
+  curl_LDADD = -L$(PROOT)/lib -lgnurldll
 else
-  curl_DEPENDENCIES = $(PROOT)/lib/libcurl.a
-  curl_LDADD = -L$(PROOT)/lib -lcurl
+  curl_DEPENDENCIES = $(PROOT)/lib/libgnurl.a
+  curl_LDADD = -L$(PROOT)/lib -lgnurl
   CFLAGS += -DCURL_STATICLIB
   LDFLAGS += -static
 endif
diff --git a/src/Makefile.netware b/src/Makefile.netware
index a927da592..975551e0a 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -265,13 +265,13 @@ ENABLE_IPV6 = 1
 endif
 
 ifdef LINK_STATIC
-	LDLIBS	= $(CURL_LIB)/libcurl.$(LIBEXT)
+	LDLIBS	= $(CURL_LIB)/libgnurl.$(LIBEXT)
 ifdef WITH_ARES
 	LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
 endif
 else
-	MODULES	= libcurl.nlm
-	IMPORTS	= @$(CURL_LIB)/libcurl.imp
+	MODULES	= libgnurl.nlm
+	IMPORTS	= @$(CURL_LIB)/libgnurl.imp
 endif
 ifdef WITH_SSH2
 	# INCLUDES += -I$(LIBSSH2_PATH)/include
@@ -395,7 +395,7 @@ $(OBJDIR)/%.o: %.c
 #	@echo Compiling $<
 	$(CC) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)/version.inc: $(CURL_INC)/curl/curlver.h $(OBJDIR)
+$(OBJDIR)/version.inc: $(CURL_INC)/gnurl/curlver.h $(OBJDIR)
 	@echo Creating $@
 	@$(AWK) -f ../packages/NetWare/get_ver.awk $< > $@
 
diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c
index c2dccf9fb..e3c9d1aa1 100644
--- a/src/tool_easysrc.c
+++ b/src/tool_easysrc.c
@@ -50,7 +50,7 @@ static const char *const srchead[]={
   " * All curl_easy_setopt() options are documented at:",
   " * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html",
   " ************************************************************************/",
-  "#include <curl/curl.h>",
+  "#include <gnurl/curl.h>",
   "",
   "int main(int argc, char *argv[])",
   "{",
diff --git a/src/tool_setup.h b/src/tool_setup.h
index 90b01d7e9..2b2b9527b 100644
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -39,7 +39,7 @@
  * curl tool certainly uses libcurl's external interface.
  */
 
-#include <curl/curl.h> /* external interface */
+#include <gnurl/curl.h> /* external interface */
 
 /*
  * Platform specific stuff.
diff --git a/src/tool_version.h b/src/tool_version.h
index 04f45671e..b18a852ea 100644
--- a/src/tool_version.h
+++ b/src/tool_version.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include <curl/curlver.h>
+#include <gnurl/curlver.h>
 
 #define CURL_NAME "curl"
 #define CURL_COPYRIGHT LIBCURL_COPYRIGHT