Accepting request 186690 from home:elvigia:branches:devel:libraries:c_c++

- curl 7.32.0 
* curl: allow timeouts to accept decimal values 
* CURLOPT_XFERINFOFUNCTION: introducing a new progress callback 
* SIGPIPE: ignored while inside the library
* OpenSSL: check for read errors
* configure: automake 1.14 compatibility tweak 
* curl_multi_wait: set revents for extra fds 
* global dns cache: didn't work (regression) 
* mk-ca-bundle.1: don't install on make install

OBS-URL: https://build.opensuse.org/request/show/186690
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=98

curl-7.31.0.tar.lzma

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

curl-7.31.0.tar.lzma.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iEYEABECAAYFAlHFb/oACgkQeOEcayedXJFVRACfZw0PkPESVwBmLofyVsmzvawi
-hDoAniqfcgXqIiLt8KPz0MkA6uXcol5E
-=gOQA
------END PGP SIGNATURE-----

curl-7.32.0.tar.lzma

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

curl-7.32.0.tar.lzma.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.14 (GNU/Linux)
+
+iEYEABECAAYFAlIIDT4ACgkQeOEcayedXJFOBwCfSGwELnEOcuFSS7Witjk2EFwM
+gdcAoPi/rwCi3U6B73B5p+/jR360V2e6
+=VRTg
+-----END PGP SIGNATURE-----

curl.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Aug 12 05:29:34 UTC 2013 - crrodriguez@opensuse.org
+
+- curl 7.32.0 
+* curl: allow timeouts to accept decimal values 
+* CURLOPT_XFERINFOFUNCTION: introducing a new progress callback 
+* SIGPIPE: ignored while inside the library
+* OpenSSL: check for read errors
+* configure: automake 1.14 compatibility tweak 
+* curl_multi_wait: set revents for extra fds 
+* global dns cache: didn't work (regression) 
+* mk-ca-bundle.1: don't install on make install
+
+
 -------------------------------------------------------------------
 Mon Jul  1 18:56:33 UTC 2013 - coolo@suse.com
 

curl.spec

@@ -21,7 +21,7 @@
 %bcond_without testsuite
 
 Name:           curl
-Version:        7.31.0
+Version:        7.32.0
 Release:        0
 Summary:        A Tool for Transferring Data from URLs
 License:        BSD-3-Clause and MIT
@@ -186,7 +186,6 @@ install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/
 %{_libdir}/libcurl.so
 %{_libdir}/pkgconfig/libcurl.pc
 %{_mandir}/man1/curl-config.1%{ext_man}
-%{_mandir}/man1/mk-ca-bundle.1%{ext_man}
 %{_mandir}/man3/*
 %doc docs/libcurl/symbols-in-versions
 

libcurl-ocloexec.patch

@@ -7,11 +7,9 @@ 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
-===================================================================
++++ lib/cookie.c
---- lib/cookie.c.orig	2013-04-12 13:25:07.866367012 +0200
+@@ -841,7 +841,7 @@ struct CookieInfo *Curl_cookie_init(stru
-+++ lib/cookie.c	2013-04-12 13:25:29.391017340 +0200
-@@ -750,7 +750,7 @@ struct CookieInfo *Curl_cookie_init(stru
      fp = NULL;
    }
    else
@@ -20,7 +18,7 @@ Index: lib/cookie.c
  
    c->newsession = newsession; /* new session? */
  
-@@ -1091,7 +1091,7 @@ static int cookie_output(struct CookieIn
+@@ -1179,7 +1179,7 @@ static int cookie_output(struct CookieIn
      use_stdout=TRUE;
    }
    else {
@@ -29,10 +27,8 @@ Index: lib/cookie.c
      if(!out)
        return 1; /* failure */
    }
-Index: lib/file.c
+--- lib/file.c.orig
-===================================================================
++++ lib/file.c
---- lib/file.c.orig	2013-04-12 13:25:07.867367042 +0200
-+++ lib/file.c	2013-04-12 13:25:29.391017340 +0200
 @@ -243,7 +243,7 @@ static CURLcode file_connect(struct conn
    fd = open_readonly(actual_path, O_RDONLY|O_BINARY);
    file->path = actual_path;
@@ -51,11 +47,9 @@ Index: lib/file.c
    if(fd < 0) {
      failf(data, "Can't open %s for writing", file->path);
      return CURLE_WRITE_ERROR;
-Index: lib/formdata.c
+--- lib/formdata.c.orig
-===================================================================
++++ lib/formdata.c
---- lib/formdata.c.orig	2013-04-12 13:25:07.868367072 +0200
+@@ -1297,7 +1297,7 @@ CURLcode Curl_getformdata(struct Session
-+++ lib/formdata.c	2013-04-12 13:25:29.392017370 +0200
-@@ -1234,7 +1234,7 @@ CURLcode Curl_getformdata(struct Session
          FILE *fileread;
  
          fileread = strequal("-", file->contents)?
@@ -64,19 +58,17 @@ Index: lib/formdata.c
  
          /*
           * VMS: This only allows for stream files on VMS.  Stream files are
-@@ -1365,7 +1365,7 @@ static size_t readfromfile(struct Form *
+@@ -1458,7 +1458,7 @@ static size_t readfromfile(struct Form *
    else {
      if(!form->fp) {
        /* this file hasn't yet been opened */
--      form->fp = fopen(form->data->line, "rb"); /* b is for binary */
+-      form->fp = fopen_read(form->data->line, "rb"); /* b is for binary */
-+      form->fp = fopen(form->data->line, "rbe"); /* b is for binary */
++      form->fp = fopen_read(form->data->line, "rbe"); /* b is for binary */
        if(!form->fp)
          return (size_t)-1; /* failure */
      }
-Index: lib/hostip6.c
+--- lib/hostip6.c.orig
-===================================================================
++++ lib/hostip6.c
---- lib/hostip6.c.orig	2013-04-12 13:25:07.868367072 +0200
-+++ lib/hostip6.c	2013-04-12 13:25:29.392017370 +0200
 @@ -39,7 +39,7 @@
  #ifdef HAVE_PROCESS_H
  #include <process.h>
@@ -95,10 +87,8 @@ Index: lib/hostip6.c
      if(s == CURL_SOCKET_BAD)
        /* an ipv6 address was requested but we can't get/use one */
        ipv6_works = 0;
-Index: lib/if2ip.c
+--- lib/if2ip.c.orig
-===================================================================
++++ lib/if2ip.c
---- lib/if2ip.c.orig	2013-04-12 13:25:07.869367102 +0200
-+++ lib/if2ip.c	2013-04-12 13:25:29.393017400 +0200
 @@ -171,7 +171,7 @@ if2ip_result_t Curl_if2ip(int af, unsign
    if(len >= sizeof(req.ifr_name))
      return IF2IP_NOT_FOUND;
@@ -108,10 +98,8 @@ Index: lib/if2ip.c
    if(CURL_SOCKET_BAD == dummy)
      return IF2IP_NOT_FOUND;
  
-Index: lib/netrc.c
+--- lib/netrc.c.orig
-===================================================================
++++ lib/netrc.c
---- lib/netrc.c.orig	2013-04-12 13:25:07.869367102 +0200
-+++ lib/netrc.c	2013-04-12 13:25:29.393017400 +0200
 @@ -97,7 +97,7 @@ int Curl_parsenetrc(const char *host,
      netrc_alloc = TRUE;
    }
@@ -121,11 +109,9 @@ Index: lib/netrc.c
    if(file) {
      char *tok;
      char *tok_buf;
-Index: lib/ssluse.c
+--- lib/ssluse.c.orig
-===================================================================
++++ lib/ssluse.c
---- lib/ssluse.c.orig	2013-04-12 13:25:07.870367132 +0200
+@@ -420,7 +420,7 @@ int cert_stuff(struct connectdata *conn,
-+++ lib/ssluse.c	2013-04-12 13:25:29.394017430 +0200
-@@ -419,7 +419,7 @@ int cert_stuff(struct connectdata *conn,
        STACK_OF(X509) *ca = NULL;
        int i;
  
@@ -134,7 +120,7 @@ Index: lib/ssluse.c
        if(!f) {
          failf(data, "could not open PKCS12 file '%s'", cert_file);
          return 0;
-@@ -2246,7 +2246,7 @@ static CURLcode servercert(struct connec
+@@ -2168,7 +2168,7 @@ static CURLcode servercert(struct connec
  
      /* e.g. match issuer name with provided issuer certificate */
      if(data->set.str[STRING_SSL_ISSUERCERT]) {
@@ -143,11 +129,9 @@ Index: lib/ssluse.c
        if(!fp) {
          if(strict)
            failf(data, "SSL: Unable to open issuer cert (%s)",
-Index: lib/connect.c
+--- lib/connect.c.orig
-===================================================================
++++ lib/connect.c
---- lib/connect.c.orig	2013-04-12 13:25:07.871367163 +0200
+@@ -1313,7 +1313,7 @@ CURLcode Curl_socket(struct connectdata
-+++ lib/connect.c	2013-04-12 13:25:29.394017430 +0200
-@@ -1308,7 +1308,7 @@ CURLcode Curl_socket(struct connectdata
                                      (struct curl_sockaddr *)addr);
    else
      /* opensocket callback not set, so simply create the socket now */
@@ -156,10 +140,8 @@ Index: lib/connect.c
  
    if(*sockfd == CURL_SOCKET_BAD)
      /* no socket, no connection */
-Index: configure.ac
+--- configure.ac.orig
-===================================================================
++++ configure.ac
---- configure.ac.orig	2013-04-12 13:25:07.873367223 +0200
-+++ configure.ac	2013-04-12 13:25:29.396017491 +0200
 @@ -183,6 +183,7 @@ AC_CANONICAL_HOST
  dnl Get system canonical name
  AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS])