From 864962b3354f048fa078173b450769c664790c4cc2cca5886265a11ffa5cd234 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 30 Jul 2012 07:42:51 +0000 Subject: [PATCH] Accepting request 129235 from home:elvigia:branches:devel:libraries:c_c++ - Curl 7.27.0 * support metalinks * Add sasl authentication support * various bugfixes - Fix previous change, _GNU_SOURCE --> AC_USE_SYSTEM_EXTENSIONS OBS-URL: https://build.opensuse.org/request/show/129235 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=77 --- curl-7.25.0.tar.lzma | 3 --- curl-7.25.0.tar.lzma.asc | 7 ------ curl-7.27.0.tar.lzma | 3 +++ curl-7.27.0.tar.lzma.asc | 7 ++++++ curl.changes | 9 ++++++++ curl.spec | 11 ++++----- libcurl-ocloexec.patch | 48 ++++++++++++++++++++++++++++++++++++---- 7 files changed, 69 insertions(+), 19 deletions(-) delete mode 100644 curl-7.25.0.tar.lzma delete mode 100644 curl-7.25.0.tar.lzma.asc create mode 100644 curl-7.27.0.tar.lzma create mode 100644 curl-7.27.0.tar.lzma.asc diff --git a/curl-7.25.0.tar.lzma b/curl-7.25.0.tar.lzma deleted file mode 100644 index 5ab7a0c..0000000 --- a/curl-7.25.0.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efa900a1836ed2e287173fdb0b7bd187a310ce4f8df88ef0a7fa23586a287fa8 -size 1983323 diff --git a/curl-7.25.0.tar.lzma.asc b/curl-7.25.0.tar.lzma.asc deleted file mode 100644 index e4f3bbd..0000000 --- a/curl-7.25.0.tar.lzma.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) - -iEYEABECAAYFAk9rdKgACgkQeOEcayedXJHJSwCgowL8602Sm+9E8csiFLp9oGBh -+ocAnityiUk4N9GOgrT1YPD7K0GEnAp0 -=0cCc ------END PGP SIGNATURE----- diff --git a/curl-7.27.0.tar.lzma b/curl-7.27.0.tar.lzma new file mode 100644 index 0000000..bf4bc23 --- /dev/null +++ b/curl-7.27.0.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b986186140e0ef0102e11094873f1e71bca1159d12fe869a8aa2ce649f02b238 +size 2037300 diff --git a/curl-7.27.0.tar.lzma.asc b/curl-7.27.0.tar.lzma.asc new file mode 100644 index 0000000..6edfa15 --- /dev/null +++ b/curl-7.27.0.tar.lzma.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iEYEABECAAYFAlATBJgACgkQeOEcayedXJG7qwCgpx6vCgDNTRZ2th1SnQw+V8WD +eIQAn1FrMLQyxZIF/9oDW67e4jnctUV4 +=31wG +-----END PGP SIGNATURE----- diff --git a/curl.changes b/curl.changes index baf55d7..2991ff7 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Jul 29 22:14:25 UTC 2012 - crrodriguez@opensuse.org + +- Curl 7.27.0 +* support metalinks +* Add sasl authentication support +* various bugfixes +- Fix previous change, _GNU_SOURCE --> AC_USE_SYSTEM_EXTENSIONS + ------------------------------------------------------------------- Mon Jul 9 13:12:24 UTC 2012 - dnh@opensuse.org diff --git a/curl.spec b/curl.spec index 9e39b2b..6b8070c 100644 --- a/curl.spec +++ b/curl.spec @@ -21,7 +21,7 @@ %bcond_without testsuite Name: curl -Version: 7.25.0 +Version: 7.27.0 Release: 0 Summary: A Tool for Transferring Data from URLs License: BSD-3-Clause ; MIT @@ -98,7 +98,7 @@ autoreconf -fi # (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere, # will hopefully change in the future) sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure -%configure CFLAGS="%{optflags} -D_GNU_SOURCE=1" \ +%configure \ --enable-ipv6 \ %if %{with openssl} --with-ssl \ @@ -158,7 +158,7 @@ install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/ %doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting} %doc lib/README.curl_off_t %{_prefix}/bin/curl -%doc %{_mandir}/man1/curl.1.gz +%doc %{_mandir}/man1/curl.1%{ext_man} %files -n libcurl4 %defattr(-,root,root) @@ -172,8 +172,9 @@ install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/ %{_prefix}/share/aclocal/libcurl.m4 %{_libdir}/libcurl.so %{_libdir}/pkgconfig/libcurl.pc -%doc %{_mandir}/man1/curl-config.1.gz -%doc %{_mandir}/man3/* +%{_mandir}/man1/curl-config.1%{ext_man} +%{_mandir}/man1/mk-ca-bundle.1%{ext_man} +%{_mandir}/man3/* %doc docs/libcurl/symbols-in-versions %changelog diff --git a/libcurl-ocloexec.patch b/libcurl-ocloexec.patch index 72f97de..b049edf 100644 --- a/libcurl-ocloexec.patch +++ b/libcurl-ocloexec.patch @@ -118,7 +118,7 @@ compile time is not enough. --- lib/netrc.c.orig +++ lib/netrc.c -@@ -110,7 +110,7 @@ int Curl_parsenetrc(const char *host, +@@ -107,7 +107,7 @@ int Curl_parsenetrc(const char *host, netrc_alloc = TRUE; } @@ -129,7 +129,7 @@ compile time is not enough. char *tok_buf; --- lib/ssluse.c.orig +++ lib/ssluse.c -@@ -436,7 +436,7 @@ int cert_stuff(struct connectdata *conn, +@@ -435,7 +435,7 @@ int cert_stuff(struct connectdata *conn, STACK_OF(X509) *ca = NULL; int i; @@ -138,7 +138,7 @@ compile time is not enough. if(!f) { failf(data, "could not open PKCS12 file '%s'", cert_file); return 0; -@@ -2316,7 +2316,7 @@ static CURLcode servercert(struct connec +@@ -2338,7 +2338,7 @@ static CURLcode servercert(struct connec /* e.g. match issuer name with provided issuer certificate */ if(data->set.str[STRING_SSL_ISSUERCERT]) { @@ -146,4 +146,44 @@ compile time is not enough. + fp=fopen(data->set.str[STRING_SSL_ISSUERCERT],"re"); if(!fp) { if(strict) - failf(data, "SSL: Unable to open issuer cert (%s)\n", + failf(data, "SSL: Unable to open issuer cert (%s)", +--- lib/connect.c.orig ++++ lib/connect.c +@@ -1236,7 +1236,7 @@ CURLcode Curl_socket(struct connectdata + (struct curl_sockaddr *)addr); + else + /* opensocket callback not set, so simply create the socket now */ +- *sockfd = socket(addr->family, addr->socktype, addr->protocol); ++ *sockfd = socket(addr->family, addr->socktype | SOCK_CLOEXEC, addr->protocol); + + if(*sockfd == CURL_SOCKET_BAD) + /* no socket, no connection */ +--- configure.ac.orig ++++ configure.ac +@@ -180,6 +180,7 @@ AC_CANONICAL_HOST + dnl Get system canonical name + AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS]) + ++AC_USE_SYSTEM_EXTENSIONS + dnl Checks for programs. + CURL_CHECK_PROG_CC + +@@ -193,6 +194,7 @@ dnl Our configure and build reentrant se + CURL_CONFIGURE_THREAD_SAFE + CURL_CONFIGURE_REENTRANT + ++ + dnl check for how to do large files + AC_SYS_LARGEFILE + +--- m4/curl-compilers.m4.orig ++++ m4/curl-compilers.m4 +@@ -1272,7 +1272,7 @@ dnl CPPFLAGS from being unexpectedly cha + AC_DEFUN([CURL_CHECK_PROG_CC], [ + ac_save_CFLAGS="$CFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" +- AC_PROG_CC ++ AC_PROG_CC_STDC + CFLAGS="$ac_save_CFLAGS" + CPPFLAGS="$ac_save_CPPFLAGS" + ])