curl: Update to 7.53.0

Since 7.53.0 doesn't ship with a curl.1 man page anymore, but generates
through the use of a perl script, just switch to using the source
archive. Users are unlikely to modify curl anyway.

8 files changed, 11 insertions, 8 deletions

diff --git a/.gitmodules b/.gitmodules
index 45e46fee..a1efda47 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,9 +14,6 @@
 	path = pkg/ccid/src
 	url = https://anonscm.debian.org/git/pcsclite/CCID.git
 	ignore = all
-[submodule "pkg/curl/src"]
-	path = pkg/curl/src
-	url = https://github.com/curl/curl
 [submodule "pkg/dmenu/src"]
 	path = pkg/dmenu/src
 	url = git://git.suckless.org/dmenu
diff --git a/pkg/curl/.gitignore b/pkg/curl/.gitignore
new file mode 100644
index 00000000..8509455f
--- /dev/null
+++ b/pkg/curl/.gitignore
@@ -0,0 +1,2 @@
+/curl-7.53.0.tar.gz
+/src
diff --git a/pkg/curl/curl_config.h b/pkg/curl/curl_config.h
index 65855097..f3850a5e 100644
--- a/pkg/curl/curl_config.h
+++ b/pkg/curl/curl_config.h
@@ -119,6 +119,8 @@
 #define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1
 #define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1
 #define HAVE_FREEIFADDRS 1
+#define HAVE_FSETXATTR 1
+#define HAVE_FSETXATTR_5 1
 #define HAVE_GETHOSTBYADDR 1
 #define HAVE_GETHOSTBYADDR_R 1
 #define HAVE_GETHOSTBYADDR_R_8 1
@@ -134,6 +136,7 @@
 #define HAVE_STRLCAT 1
 #define HAVE_STRLCPY 1
 /* #undef HAVE_CLOSESOCKET */
+/* #undef HAVE_FSETXATTR_6 */
 /* #undef HAVE_GETHOSTBYADDR_R_5 */
 /* #undef HAVE_GETHOSTBYADDR_R_7 */
 /* #undef HAVE_GETHOSTBYNAME_R_3 */
diff --git a/pkg/curl/gen.rc b/pkg/curl/gen.rc
index 0749fbf9..c76d185e 100644
--- a/pkg/curl/gen.rc
+++ b/pkg/curl/gen.rc
@@ -9,10 +9,9 @@ cflags\
 	-I '$srcdir'/lib\
 	-I '$srcdir'/src
 
-hdrs=include/curl/^(curl.h curlrules.h curlver.h easy.h mprintf.h multi.h stdcheaders.h typecheck-gcc.h)
+hdrs=include/curl/^(curl.h curlbuild.h curlrules.h curlver.h easy.h mprintf.h multi.h stdcheaders.h typecheck-gcc.h)
 for(hdr in $hdrs) build '$outdir'/$hdr copy '$srcdir'/$hdr
-build '$outdir'/include/curl/curlbuild.h copy '$srcdir'/include/curl/curlbuild.h.dist
-phony headers '$outdir'/^($hdrs include/curl/curlbuild.h)
+phony headers '$outdir'/$hdrs
 
 phony deps '$dir'/headers pkg/^(libressl zlib)^/headers
 
@@ -103,4 +102,4 @@ exe curl -d '$dir'/deps\
 file bin/curl '$outdir'/curl 755
 man -d docs 1 curl.1
 
-fetch git
+fetch curl
diff --git a/pkg/curl/rev b/pkg/curl/rev
index 7ed6ff82..1e8b3149 100644
--- a/pkg/curl/rev
+++ b/pkg/curl/rev
@@ -1 +1 @@
-5
+6
diff --git a/pkg/curl/sha256 b/pkg/curl/sha256
new file mode 100644
index 00000000..19b71b83
--- /dev/null
+++ b/pkg/curl/sha256
@@ -0,0 +1 @@
+f25e0f9a8d8229cc9003df8ea07dbf4233fa7de08cb525c4e35415192eab4046  curl-7.53.0.tar.gz
diff --git a/pkg/curl/src b/pkg/curl/src
deleted file mode 160000
-Subproject 44b9b4d4f56d6f6de92c89636994c03984e9cd0
diff --git a/pkg/curl/url b/pkg/curl/url
new file mode 100644
index 00000000..7385ad27
--- /dev/null
+++ b/pkg/curl/url
@@ -0,0 +1 @@
+url = "https://curl.haxx.se/download/curl-7.53.0.tar.gz"