Accepting request 781452 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/781452 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=154
2020-03-06 20:25:50 +00:00 · 2020-03-06 20:25:50 +00:00 · 6cf7191b45
commit 6cf7191b45
parent 23e53a8a36 cd408e41f8
8 changed files with 171 additions and 49 deletions
--- a/curl-7.68.0.tar.xz
+++ b/curl-7.68.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b724240722276a27f6e770b952121a3afd097129d8c9fe18e6272dc34192035a
-size 2442788
--- a/curl-7.68.0.tar.xz.asc
+++ b/curl-7.68.0.tar.xz.asc
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAl4Vd+gACgkQXMkI/bce
-EsILUwf/YMvltTP+zlsldTRctrfC7FIZkjjj+pYylejKVajl84NZ+JnrH7o/zRyx
-blZ+D6b8CYW/3It+IPxtGPvUXW0rhmBU4ClT39mXfZBV19+WhCX7rIi3Y/ylTQ0Y
-rCfKNmiw+51u0Mug6cgsV+OAjDyLSsCu/VpWY7wyBBCHwZxYHshcdxbMvps0FBhO
-odCmP7wtXfDKxXiycGzgRxoKQ2Xd4EmBxICecPOvPnVmrCJdANjyrPQHsY8FYPG9
-piZ+bwxKCtZLfA6jsYKGelEh8KUew5eTBoSYCz7oXsPFeCmKVaRIPHYxe+RKlG9C
-IklQkFVg3FqWvtGU2eXOALyxrZnRUQ==
-=XyDf
-----END PGP SIGNATURE-----
--- a/curl-7.69.0.tar.xz
+++ b/curl-7.69.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fadf2f082c127757808a28ddd5ab9d1bc2c7061ca7ddaf85814285e15e3271f
+size 2466092
--- a/curl-7.69.0.tar.xz.asc
+++ b/curl-7.69.0.tar.xz.asc
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAl5fTaIACgkQXMkI/bce
+EsIyaAf8DEjmWf+UpZDBjyirl6PuNfxpgZGm8Qw5eWBKD1rdQuMjZ3xJLauAR34G
+fYvsj8cYotUaIPHw4jWcvn6m/M5KFII6XWANcasn7edbg47BcXS6xadNkUnqcJnF
+0U9YbghGXaj0CwaNjqP4Gv23oG2nuYyWhUzI4wD8cRcO3oE/5Wksfwhwq5DrnpuQ
+CLlgP8o9qMgfrds87WK4Gb+AFHW4jkCAT2wnJBvtEfK97pG1E9y7S8l5oZ7H8hTe
+Vm3UgM8Stk13yPCCN3nOaTdPKk5nA6co7VWW5TbjJPQ+6mT+eD6SY/+k5yJ+A11X
+zaXOa3fXEJiRX3nfAR47iThh2Pj8wA==
+=baDZ
+-----END PGP SIGNATURE-----
--- a/curl-secure-getenv.patch
+++ b/curl-secure-getenv.patch
@ -1,7 +1,7 @@
 Index: lib/getenv.c
 ===================================================================
--- lib/getenv.c.orig	2013-04-12 13:31:59.056761437 +0200
-+++ lib/getenv.c	2013-04-12 13:36:25.654762399 +0200
+--- lib/getenv.c.orig
+++ lib/getenv.c
@@ -27,6 +27,14 @@
 
 #include "memdebug.h"
@ -14,23 +14,23 @@ Index: lib/getenv.c
 +#  endif
 +#endif
 +
- static
- char *GetEnv(const char *variable)
+ static char *GetEnv(const char *variable)
 {
-@@ -41,7 +49,7 @@ char *GetEnv(const char *variable)
-     ExpandEnvironmentStringsA(temp, env, sizeof(env));
-   return (env[0] != '\0')?strdup(env):NULL;
+ #if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP)
+@@ -66,7 +74,7 @@ static char *GetEnv(const char *variable
+     /* else rc is bytes needed, try again */
+   }
 #else
 -  char *env = getenv(variable);
 +  char *env = secure_getenv(variable);
   return (env && env[0])?strdup(env):NULL;
 #endif
- #endif
+ }
 Index: configure.ac
 ===================================================================
--- configure.ac.orig	2013-04-12 13:31:59.057761467 +0200
-+++ configure.ac	2013-04-12 13:32:00.823814454 +0200
-@@ -3475,6 +3475,8 @@ if test "x$want_curldebug_assumed" = "xy
+--- configure.ac.orig
+++ configure.ac
+@@ -4836,6 +4836,8 @@ if test "x$want_curldebug_assumed" = "xy
   ac_configure_args="$ac_configure_args --enable-curldebug"
 fi
 
--- a/curl.changes
+++ b/curl.changes
@ -1,3 +1,125 @@
+-------------------------------------------------------------------
+Wed Mar  4 08:56:45 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
+
+- Update to 7.69.0
+  * Changes:
+    - polarssl: removed
+    - smtp: add CURLOPT_MAIL_RCPT_ALLLOWFAILS and --mail-rcpt-allowfails
+    - wolfSSH: new SSH backend 
+  * Bugfixes:
+    - altsvc: improved header parser
+    - altsvc: keep a copy of the file name to survive handle reset
+    - altsvc: make saving the cache an atomic operation
+    - altsvc: use h3-27
+    - azure: disable brotli on the macos debug-builds
+    - build: remove all HAVE_OPENSSL_ENGINE_H defines
+    - cleanup: fix several comment typos
+    - cleanup: fix typos and wording in docs and comments
+    - cmake: add support for CMAKE_LTO option
+    - cmake: clean up and improve build procedures
+    - cmake: Show HTTPS-proxy in the features output
+    - cmake: use check_symbol_exists also for inet_pton
+    - configure.ac: fix comments about --with-quiche
+    - configure: disable metalink if mbedTLS is specified
+    - configure: disable metalink support for incompatible SSL/TLS
+    - conn: do not reuse connection if SOCKS proxy credentials differ
+    - conncache: removed unused Curl_conncache_bundle_size()
+    - connect: remove some spurious infof() calls
+    - connection reuse: respect the max_concurrent_streams limits
+    - cookie: check __Secure- and __Host- case sensitively
+    - cookies: make saving atomic with a rename
+    - create-dirs.d: mention the mode
+    - curl: avoid using strlen for testing if a string is empty
+    - curl: error on --alt-svc use w/o support
+    - curl: let -D merge headers in one file again
+    - curl: make #0 not output the full URL
+    - curl: make the -# spaceship bar not wrap the line
+    - curl: remove 'config' field from OutStruct
+    - curl:progressbarinit: ignore column width from terminals < 20
+    - curl_escape.3: add a link to curl_free
+    - curl_getenv.3: fix the memory handling description
+    - curl_global_init: assume the EINTR bit by default
+    - curl_global_init: move the IPv6 works status bool to multi handle
+    - CURLINFO_COOKIELIST.3: Fix example
+    - CURLOPT_ALTSVC_CTRL.3: fix the DEFAULT wording
+    - CURLOPT_PROXY_SSL_OPTIONS.3: Sync with CURLOPT_SSL_OPTIONS.3
+    - CURLOPT_REDIR_PROTOCOLS.3: update the DEFAULT section
+    - data.d: remove "Multiple files can also be specified"
+    - digest: do not quote algorithm in HTTP authorisation
+    - docs/HTTP3: add --enable-alt-svc to curl's configure
+    - docs/HTTP3: update the OpenSSL branch to use for ngtcp2
+    - docs: fix typo on CURLINFO_RETRY_AFTER
+    - easy: remove dead code
+    - form.d: fix two minor typos
+    - ftp: convert 'sock_accepted' to a plain boolean
+    - ftp: remove superfluous checking for crlf in user or pwd
+    - ftp: shrink temp buffers used for PORT
+    - github: Instructions to post "uname -a" on Unix systems in issues
+    - GnuTLS: always send client cert
+    - gtls: fixed compilation when using GnuTLS < 3.5.0
+    - hostip: move code to resolve IP address literals to 'Curl_resolv'
+    - HTTP-COOKIES: describe the cookie file format
+    - HTTP-COOKIES: mention that a trailing newline is required
+    - http2: make pausing/unpausing set/clear local stream window
+    - http2: now requires nghttp2 >= 1.12.0
+    - http: added 417 response treatment
+    - http: increase EXPECT_100_THRESHOLD to 1Mb
+    - http: mark POSTs with no body as "upload done" from the start
+    - http: move "oauth_bearer" from connectdata to Curl_easy
+    - include: remove non-curl prefixed defines
+    - KNOWN_BUGS: Multiple methods in a single WWW-Authenticate: header
+    - libssh2: add support for forcing a hostkey type
+    - libssh2: fix variable type
+    - libssh: improve known hosts handling
+    - llist: removed unused Curl_llist_move()
+    - location.d: the method change is from POST to GET only
+    - md4: fixed compilation issues when using GNU TLS gcrypt
+    - md4: use init/update/final functions in Secure Transport
+    - md5: added implementation for mbedTLS
+    - mk-ca-bundle: add support for CKA_NSS_SERVER_DISTRUST_AFTER
+    - multi: change curl_multi_wait/poll to error on negative timeout
+    - multi: fix outdated comment
+    - multi: if Curl_readwrite sets 'comeback' use expire, not loop
+    - multi_done: if multiplexed, make conn->data point to another transfer
+    - multi_wait: stop loop when sread() returns zero
+    - ngtcp2: add error code for QUIC connection errors
+    - ngtcp2: fixed to only use AF_INET6 when ENABLE_IPV6
+    - ngtcp2: update to git master and its draft-25 support
+    - ntlm: removed the dependency on the TLS libaries when using MD5
+    - ntlm_wb: use Curl_socketpair() for greater portability
+    - oauth2-bearer.d: works for HTTP too
+    - openssl: make CURLINFO_CERTINFO not truncate x509v3 fields
+    - openssl: remove redundant assignment
+    - os400: fixed the build
+    - pause: force-drain the transfer on unpause
+    - quiche: update to draft-25
+    - README: mention that the docs is in docs/
+    - runtests: make random seed fixed for a month
+    - runtests: restore the command log
+    - schannel_verify: Fix alt names manual verify for UNICODE builds
+    - sha256: use crypto implementations when available
+    - singleuse.pl: support new API functions, fix curl_dbg_ handling
+    - smtp: support the SMTPUTF8 extension
+    - smtp: support UTF-8 based host names in MAIL FROM
+    - SOCKS: make the connect phase non-blocking
+    - strcase: turn Curl_raw_tolower into static
+    - strerror: increase STRERROR_LEN 128 -> 256
+    - test1323: added missing 'unit test' feature requirement
+    - tests: add a unit test for MD4 digest generation
+    - tests: add a unit test for SHA256 digest generation
+    - tests: add a unit test for the HMAC hash generation
+    - tests: deduce the tool name from the test case for unit tests
+    - tests: fix Python 3 compatibility of smbserver.py
+    - tool_dirhie: allow directory traversal during creation
+    - tool_homedir: change GetEnv() to use libcurl's curl_getenv()
+    - url: include the failure reason when curl_win32_idn_to_ascii() fails
+    - urlapi: guess scheme properly with credentials given
+    - urldata: do string enums without #ifdefs for build scripts
+    - vtls: refactor Curl_multissl_version to make the code clearer
+- Refresh patches:
+  * curl-secure-getenv.patch
+  * libcurl-ocloexec.patch
+
 -------------------------------------------------------------------
 Tue Feb 18 14:11:29 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

--- a/curl.spec
+++ b/curl.spec
@ -21,7 +21,7 @@
 # need ssl always for python-pycurl
 %bcond_without openssl
 Name:           curl
-Version:        7.68.0
+Version:        7.69.0
 Release:        0
 Summary:        A Tool for Transferring Data from URLs
 License:        curl
--- a/libcurl-ocloexec.patch
+++ b/libcurl-ocloexec.patch
@ -7,11 +7,11 @@ To make it portable you have to test O_CLOEXEC support at *runtime*
 compile time is not enough.


-Index: curl-7.61.0/lib/file.c
+Index: curl-7.69.0/lib/file.c
 ===================================================================
--- curl-7.61.0.orig/lib/file.c	2018-07-09 08:42:12.000000000 +0200
-+++ curl-7.61.0/lib/file.c	2018-07-17 15:47:25.259601877 +0200
-@@ -190,7 +190,7 @@ static CURLcode file_connect(struct conn
+--- curl-7.69.0.orig/lib/file.c
+++ curl-7.69.0/lib/file.c
+@@ -192,7 +192,7 @@ static CURLcode file_connect(struct conn
     return CURLE_URL_MALFORMAT;
   }
 
@ -20,7 +20,7 @@ Index: curl-7.61.0/lib/file.c
   file->path = real_path;
 #endif
   file->freepath = real_path; /* free this when done */
-@@ -283,7 +283,7 @@ static CURLcode file_upload(struct conne
+@@ -285,7 +285,7 @@ static CURLcode file_upload(struct conne
   else
     mode = MODE_DEFAULT|O_TRUNC;
 
@ -29,10 +29,10 @@ Index: curl-7.61.0/lib/file.c
   if(fd < 0) {
     failf(data, "Can't open %s for writing", file->path);
     return CURLE_WRITE_ERROR;
-Index: curl-7.61.0/lib/hostip6.c
+Index: curl-7.69.0/lib/hostip6.c
 ===================================================================
--- curl-7.61.0.orig/lib/hostip6.c	2018-07-09 08:42:12.000000000 +0200
-+++ curl-7.61.0/lib/hostip6.c	2018-07-17 15:47:25.259601877 +0200
+--- curl-7.69.0.orig/lib/hostip6.c
+++ curl-7.69.0/lib/hostip6.c
@@ -44,7 +44,7 @@
 #ifdef HAVE_PROCESS_H
 #include <process.h>
@ -42,20 +42,20 @@ Index: curl-7.61.0/lib/hostip6.c
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
-@@ -70,7 +70,7 @@ bool Curl_ipv6works(void)
-   static int ipv6_works = -1;
-   if(-1 == ipv6_works) {
+@@ -76,7 +76,7 @@ bool Curl_ipv6works(struct connectdata *
+   else {
+     int ipv6_works = -1;
     /* probe to see if we have a working IPv6 stack */
 -    curl_socket_t s = socket(PF_INET6, SOCK_DGRAM, 0);
 +    curl_socket_t s = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
     if(s == CURL_SOCKET_BAD)
       /* an IPv6 address was requested but we can't get/use one */
       ipv6_works = 0;
-Index: curl-7.61.0/lib/if2ip.c
+Index: curl-7.69.0/lib/if2ip.c
 ===================================================================
--- curl-7.61.0.orig/lib/if2ip.c	2018-05-07 10:20:04.000000000 +0200
-+++ curl-7.61.0/lib/if2ip.c	2018-07-17 15:47:25.259601877 +0200
-@@ -225,7 +225,7 @@ if2ip_result_t Curl_if2ip(int af, unsign
+--- curl-7.69.0.orig/lib/if2ip.c
+++ curl-7.69.0/lib/if2ip.c
+@@ -201,7 +201,7 @@ if2ip_result_t Curl_if2ip(int af, unsign
   if(len >= sizeof(req.ifr_name))
     return IF2IP_NOT_FOUND;
 
@ -64,11 +64,11 @@ Index: curl-7.61.0/lib/if2ip.c
   if(CURL_SOCKET_BAD == dummy)
     return IF2IP_NOT_FOUND;
 
-Index: curl-7.61.0/lib/connect.c
+Index: curl-7.69.0/lib/connect.c
 ===================================================================
--- curl-7.61.0.orig/lib/connect.c	2018-07-09 08:42:12.000000000 +0200
-+++ curl-7.61.0/lib/connect.c	2018-07-17 15:47:25.259601877 +0200
-@@ -1387,7 +1387,7 @@ CURLcode Curl_socket(struct connectdata
+--- curl-7.69.0.orig/lib/connect.c
+++ curl-7.69.0/lib/connect.c
+@@ -1529,7 +1529,7 @@ CURLcode Curl_socket(struct connectdata
   }
   else
     /* opensocket callback not set, so simply create the socket now */
@ -77,11 +77,11 @@ Index: curl-7.61.0/lib/connect.c
 
   if(*sockfd == CURL_SOCKET_BAD)
     /* no socket, no connection */
-Index: curl-7.61.0/configure.ac
+Index: curl-7.69.0/configure.ac
 ===================================================================
--- curl-7.61.0.orig/configure.ac	2018-07-17 15:47:25.263601899 +0200
-+++ curl-7.61.0/configure.ac	2018-07-17 15:49:06.252122189 +0200
-@@ -191,6 +191,8 @@ AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-m
+--- curl-7.69.0.orig/configure.ac
+++ curl-7.69.0/configure.ac
+@@ -196,6 +196,8 @@ AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-m
 # Silence warning: ar: 'u' modifier ignored since 'D' is the default
 AC_SUBST(AR_FLAGS, [cr])