ports

zandra's ports tree
git clone git://zandra.org/ports
Log | Files | Refs | README | LICENSE

commit 81cf63f9bf16c312301320ae7a7b07c553b14ad3
parent 3d9a75f0fa6ff82714485e4ace9534f64bdd5f2a
Author: darklands <darklands@zandra.xyz>
Date:   Fri, 24 Apr 2020 22:54:51 -0400

Bump curl

Diffstat:
Mcurl/checksums | 2+-
Dcurl/curl-fix-hugehelp.patch | 14--------------
Mcurl/curl.mk | 5+----
Mcurl/mkfile | 5-----
Mcurl/v.mk | 3++-
5 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/curl/checksums b/curl/checksums @@ -1 +1 @@ -409451932a0aef9f3dc33418c90be647aaeaf626399ae57bc09fa2f653cca9f181064a25b3441bda426acf07eae44d800ea637600f54ac883c361123a895df04 curl-7.36.0.tar.gz +c0bc5e52fd3f52e095f61cf2724de57f2698317dd19ca8c331575f3998d08b067adefcb57dc5274747276a5556df89465fe13976774af885804fa81ca417887f curl-7.69.1.tar.gz diff --git a/curl/curl-fix-hugehelp.patch b/curl/curl-fix-hugehelp.patch @@ -1,14 +0,0 @@ ---- src/tool_operate.old 2014-05-17 18:57:51.464665892 +0200 -+++ src/tool_operate.c 2014-05-17 18:58:16.687664860 +0200 -@@ -1793,9 +1793,11 @@ - /* Check if we were asked for the help */ - if(res == PARAM_HELP_REQUESTED) - tool_help(); -+#ifdef USE_MANUAL - /* Check if we were asked for the manual */ - else if(res == PARAM_MANUAL_REQUESTED) - hugehelp(); -+#endif - /* Check if we were asked for the version information */ - else if(res == PARAM_VERSION_INFO_REQUESTED) - tool_version_info(); diff --git a/curl/curl.mk b/curl/curl.mk @@ -21,7 +21,6 @@ curl:QV: --libexecdir="$BINDIR" \ --mandir="$PREFIX/share/man" \ --disable-shared \ - --disable-manual \ --disable-ntlm-wb \ --disable-pop3 \ --disable-imap \ @@ -32,14 +31,12 @@ curl:QV: --disable-rtsp \ --without-nss \ --without-libssh2 \ - --with-ssl=${openssl_libdir} \ + --with-ssl \ --enable-cares=${cares_libdir} \ --with-zlib=${zlib_libdir} \ --enable-static \ --enable-ipv6 make -j$nprocs - # remake static, see: http://curl.haxx.se/mail/archive-2003-03/0115.html - rm -f src/curl make LDFLAGS="-all-static $LDFLAGS" # install in ./lib for use as a dependency. make install LDFLAGS="-all-static $LDFLAGS" DESTDIR="`pwd`/lib" diff --git a/curl/mkfile b/curl/mkfile @@ -4,8 +4,3 @@ src = curl-$v url = http://curl.haxx.se/download/curl-$v.tar.gz mkfile = ../curl.mk - -# fix: hugehelp is not defined because we use --disable-manual. -# in src/tool_operate.c this is used though, so it's a bug. -patches = \ - "0" ../curl-fix-hugehelp.patch diff --git a/curl/v.mk b/curl/v.mk @@ -1 +1 @@ -v = 7.36.0 +v = 7.69.1+ \ No newline at end of file