- up to 7.42.0; fixes CVE-2015-3143, CVE-2015-3144, CVE-2015-3145,

  CVE-2015-3148

diff --git a/curl-krb5flags.patch b/curl-krb5flags.patch
index b8a56e901de1f2b961f7c10ffb09626cc6e869bf..40bf3e3ad64689bb5b022d870804f6bd6dbc0325 100644 (file)
--- a/curl-krb5flags.patch
+++ b/curl-krb5flags.patch
@@ -1,20 +1,20 @@
 --- curl-7.37.1/configure.ac.orig      2014-07-19 10:27:07.972697344 +0200
 +++ curl-7.37.1/configure.ac   2014-07-19 10:28:38.279360218 +0200
-@@ -1212,7 +1212,7 @@
+@@ -1195,7 +1195,7 @@
       if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
          GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
       elif 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 -f "$KRB5CONFIG"; then
+         GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
       elif test "$GSSAPI_ROOT" != "yes"; then
-         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
-      fi
-@@ -1311,7 +1311,7 @@
-         elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+@@ -1285,7 +1285,7 @@
+         elif test -f "$KRB5CONFIG"; 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`
+-           gss_libs=`$KRB5CONFIG --libs gssapi`
++           gss_libs=`CFLAGS= $KRB5CONFIG --libs gssapi`
             LIBS="$gss_libs $LIBS"
-         elif test "$GSSAPI_ROOT" != "yes"; then
-            LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
+         else
+            case $host in

diff --git a/curl.spec b/curl.spec
index cb075d7c56a8be27eca159a5b8dbf7ffe5715e96..0b2b11a403146206023fe1d553a20480db8c277d 100644 (file)
--- a/curl.spec
+++ b/curl.spec
@@ -22,12 +22,12 @@ 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.41.0
-Release:       2
+Version:       7.42.0
+Release:       1
 License:       MIT-like
 Group:         Applications/Networking
 Source0:       http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: 3d75ba516673ddc441dac8d519d2634d
+# Source0-md5: fddfab60987ee6119652b57c082d2623
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-krb5flags.patch
 URL:           http://curl.haxx.se/