- updated to 7.29.0 (fixes CVE-2013-0249)

- updated krb5flags patch (although with current heimdal it is no longer needed)
- removed obsolete pc patch

diff --git a/curl-krb5flags.patch b/curl-krb5flags.patch
index 8ad77586189f976af9abd044aca7f017f0d42e4b..0d3afd625060333a1652108d844c47b4c49ec555 100644 (file)
--- a/curl-krb5flags.patch
+++ b/curl-krb5flags.patch
@@ -1,11 +1,20 @@
---- curl-7.19.2/configure.ac.orig      2008-11-10 16:22:59.000000000 +0100
-+++ curl-7.19.2/configure.ac   2008-12-27 09:02:47.678512154 +0100
-@@ -1202,7 +1202,7 @@
+--- curl-7.29.0/configure.ac.orig      2013-02-15 15:38:22.912332897 +0100
++++ curl-7.29.0/configure.ac   2013-02-15 15:47:10.498977423 +0100
+@@ -1336,7 +1336,7 @@
+ 
+   if test -z "$GSSAPI_INCS"; then
+      if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+-        GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
++        GSSAPI_INCS=`CFLAGS= $GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
+      elif test "$GSSAPI_ROOT" != "yes"; then
+         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+      fi
+@@ -1424,7 +1424,7 @@
          if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
             dnl krb5-config doesn't have --libs-only-L or similar, put everything
             dnl into LIBS
 -           gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
 +           gss_libs=`CFLAGS= $GSSAPI_ROOT/bin/krb5-config --libs gssapi`
-            LIBS="$LIBS $gss_libs"
+            LIBS="$gss_libs $LIBS"
          elif test "$GSSAPI_ROOT" != "yes"; then
             LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"

diff --git a/curl-pc.patch b/curl-pc.patch
deleted file mode 100644 (file)
index e22abe8..0000000
--- a/curl-pc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- curl-7.20.0/libcurl.pc.in.orig     2009-11-17 19:11:07.000000000 +0100
-+++ curl-7.20.0/libcurl.pc.in  2010-02-09 20:23:25.000000000 +0100
-@@ -35,6 +35,6 @@
- URL: http://curl.haxx.se/
- Description: Library to transfer files with ftp, http, etc.
- Version: @CURLVERSION@
--Libs: -L${libdir} -lcurl @LIBS@
-+Libs: -L${libdir} -lcurl
- Libs.private: @LIBCURL_LIBS@ @LIBS@
- Cflags: -I${includedir}

diff --git a/curl.spec b/curl.spec
index 62f5e6193f922889feaea8d600c447a322e48a2e..4bdaad14e1de20ac918c6288b8963847f20fae5d 100644 (file)
--- a/curl.spec
+++ b/curl.spec
@@ -21,15 +21,14 @@ Summary(pt_BR.UTF-8):       Busca URL (suporta FTP, TELNET, LDAP, GOPHER, DICT, HTTP e
 Summary(ru.UTF-8):     Утилита для получения файлов с серверов FTP, HTTP и других
 Summary(uk.UTF-8):     Утиліта для отримання файлів з серверів FTP, HTTP та інших
 Name:          curl
-Version:       7.28.1
-Release:       3
+Version:       7.29.0
+Release:       1
 License:       MIT-like
 Group:         Applications/Networking
 Source0:       http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: b716ab1103fd4bef99b98f5ff2c7b638
-Patch1:                %{name}-ac.patch
-Patch2:                %{name}-pc.patch
-Patch3:                %{name}-krb5flags.patch
+# Source0-md5: 48eab66844553c37433fb861cf8ab5c9
+Patch0:                %{name}-ac.patch
+Patch1:                %{name}-krb5flags.patch
 URL:           http://curl.haxx.se/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
@@ -191,9 +190,8 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %{__rm} -v m4/lt*.m4 m4/libtool.m4