curl: Update to 7.29.0.

Major update to latest version. Fixes CVE-2013-0249.

diff --git a/curl/curl.nm b/curl/curl.nm
index 4581431c353f28a6ae4067a1622c10d28f5e6e07..6cfa7b5fce19a94a0aba791015ee276e6d4b14a3 100644 (file)
--- a/curl/curl.nm
+++ b/curl/curl.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = curl
-version    = 7.24.0
-release    = 4
+version    = 7.29.0
+release    = 1
 
 groups     = Application/Internet
 url        = http://www.curl.haxx.se/

diff --git a/curl/patches/0101-curl-7.21.1-multilib.patch b/curl/patches/0101-curl-7.21.1-multilib.patch
deleted file mode 100644 (file)
index 83c1cd8..0000000
--- a/curl/patches/0101-curl-7.21.1-multilib.patch
+++ /dev/null
@@ -1,64 +0,0 @@
- curl-config.in |   22 ++++------------------
- libcurl.pc.in  |    1 +
- 2 files changed, 5 insertions(+), 18 deletions(-)
-
-diff --git a/curl-config.in b/curl-config.in
-index ebda129..b404827 100644
---- a/curl-config.in
-+++ b/curl-config.in
-@@ -43,7 +43,6 @@ Available values for OPTION include:
-   --libs      library linking information
-   --prefix    curl install prefix
-   --protocols newline separated list of enabled protocols
--  --static-libs static libcurl library linking information
-   --version   output version information
-   --vernum    output the version information as a number (hexadecimal)
- EOF
-@@ -74,7 +73,7 @@ while test $# -gt 0; do
-       ;;
- 
-     --cc)
--      echo "@CC@"
-+      echo "gcc"
-       ;;
- 
-     --prefix)
-@@ -136,25 +135,12 @@ while test $# -gt 0; do
-               ;;
- 
-     --libs)
--      if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
--         CURLLIBDIR="-L@libdir@ "
--      else
--         CURLLIBDIR=""
--      fi
--      if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
--        echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
--      else
--        echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
--      fi
--      ;;
--
--    --static-libs)
--      echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
-+      pkg-config libcurl --libs
-       ;;
- 
-     --configure)
--      echo @CONFIGURE_OPTIONS@
--    ;;
-+      pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
-+      ;;
- 
-     *)
-         echo "unknown option: $1"
---- a/libcurl.pc.in
-+++ b/libcurl.pc.in
-@@ -29,6 +29,7 @@ libdir=@libdir@
- includedir=@includedir@
- supported_protocols="@SUPPORT_PROTOCOLS@"
- supported_features="@SUPPORT_FEATURES@"
-+configure_options=@CONFIGURE_OPTIONS@
- 
- Name: libcurl
- URL: http://curl.haxx.se/

diff --git a/curl/patches/0101-curl-7.29.0-multilib.patch b/curl/patches/0101-curl-7.29.0-multilib.patch
new file mode 100644 (file)
index 0000000..38aa86c
--- /dev/null
+++ b/curl/patches/0101-curl-7.29.0-multilib.patch
@@ -0,0 +1,72 @@
+ curl-config.in     |   16 +++-------------
+ docs/curl-config.1 |    4 +++-
+ libcurl.pc.in      |    1 +
+ 3 files changed, 7 insertions(+), 14 deletions(-)
+
+diff --git a/curl-config.in b/curl-config.in
+index 150004d..95d0759 100644
+--- a/curl-config.in
++++ b/curl-config.in
+@@ -75,7 +75,7 @@ while test $# -gt 0; do
+       ;;
+ 
+     --cc)
+-      echo "@CC@"
++      echo "gcc"
+       ;;
+ 
+     --prefix)
+@@ -142,24 +142,14 @@ while test $# -gt 0; do
+               ;;
+ 
+     --libs)
+-      if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
+-         CURLLIBDIR="-L@libdir@ "
+-      else
+-         CURLLIBDIR=""
+-      fi
+-      if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
+-        echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
+-      else
+-        echo ${CURLLIBDIR}-lcurl
+-      fi
++      pkg-config libcurl --libs
+       ;;
+ 
+     --static-libs)
+-      echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@
+       ;;
+ 
+     --configure)
+-      echo @CONFIGURE_OPTIONS@
++      pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
+     ;;
+ 
+     *)
+diff --git a/docs/curl-config.1 b/docs/curl-config.1
+index c4f4e2b..3e0ea60 100644
+--- a/docs/curl-config.1
++++ b/docs/curl-config.1
+@@ -65,7 +65,9 @@ be listed using uppercase and are separa
+ one, or several protocols in the list. (Added in 7.13.0)
+ .IP "--static-libs"
+ Shows the complete set of libs and other linker options you will need in order
+-to link your application with libcurl statically. (Added in 7.17.1)
++to link your application with libcurl statically. Note that Fedora/RHEL libcurl
++packages do not provide any static libraries, thus cannot be linked statically.
++(Added in 7.17.1)
+ .IP "--version"
+ Outputs version information about the installed libcurl.
+ .IP "--vernum"
+diff --git a/libcurl.pc.in b/libcurl.pc.in
+index 2ba9c39..f8f8b00 100644
+--- a/libcurl.pc.in
++++ b/libcurl.pc.in
+@@ -29,6 +29,7 @@ libdir=@libdir@
+ includedir=@includedir@
+ supported_protocols="@SUPPORT_PROTOCOLS@"
+ supported_features="@SUPPORT_FEATURES@"
++configure_options=@CONFIGURE_OPTIONS@
+ 
+ Name: libcurl
+ URL: http://curl.haxx.se/

diff --git a/curl/patches/curl-7.21.2-debug.patch b/curl/patches/0102-curl-7.29.0-debug.patch
similarity index 72%
rename from curl/patches/curl-7.21.2-debug.patch
rename to curl/patches/0102-curl-7.29.0-debug.patch
index 76918262e3e484547aa7bafdbd00658410cb71ad..7f70530083bcea007fc0d7fe61d680927fd0dd0d 100644 (file)
--- a/curl/patches/curl-7.21.2-debug.patch
+++ b/curl/patches/0102-curl-7.29.0-debug.patch
@@ -1,12 +1,18 @@
- configure            |   15 ++++-----------
- m4/curl-compilers.m4 |   15 ++++-----------
- 2 files changed, 8 insertions(+), 22 deletions(-)
+From 6710648c2b270c9ce68a7d9f1bba1222c7be8b58 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Wed, 31 Oct 2012 11:38:30 +0100
+Subject: [PATCH] prevent configure script from discarding -g in CFLAGS (#496778)
+
+---
+ configure            |   13 +++----------
+ m4/curl-compilers.m4 |   13 +++----------
+ 2 files changed, 6 insertions(+), 20 deletions(-)
 
 diff --git a/configure b/configure
-index d3ecf69..6d8f085 100755
+index 8f079a3..53b4774 100755
 --- a/configure
 +++ b/configure
-@@ -15040,18 +15040,11 @@ $as_echo "yes" >&6; }
+@@ -15759,18 +15759,11 @@ $as_echo "yes" >&6; }
      gccvhi=`echo $gccver | cut -d . -f1`
      gccvlo=`echo $gccver | cut -d . -f2`
      compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
@@ -20,17 +26,16 @@ index d3ecf69..6d8f085 100755
 -    flags_dbg_all="$flags_dbg_all -gvms"
 +    flags_dbg_all=""
      flags_dbg_yes="-g"
--    flags_dbg_off="-g0"
+     flags_dbg_off=""
 -    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
 -    flags_opt_yes="-O2"
-+    flags_dbg_off=""
 +    flags_opt_all=""
 +    flags_opt_yes=""
      flags_opt_off="-O0"
-   else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ 
+       if test -z "$SED"; then
 diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
-index 1ea4d17..868d65a 100644
+index 0cbba7a..9175b5b 100644
 --- a/m4/curl-compilers.m4
 +++ b/m4/curl-compilers.m4
 @@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
@@ -47,12 +52,14 @@ index 1ea4d17..868d65a 100644
 -    flags_dbg_all="$flags_dbg_all -gvms"
 +    flags_dbg_all=""
      flags_dbg_yes="-g"
--    flags_dbg_off="-g0"
+     flags_dbg_off=""
 -    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
 -    flags_opt_yes="-O2"
-+    flags_dbg_off=""
 +    flags_opt_all=""
 +    flags_opt_yes=""
      flags_opt_off="-O0"
+     CURL_CHECK_DEF([_WIN32], [], [silent])
    else
-     AC_MSG_RESULT([no])
+-- 
+1.7.1
+