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>

12 files changed, 5 insertions, 5 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 3b2486029..3d036b8ff 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = curl
+SUBDIRS = gnurl
 
 EXTRA_DIST = README
 
diff --git a/include/README b/include/README
index 9e865aa11..0fc8f66d9 100644
--- a/include/README
+++ b/include/README
@@ -9,7 +9,7 @@ Include files for libcurl, external users.
 They're all placed in the curl subdirectory here for better fit in any kind
 of environment. You must include files from here using...
 
-        #include <curl/curl.h>
+        #include <gnurl/curl.h>
 
 ... style and point the compiler's include path to the directory holding the
 curl subdirectory. It makes it more likely to survive future modifications.
diff --git a/include/curl/.gitignore b/include/gnurl/.gitignore
index 555795fae..555795fae 100644
--- a/include/curl/.gitignore
+++ b/include/gnurl/.gitignore
diff --git a/include/curl/Makefile.am b/include/gnurl/Makefile.am
index 989d4a218..09f6cb152 100644
--- a/include/curl/Makefile.am
+++ b/include/gnurl/Makefile.am
@@ -23,10 +23,10 @@ pkginclude_HEADERS = \
 	curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
 	typecheck-gcc.h system.h
 
-pkgincludedir= $(includedir)/curl
+pkgincludedir= $(includedir)/gnurl
 
 checksrc:
-	@@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/include/curl $(pkginclude_HEADERS)
+	@@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/include/gnurl $(pkginclude_HEADERS)
 
 if CURLDEBUG
 # for debug builds, we scan the sources on all regular make invokes
diff --git a/include/curl/curl.h b/include/gnurl/curl.h
index 82fb8aeb8..82fb8aeb8 100644
--- a/include/curl/curl.h
+++ b/include/gnurl/curl.h
diff --git a/include/curl/curlver.h b/include/gnurl/curlver.h
index 2165d55b1..2165d55b1 100644
--- a/include/curl/curlver.h
+++ b/include/gnurl/curlver.h
diff --git a/include/curl/easy.h b/include/gnurl/easy.h
index 752c5049f..752c5049f 100644
--- a/include/curl/easy.h
+++ b/include/gnurl/easy.h
diff --git a/include/curl/mprintf.h b/include/gnurl/mprintf.h
index e20f546e1..e20f546e1 100644
--- a/include/curl/mprintf.h
+++ b/include/gnurl/mprintf.h
diff --git a/include/curl/multi.h b/include/gnurl/multi.h
index f93e511be..46d979853 100644
--- a/include/curl/multi.h
+++ b/include/gnurl/multi.h
@@ -40,7 +40,7 @@
 /*
  * This header file should not really need to include "curl.h" since curl.h
  * itself includes this file and we expect user applications to do #include
- * <curl/curl.h> without the need for especially including multi.h.
+ * <gnurl/curl.h> without the need for especially including multi.h.
  *
  * For some reason we added this include here at one point, and rather than to
  * break existing (wrongly written) libcurl applications, we leave it as-is
diff --git a/include/curl/stdcheaders.h b/include/gnurl/stdcheaders.h
index 027b6f421..027b6f421 100644
--- a/include/curl/stdcheaders.h
+++ b/include/gnurl/stdcheaders.h
diff --git a/include/curl/system.h b/include/gnurl/system.h
index 95c72d998..95c72d998 100644
--- a/include/curl/system.h
+++ b/include/gnurl/system.h
diff --git a/include/curl/typecheck-gcc.h b/include/gnurl/typecheck-gcc.h
index 74548241b..74548241b 100644
--- a/include/curl/typecheck-gcc.h
+++ b/include/gnurl/typecheck-gcc.h