Accepting request 314966 from devel:libraries:c_c++

1

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

curl-7.42.1.tar.lzma

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

curl-7.42.1.tar.lzma.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlVAdY8ACgkQeOEcayedXJEnugCeKbbLQ/LtJLXKFY4RI1pxERMo
-9dIAnRheh6V5PzOCo1CuzaAfyVM+5Xfj
-=kzMD
------END PGP SIGNATURE-----

curl-7.43.0.tar.lzma

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

curl-7.43.0.tar.lzma.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlWBDEMACgkQeOEcayedXJEmEACfRhRhpQINTGbbdK2u/p97qMzq
+EBsAn1SxVVYoOudPZ0SOZ+10cau0b0sC
+=Zuc9
+-----END PGP SIGNATURE-----

curl-disable_failing_tests.patch

@@ -0,0 +1,10 @@
+Index: curl-7.42.1/tests/data/DISABLED
+===================================================================
+--- curl-7.42.1.orig/tests/data/DISABLED	2015-04-26 18:26:32.000000000 +0200
++++ curl-7.42.1/tests/data/DISABLED	2015-05-20 21:03:57.598275327 +0200
+@@ -10,3 +10,5 @@
+ 836
+ 882
+ 938
++# requires python
++1801

curl-secure-getenv.patch

@@ -7,7 +7,7 @@ Index: lib/getenv.c
  #include "memdebug.h"
  
 +#ifndef HAVE_SECURE_GETENV
-+#  ifdef HAVE__SECURE_GETENV
++#  ifdef HAVE___SECURE_GETENV
 +#    define secure_getenv __secure_getenv
 +#  else
 +#    error neither secure_getenv nor __secure_getenv is available

curl.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Fri Jul  3 08:29:55 UTC 2015 - vcizek@suse.com
+
+- fix a typo in curl-secure-getenv.patch (bsc#936676)
+
+-------------------------------------------------------------------
+Fri Jun 19 13:07:44 UTC 2015 - mpluskal@suse.com
+
+- Update to 7.43.0
+  * Added CURLOPT_PROXY_SERVICE_NAME
+  * Added CURLOPT_SERVICE_NAME
+  * New curl option: --proxy-service-name
+  * Mew curl option: --service-name
+  * New curl option: --data-raw
+  * Added CURLOPT_PIPEWAIT
+  * Added support for multiplexing transfers using HTTP/2, enable 
+    this with the new CURLPIPE_MULTIPLEX bit for 
+    CURLMOPT_PIPELINING
+  * HTTP/2: requires nghttp2 1.0.0 or later
+  * scripts: add zsh.pl for generating zsh completion
+  * curl.h: add CURL_HTTP_VERSION_2
+  * CVE-2015-3236: lingering HTTP credentials in connection re-use
+  * CVE-2015-3237: SMB send off unrelated memory contents 
+- Disable HTTP/2 as it would create build cycle
+
+-------------------------------------------------------------------
+Wed May 20 15:18:12 UTC 2015 - vcizek@suse.com
+
+- enable HTTP/2 support
+- make the testsuite failure fatal
+  * added curl-disable_failing_tests.patch
+  * added groff to BuildRequires to enable builtin manual (test 1026)
+
 -------------------------------------------------------------------
 Wed Apr 29 08:32:11 UTC 2015 - vcizek@suse.com
 

curl.spec

@@ -20,7 +20,7 @@
 %bcond_with mozilla_nss
 %bcond_without testsuite
 Name:           curl
-Version:        7.42.1
+Version:        7.43.0
 Release:        0
 Summary:        A Tool for Transferring Data from URLs
 License:        BSD-3-Clause and MIT
@@ -35,6 +35,8 @@ 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
+Patch5:         curl-disable_failing_tests.patch
+BuildRequires:  groff
 BuildRequires:  krb5-mini-devel
 BuildRequires:  libtool
 BuildRequires:  lzma
@@ -97,6 +99,7 @@ user interaction or any kind of interactivity.
 %patch1
 %patch3
 %patch4 -p1
+%patch5 -p1
 
 %build
 # curl complains if macro definition is contained in CFLAGS
@@ -147,15 +150,9 @@ if test -z "$BUILD_INCARNATION"; then
 	BUILD_INCARNATION=0
 fi
 base=$((8990 + $BUILD_INCARNATION * 20))
-perl ./runtests.pl -a -b$base || {
+perl ./runtests.pl -a -b$base || exit
-%if 0%{?curl_testsuite_fatal:1}
-	exit
-%else
-	echo "WARNING: runtests.pl failed with code $?, continuing nevertheless"
-%endif
-}
-%endif
 popd
+%endif
 
 %install
 %make_install
@@ -170,9 +167,8 @@ install -Dm 0644 docs/libcurl/libcurl.m4 %{buildroot}%{_datadir}/aclocal/libcurl
 %defattr(-,root,root)
 %doc README RELEASE-NOTES
 %doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting}
-%doc lib/README.curl_off_t
 %{_bindir}/curl
-%doc %{_mandir}/man1/curl.1%{ext_man}
+%{_mandir}/man1/curl.1%{ext_man}
 
 %files -n libcurl4
 %defattr(-,root,root)

libcurl-ocloexec.patch

@@ -7,32 +7,10 @@ To make it portable you have to test O_CLOEXEC support at *runtime*
 compile time is not enough.
 
 
-Index: lib/cookie.c
-===================================================================
---- lib/cookie.c.orig	2015-04-22 10:05:04.652863265 +0200
-+++ lib/cookie.c	2015-04-22 10:05:08.225915413 +0200
-@@ -914,7 +914,7 @@ struct CookieInfo *Curl_cookie_init(stru
-     fp = NULL;
-   }
-   else
--    fp = file?fopen(file, "r"):NULL;
-+    fp = file?fopen(file, "re"):NULL;
- 
-   c->newsession = newsession; /* new session? */
- 
-@@ -1262,7 +1262,7 @@ static int cookie_output(struct CookieIn
-     use_stdout=TRUE;
-   }
-   else {
--    out = fopen(dumphere, "w");
-+    out = fopen(dumphere, "we");
-     if(!out)
-       return 1; /* failure */
-   }
 Index: lib/file.c
 ===================================================================
---- lib/file.c.orig	2015-04-22 10:05:04.652863265 +0200
+--- lib/file.c.orig
-+++ lib/file.c	2015-04-22 10:05:08.226915427 +0200
++++ lib/file.c
 @@ -238,7 +238,7 @@ static CURLcode file_connect(struct conn
      /* binary zeroes indicate foul play */
      return CURLE_URL_MALFORMAT;
@@ -42,7 +20,7 @@ Index: lib/file.c
    file->path = real_path;
  #endif
    file->freepath = real_path; /* free this when done */
-@@ -336,7 +336,7 @@ static CURLcode file_upload(struct conne
+@@ -334,7 +334,7 @@ static CURLcode file_upload(struct conne
    else
      mode = MODE_DEFAULT|O_TRUNC;
  
@@ -53,8 +31,8 @@ Index: lib/file.c
      return CURLE_WRITE_ERROR;
 Index: lib/formdata.c
 ===================================================================
---- lib/formdata.c.orig	2015-04-22 10:05:04.652863265 +0200
+--- lib/formdata.c.orig
-+++ lib/formdata.c	2015-04-22 10:05:08.226915427 +0200
++++ lib/formdata.c
 @@ -1256,7 +1256,7 @@ CURLcode Curl_getformdata(struct Session
          FILE *fileread;
  
@@ -75,8 +53,8 @@ Index: lib/formdata.c
      }
 Index: lib/hostip6.c
 ===================================================================
---- lib/hostip6.c.orig	2015-04-22 10:05:04.652863265 +0200
+--- lib/hostip6.c.orig
-+++ lib/hostip6.c	2015-04-22 10:05:08.226915427 +0200
++++ lib/hostip6.c
 @@ -39,7 +39,7 @@
  #ifdef HAVE_PROCESS_H
  #include <process.h>
@@ -97,8 +75,8 @@ Index: lib/hostip6.c
        ipv6_works = 0;
 Index: lib/if2ip.c
 ===================================================================
---- lib/if2ip.c.orig	2015-04-22 10:05:04.652863265 +0200
+--- lib/if2ip.c.orig
-+++ lib/if2ip.c	2015-04-22 10:05:08.227915442 +0200
++++ lib/if2ip.c
 @@ -222,7 +222,7 @@ if2ip_result_t Curl_if2ip(int af, unsign
    if(len >= sizeof(req.ifr_name))
      return IF2IP_NOT_FOUND;
@@ -108,24 +86,11 @@ Index: lib/if2ip.c
    if(CURL_SOCKET_BAD == dummy)
      return IF2IP_NOT_FOUND;
  
-Index: lib/netrc.c
-===================================================================
---- lib/netrc.c.orig	2015-04-22 10:05:04.652863265 +0200
-+++ lib/netrc.c	2015-04-22 10:05:08.227915442 +0200
-@@ -109,7 +109,7 @@ int Curl_parsenetrc(const char *host,
-     netrc_alloc = TRUE;
-   }
- 
--  file = fopen(netrcfile, "r");
-+  file = fopen(netrcfile, "re");
-   if(netrc_alloc)
-     free(netrcfile);
-   if(file) {
 Index: lib/connect.c
 ===================================================================
---- lib/connect.c.orig	2015-04-22 10:05:04.652863265 +0200
+--- lib/connect.c.orig
-+++ lib/connect.c	2015-04-22 10:05:08.227915442 +0200
++++ lib/connect.c
-@@ -1334,7 +1334,7 @@ CURLcode Curl_socket(struct connectdata
+@@ -1337,7 +1337,7 @@ CURLcode Curl_socket(struct connectdata
                                      (struct curl_sockaddr *)addr);
    else
      /* opensocket callback not set, so simply create the socket now */
@@ -136,8 +101,8 @@ Index: lib/connect.c
      /* no socket, no connection */
 Index: configure.ac
 ===================================================================
---- configure.ac.orig	2015-04-22 10:05:04.652863265 +0200
+--- configure.ac.orig
-+++ configure.ac	2015-04-22 10:05:08.228915457 +0200
++++ configure.ac
 @@ -182,6 +182,7 @@ AC_CANONICAL_HOST
  dnl Get system canonical name
  AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS])