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>

15 files changed, 14 insertions, 41 deletions

diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 1657ac67a..103036040 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -119,7 +119,7 @@ test1104 test1105 test1106 test1107 test1108 test1109 test1110 test1111 \
 test1112 test1113 test1114 test1115 test1116 test1117 test1118 test1119 \
 test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \
 test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \
-test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \
+test1136 test1137 test1138 test1140 test1141 test1142 test1143 \
 test1144 test1145 test1146 test1147 test1148 \
 test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
 test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \
diff --git a/tests/data/test1013 b/tests/data/test1013
index 9a1e6d4e3..244dcf599 100644
--- a/tests/data/test1013
+++ b/tests/data/test1013
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --protocols
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1013 protocols
+%SRCDIR/libtest/test1013.pl ../gnurl-config log/stdout1013 protocols
 </postcheck>
 </client>
 
diff --git a/tests/data/test1014 b/tests/data/test1014
index 5116aad7c..e00defa81 100644
--- a/tests/data/test1014
+++ b/tests/data/test1014
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --features
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1014 features
+%SRCDIR/libtest/test1013.pl ../gnurl-config log/stdout1014 features
 </postcheck>
 </client>
 
diff --git a/tests/data/test1022 b/tests/data/test1022
index 6a8b01258..ecd83a332 100644
--- a/tests/data/test1022
+++ b/tests/data/test1022
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --version
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1022 version
+%SRCDIR/libtest/test1022.pl ../gnurl-config log/stdout1022 version
 </postcheck>
 </client>
 
diff --git a/tests/data/test1023 b/tests/data/test1023
index 9c916a085..5f4d756ae 100644
--- a/tests/data/test1023
+++ b/tests/data/test1023
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --vernum
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1023 vernum
+%SRCDIR/libtest/test1022.pl ../gnurl-config log/stdout1023 vernum
 </postcheck>
 </client>
 
diff --git a/tests/data/test1139 b/tests/data/test1139
deleted file mode 100644
index 72761c670..000000000
--- a/tests/data/test1139
+++ /dev/null
@@ -1,27 +0,0 @@
-<testcase>
-<info>
-<keywords>
-source analysis
-symbols-in-versions
-documentation
---manual
-</keywords>
-</info>
-
-#
-# Client-side
-<client>
-<server>
-none
-</server>
-
- <name>
-Verify that all libcurl options have man pages
- </name>
-
-<command type="perl">
-%SRCDIR/manpage-scan.pl %SRCDIR/.. %PWD/..
-</command>
-</client>
-
-</testcase>
diff --git a/tests/data/test1400 b/tests/data/test1400
index 0cef18dfd..194c99c85 100644
--- a/tests/data/test1400
+++ b/tests/data/test1400
@@ -60,7 +60,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
  * 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/tests/data/test1401 b/tests/data/test1401
index 2217ed8c1..deb1b5ed8 100644
--- a/tests/data/test1401
+++ b/tests/data/test1401
@@ -67,7 +67,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
  * 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/tests/data/test1402 b/tests/data/test1402
index d2b05f562..8fece3afe 100644
--- a/tests/data/test1402
+++ b/tests/data/test1402
@@ -65,7 +65,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
  * 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/tests/data/test1403 b/tests/data/test1403
index b08728314..8e20fafdf 100644
--- a/tests/data/test1403
+++ b/tests/data/test1403
@@ -62,7 +62,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
  * 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/tests/data/test1404 b/tests/data/test1404
index c86d2602c..4265bf882 100644
--- a/tests/data/test1404
+++ b/tests/data/test1404
@@ -97,7 +97,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
  * 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/tests/data/test1405 b/tests/data/test1405
index f3ad3e795..50bfeb21a 100644
--- a/tests/data/test1405
+++ b/tests/data/test1405
@@ -63,7 +63,7 @@ QUIT
  * 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/tests/data/test1406 b/tests/data/test1406
index 033957f60..680f6a25e 100644
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -62,7 +62,7 @@ body
  * 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/tests/data/test1407 b/tests/data/test1407
index 5a3de1b17..bb4c4f128 100644
--- a/tests/data/test1407
+++ b/tests/data/test1407
@@ -49,7 +49,7 @@ QUIT
  * 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/tests/data/test1420 b/tests/data/test1420
index 38139e0b0..1c98d2c28 100644
--- a/tests/data/test1420
+++ b/tests/data/test1420
@@ -55,7 +55,7 @@ A005 LOGOUT
  * 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[])
 {