Accepting request 357070 from devel:libraries:c_c++

1

OBS-URL: https://build.opensuse.org/request/show/357070
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=110

curl-7.46.0.tar.lzma

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe854a0dedf0a89da72aa1725d8ff66285b613d366a88f14681dacd824024087
-size 2864645

curl-7.46.0.tar.lzma.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlZel9wACgkQeOEcayedXJEsYACfTnbAnkbePp450rwYPaQz53yI
-zg8Anj+YPivd5G6PTRFM1Q+tD5HEIwzp
-=izYm
------END PGP SIGNATURE-----

curl-7.47.0.tar.lzma

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7789a806fef4e24ec3d4b70ca86ff145243bf19d03ab0eb5c64f18f1b2748d8
+size 2878783

curl-7.47.0.tar.lzma.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlaocssACgkQeOEcayedXJEY4ACg3JiNYRFq94RsySUTY11rag/P
+i6QAnj5Qdf0MWw3yMwqiIv+pshKZHNsh
+=7+e8
+-----END PGP SIGNATURE-----

curl-fix-zsh-completion.patch

@@ -1,13 +0,0 @@
-Index: curl-7.46.0/scripts/zsh.pl
-===================================================================
---- curl-7.46.0.orig/scripts/zsh.pl
-+++ curl-7.46.0/scripts/zsh.pl
-@@ -5,7 +5,7 @@
- use strict;
- use warnings;
- 
--my $curl = $ARGV[0] || 'curl';
-+my $curl = $ARGV[0] || '../src/curl';
- 
- my $regex = '\s+(?:(-[^\s]+),\s)?(--[^\s]+)\s([^\s.]+)?\s+(.*)';
- my @opts = parse_main_opts('--help', $regex);

curl.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Jan 29 21:17:56 UTC 2016 - mpluskal@suse.com
+
+- Enable PSL (Publix Suffix List)
+- Make building more verbose
+
+-------------------------------------------------------------------
+Wed Jan 27 13:10:50 UTC 2016 - vcizek@suse.com
+
+- update to 7.47.0
+  * fixes CVE-2016-0755 (bsc#962983)
+    (NTLM credentials not-checked for proxy connection re-use)
+  * drop curl-fix-zsh-completion.patch (upstream)
+  Changes:
+  * version: Add flag CURL_VERSION_PSL for libpsl
+  * http: added CURL_HTTP_VERSION_2TLS to do HTTP/2 for HTTPS only
+  * curl: use 2TLS by default
+  * curl --expect100-timeout: added
+  * Add .dir-locals and set c-basic-offset to 2 (for emacs)
+
 -------------------------------------------------------------------
 Wed Jan  6 13:18:33 UTC 2016 - idonmez@suse.com
 

curl.spec

@@ -20,7 +20,7 @@
 %bcond_with mozilla_nss
 %bcond_without testsuite
 Name:           curl
-Version:        7.46.0
+Version:        7.47.0
 Release:        0
 Summary:        A Tool for Transferring Data from URLs
 License:        BSD-3-Clause and MIT
@@ -35,8 +35,6 @@ Patch1:         dont-mess-with-rpmoptflags.diff
 Patch3:         curl-secure-getenv.patch
 # PATCH-FIX-OPENSUSE lnussel@suse.de -- use openssl's built in verify path as fallback
 Patch4:         curl-7.41.0-use-openssl-s-built-in-verify-path-as-fallback.diff
-# PATCH-FIX-OPENSUSE idoenmez@suse.de -- Fix path to curl in zsh.pl
-Patch5:         curl-fix-zsh-completion.patch
 BuildRequires:  groff
 BuildRequires:  krb5-mini-devel
 BuildRequires:  libtool
@@ -46,6 +44,7 @@ BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libidn)
 BuildRequires:  pkgconfig(libmetalink)
 BuildRequires:  pkgconfig(libnghttp2)
+BuildRequires:  pkgconfig(libpsl)
 BuildRequires:  pkgconfig(libssh2)
 BuildRequires:  pkgconfig(zlib)
 Requires:       libcurl4 = %{version}
@@ -101,7 +100,6 @@ user interaction or any kind of interactivity.
 %patch1
 %patch3
 %patch4 -p1
-%patch5 -p1
 
 %build
 # curl complains if macro definition is contained in CFLAGS
@@ -111,7 +109,7 @@ CFLAGS=$(echo "%{optflags}" | sed -e 's/-D_FORTIFY_SOURCE=2//')
 export CPPFLAGS CFLAGS
 export CFLAGS="$CFLAGS -fPIE"
 export LDFLAGS="$LDFLAGS -pie"
-autoreconf -fi
+autoreconf -fiv
 # local hack to make curl-config --libs stop printing libraries it depends on
 # (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere,
 # will hopefully change in the future)
@@ -138,7 +136,7 @@ sed -i 's/\(link_all_deplibs=\)unknown/\1no/' configure
 # if this fails, the above sed hack did not work
 ./libtool --config | grep -q link_all_deplibs=no
 # enable-hidden-symbols needs gcc4 and causes that curl exports only its API
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %if %{with testsuite}
 %check