From e0ea2fa903b2b0aa85b2213edf9a2f1a5e0f5ac3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Jul 2014 00:43:13 +0200 Subject: [PATCH] curl: update to curl-7.37.1 Signed-off-by: Stephan Raue --- packages/web/curl/package.mk | 2 +- .../curl/patches/curl-01-disable-manual.patch | 31 ------------------- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 packages/web/curl/patches/curl-01-disable-manual.patch diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk index 669b2002a6..0ae50275d2 100644 --- a/packages/web/curl/package.mk +++ b/packages/web/curl/package.mk @@ -25,7 +25,7 @@ # there: http://forum.xbmc.org/showthread.php?tid=177557 PKG_NAME="curl" -PKG_VERSION="7.36.0" +PKG_VERSION="7.37.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" diff --git a/packages/web/curl/patches/curl-01-disable-manual.patch b/packages/web/curl/patches/curl-01-disable-manual.patch deleted file mode 100644 index 48721693a4..0000000000 --- a/packages/web/curl/patches/curl-01-disable-manual.patch +++ /dev/null @@ -1,31 +0,0 @@ -Apply fix from 38d582ff541353d738858299d4a2b78bafac03ed to unbreak -building with --disable-manual. -We don't use the literal patch since that means re-generating files -from the tarball that are usually shipped. - -Signed-off-by: Gustavo Zacarias - -diff -Nura curl-7.36.0.orig/src/tool_hugehelp.c curl-7.36.0/src/tool_hugehelp.c ---- curl-7.36.0.orig/src/tool_hugehelp.c 2014-03-31 19:28:23.018515093 -0300 -+++ curl-7.36.0/src/tool_hugehelp.c 2014-03-31 19:28:09.994076200 -0300 -@@ -4165,6 +4165,10 @@ - " these mailing lists instead of mailing any individual.\n" - , stdout) ; - } -+#else /* !USE_MANUAL */ -+/* built-in manual is disabled, blank function */ -+#include "tool_hugehelp.h" -+void hugehelp(void) {} - #endif /* USE_MANUAL */ - #else - /* -@@ -8192,5 +8196,9 @@ - } - inflateEnd(&z); - } -+#else -+/* built-in manual is disabled, blank function */ -+#include "tool_hugehelp.h" -+void hugehelp(void) {} - #endif /* USE_MANUAL */ - #endif /* HAVE_LIBZ */