diff --git a/packages/web/curl/patches/curl-7.28.0-04_workaround_as_needed_bug.patch b/packages/web/curl/patches/curl-7.28.0-04_workaround_as_needed_bug.patch deleted file mode 100644 index 46a397668f..0000000000 --- a/packages/web/curl/patches/curl-7.28.0-04_workaround_as_needed_bug.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: Work around libtool --as-needed reordering bug -Origin: vendor -Bug-Debian: http://bugs.debian.org/347650 -Forwarded: not-needed -Author: Alessandro Ghedini -Reviewed-by: Alessandro Ghedini -Last-Update: 2013-03-22 - ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -5800,6 +5800,11 @@ - arg=$func_stripname_result - ;; - -+ -Wl,--as-needed|-Wl,--no-as-needed) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -6163,6 +6168,15 @@ - lib= - found=no - case $deplib in -+ -Wl,--as-needed|-Wl,--no-as-needed) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then diff --git a/packages/web/curl/patches/curl-7.28.0-99_gnutls-put_reset_code_into_else_block.patch b/packages/web/curl/patches/curl-7.28.0-99_gnutls-put_reset_code_into_else_block.patch deleted file mode 100644 index e023471c00..0000000000 --- a/packages/web/curl/patches/curl-7.28.0-99_gnutls-put_reset_code_into_else_block.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1a02e84589efb3f8717d50bdc78d3f369b799198 Mon Sep 17 00:00:00 2001 -From: Alessandro Ghedini -Date: Mon, 15 Oct 2012 16:06:54 +0200 -Subject: [PATCH] gnutls: put reset code into else block - -Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690551 ---- - lib/gtls.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/lib/gtls.c b/lib/gtls.c -index 3b4dc40..f5f95ae 100644 ---- a/lib/gtls.c -+++ b/lib/gtls.c -@@ -309,10 +309,11 @@ static CURLcode handshake(struct connectdata *conn, - failf(data, "gnutls_handshake() failed: %s", gnutls_strerror(rc)); - return CURLE_SSL_CONNECT_ERROR; - } -- -- /* Reset our connect state machine */ -- connssl->connecting_state = ssl_connect_1; -- return CURLE_OK; -+ else { -+ /* Reset our connect state machine */ -+ connssl->connecting_state = ssl_connect_1; -+ return CURLE_OK; -+ } - } - } - --- -1.7.10 - diff --git a/packages/web/curl/patches/curl-7.28.1-automake_1.13.patch b/packages/web/curl/patches/curl-7.28.1-automake_1.13.patch new file mode 100644 index 0000000000..e09b6376ee --- /dev/null +++ b/packages/web/curl/patches/curl-7.28.1-automake_1.13.patch @@ -0,0 +1,12 @@ +diff -Naur curl-7.28.1-old/configure.ac curl-7.28.1-new/configure.ac +--- curl-7.28.1-old/configure.ac 2012-09-08 13:39:18.000000000 -0700 ++++ curl-7.28.1-new/configure.ac 2012-12-29 10:47:09.000000000 -0800 +@@ -35,7 +35,7 @@ + terms of the curl license; see COPYING for more details]) + + AC_CONFIG_SRCDIR([lib/urldata.h]) +-AM_CONFIG_HEADER(lib/curl_config.h include/curl/curlbuild.h) ++AC_CONFIG_HEADERS(lib/curl_config.h include/curl/curlbuild.h) + AC_CONFIG_MACRO_DIR([m4]) + AM_MAINTAINER_MODE + diff --git a/packages/web/curl/patches/curl-7.28.1-m4.patch b/packages/web/curl/patches/curl-7.28.1-m4.patch new file mode 100644 index 0000000000..ef81cb3182 --- /dev/null +++ b/packages/web/curl/patches/curl-7.28.1-m4.patch @@ -0,0 +1,17 @@ +diff -Naur curl-7.28.1/m4/curl-override.m4 curl-7.28.1.patch/m4/curl-override.m4 +--- curl-7.28.1/m4/curl-override.m4 2012-03-08 20:35:25.000000000 +0100 ++++ curl-7.28.1.patch/m4/curl-override.m4 2013-01-12 02:57:05.467821530 +0100 +@@ -88,13 +88,3 @@ + m4_defun([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR], + [CURL_CHECK_PATH_SEPARATOR + m4_define([$0],[])]) +- +-dnl Override Autoconf's AC_CONFIG_MACRO_DIR (DIR) +-dnl ------------------------------------------------- +-dnl This is an emulation of Autoconf's 2.61 macro. +-dnl This is done to use fixed macro across Autoconf +-dnl versions, and avoid warnings from modern libtool +-dnl which traces usage of this macro. +- +-AC_DEFUN([AC_CONFIG_MACRO_DIR],[:]) +-