From d36d6addd8c6e15507b47cf115b30313279bf08c45fe4f59edefc8ef3bdeca12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sat, 9 Apr 2011 21:16:06 +0000 Subject: [PATCH 1/8] Accepting request 66602 from home:elvigia:branches:devel:libraries:c_c++ OBS-URL: https://build.opensuse.org/request/show/66602 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=44 --- _service | 9 ++++----- _service:download_url:curl-7.21.2.tar.bz2 | 3 --- _service:download_url:curl-7.21.4.tar.bz2 | 3 +++ curl-no-sslv2.patch | 16 ++++++++++++++++ curl.changes | 19 +++++++++++++++++++ curl.spec | 11 +++++++---- 6 files changed, 49 insertions(+), 12 deletions(-) delete mode 100644 _service:download_url:curl-7.21.2.tar.bz2 create mode 100644 _service:download_url:curl-7.21.4.tar.bz2 create mode 100644 curl-no-sslv2.patch diff --git a/_service b/_service index 05be4a1..f94c024 100644 --- a/_service +++ b/_service @@ -1,13 +1,12 @@ - http curl.haxx.se - /download/curl-7.21.2.tar.bz2 + /download/curl-7.21.4.tar.bz2 - _service:download_url:curl-7.21.2.tar.bz2 + _service:download_url:curl-7.21.4.tar.bz2 sha256 - f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21 + d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1 - + \ No newline at end of file diff --git a/_service:download_url:curl-7.21.2.tar.bz2 b/_service:download_url:curl-7.21.2.tar.bz2 deleted file mode 100644 index 1be1194..0000000 --- a/_service:download_url:curl-7.21.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21 -size 2167919 diff --git a/_service:download_url:curl-7.21.4.tar.bz2 b/_service:download_url:curl-7.21.4.tar.bz2 new file mode 100644 index 0000000..64ce98b --- /dev/null +++ b/_service:download_url:curl-7.21.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1 +size 2256354 diff --git a/curl-no-sslv2.patch b/curl-no-sslv2.patch new file mode 100644 index 0000000..23f102e --- /dev/null +++ b/curl-no-sslv2.patch @@ -0,0 +1,16 @@ +--- lib/ssluse.c.orig ++++ lib/ssluse.c +@@ -1449,8 +1449,13 @@ ossl_connect_step1(struct connectdata *c + use_sni(TRUE); + break; + case CURL_SSLVERSION_SSLv2: ++#ifdef OPENSSL_NO_SSL2 ++ failf(data, "openSSL was compiled without SSLv2 support"); ++ return CURLE_SSL_CONNECT_ERROR; ++#else + req_method = SSLv2_client_method(); + use_sni(FALSE); ++#endif + break; + case CURL_SSLVERSION_SSLv3: + req_method = SSLv3_client_method(); diff --git a/curl.changes b/curl.changes index 8f404a4..44e447a 100644 --- a/curl.changes +++ b/curl.changes @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Sat Apr 9 20:42:27 UTC 2011 - crrodriguez@opensuse.org + +- Support openSSL compiled without SSLv2 support +- Update to version 7.21.4 + * SMTP: add brackets for MAIL FROM + * multi: connect fail => use next IP address + * pubkey_show: allocate buffer to fit any-size result + * Curl_do: avoid using stale conn pointer + * tftpd test server: avoid buffer overflow report from glibc + * OpenSSL get_cert_chain: support larger data sets + * SCP/SFTP transfers: acknowledge speedcheck + * connect problem: use UDP correctly + * OpenSSL: improved error message on SSL_CTX_new failures + * HTTP: memory leak on multiple Location: + * curl.1: typo in -v description + * CURLOPT_SOCKOPTFUNCTION: return proper error code --keepalive-time + * file: add support for CURLOPT_TIMECONDITION + * multi: fix CURLM_STATE_TOOFAST for multi_socket +------------------------------------------------------------------- Fri Oct 22 16:37:03 UTC 2010 - cristian.rodriguez@opensuse.org - Update to version 7.21.2 diff --git a/curl.spec b/curl.spec index 606fc03..4025cc5 100644 --- a/curl.spec +++ b/curl.spec @@ -40,8 +40,8 @@ BuildRequires: libssh2-devel openssh BuildRequires: stunnel %endif #define cvs_suffix -20090302 -Version: 7.21.2 -Release: 1 +Version: 7.21.4 +Release: 2 AutoReqProv: on # bug437293 %ifarch ppc64 @@ -55,6 +55,7 @@ Url: http://curl.haxx.se/ Source: curl-%version%{?cvs_suffix}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch: curl-no-sslv2.patch %description Curl is a client to get documents and files from or send documents to a @@ -87,7 +88,7 @@ user interaction or any kind of interactivity. %prep %setup -q -n curl-%version%{?cvs_suffix} - +%patch %build # local hack to make curl-config --libs stop printing libraries it depends on # (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere, @@ -114,7 +115,9 @@ export CFLAGS="$RPM_OPT_FLAGS" --with-libssh2\ --libdir=%{_libdir} \ --enable-hidden-symbols \ - --disable-static + --disable-static \ + --enable-threaded-resolver + : 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 From 260af4b004f1511b70edab902356ddd2acd90226f65046f402c14197b57b1fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Thu, 14 Apr 2011 17:23:57 +0000 Subject: [PATCH 2/8] Accepting request 67319 from home:elvigia:branches:devel:libraries:c_c++ OBS-URL: https://build.opensuse.org/request/show/67319 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=45 --- curl.changes | 6 ++++++ curl.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/curl.changes b/curl.changes index 44e447a..8b939f0 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 14 17:02:19 UTC 2011 - crrodriguez@opensuse.org + +- bnc598574 has been fixed in upstream commit 8ab137b2bc9630ce20f4 + already, so enable c-ares support again. + ------------------------------------------------------------------- Sat Apr 9 20:42:27 UTC 2011 - crrodriguez@opensuse.org diff --git a/curl.spec b/curl.spec index 4025cc5..8f032bc 100644 --- a/curl.spec +++ b/curl.spec @@ -35,6 +35,7 @@ BuildRequires: krb5-devel BuildRequires: heimdal-devel %endif BuildRequires: libssh2-devel openssh +BuildRequires: libcares-devel %if 0%{?_with_stunnel:1} # used by the testsuite BuildRequires: stunnel @@ -116,7 +117,7 @@ export CFLAGS="$RPM_OPT_FLAGS" --libdir=%{_libdir} \ --enable-hidden-symbols \ --disable-static \ - --enable-threaded-resolver + --enable-ares : if this fails, the above sed hack did not work ./libtool --config | grep -q link_all_deplibs=no From c2cfddf9bf3902c9c9567ef5b0bc0fc374cd211c8015beab61077d5aa7a9e1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 20 May 2011 15:40:30 +0000 Subject: [PATCH 3/8] Accepting request 70837 from home:elvigia:branches:devel:libraries:c_c++ - Update to 7.21.6 * curl-config: fix --version * use HTTPS properly after CONNECT * SFTP: close file before post quote operations OBS-URL: https://build.opensuse.org/request/show/70837 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=46 --- _service | 12 ------------ _service:download_url:curl-7.21.4.tar.bz2 | 3 --- curl-7.21.6.tar.bz2 | 3 +++ curl-no-sslv2.patch | 16 ---------------- curl.changes | 8 ++++++++ curl.spec | 6 +++--- 6 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 _service delete mode 100644 _service:download_url:curl-7.21.4.tar.bz2 create mode 100644 curl-7.21.6.tar.bz2 delete mode 100644 curl-no-sslv2.patch diff --git a/_service b/_service deleted file mode 100644 index f94c024..0000000 --- a/_service +++ /dev/null @@ -1,12 +0,0 @@ - - - http - curl.haxx.se - /download/curl-7.21.4.tar.bz2 - - - _service:download_url:curl-7.21.4.tar.bz2 - sha256 - d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1 - - \ No newline at end of file diff --git a/_service:download_url:curl-7.21.4.tar.bz2 b/_service:download_url:curl-7.21.4.tar.bz2 deleted file mode 100644 index 64ce98b..0000000 --- a/_service:download_url:curl-7.21.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1 -size 2256354 diff --git a/curl-7.21.6.tar.bz2 b/curl-7.21.6.tar.bz2 new file mode 100644 index 0000000..8664a8e --- /dev/null +++ b/curl-7.21.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9a3d3593796147ad9ca994c9e6834a42b49756420a10e996dbf849495d3d955 +size 2311355 diff --git a/curl-no-sslv2.patch b/curl-no-sslv2.patch deleted file mode 100644 index 23f102e..0000000 --- a/curl-no-sslv2.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/ssluse.c.orig -+++ lib/ssluse.c -@@ -1449,8 +1449,13 @@ ossl_connect_step1(struct connectdata *c - use_sni(TRUE); - break; - case CURL_SSLVERSION_SSLv2: -+#ifdef OPENSSL_NO_SSL2 -+ failf(data, "openSSL was compiled without SSLv2 support"); -+ return CURLE_SSL_CONNECT_ERROR; -+#else - req_method = SSLv2_client_method(); - use_sni(FALSE); -+#endif - break; - case CURL_SSLVERSION_SSLv3: - req_method = SSLv3_client_method(); diff --git a/curl.changes b/curl.changes index 8b939f0..a930685 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri May 20 15:37:54 UTC 2011 - crrodriguez@opensuse.org + +- Update to 7.21.6 +* curl-config: fix --version +* use HTTPS properly after CONNECT +* SFTP: close file before post quote operations + ------------------------------------------------------------------- Thu Apr 14 17:02:19 UTC 2011 - crrodriguez@opensuse.org diff --git a/curl.spec b/curl.spec index 8f032bc..69200d3 100644 --- a/curl.spec +++ b/curl.spec @@ -41,7 +41,7 @@ BuildRequires: libcares-devel BuildRequires: stunnel %endif #define cvs_suffix -20090302 -Version: 7.21.4 +Version: 7.21.6 Release: 2 AutoReqProv: on # bug437293 @@ -56,7 +56,6 @@ Url: http://curl.haxx.se/ Source: curl-%version%{?cvs_suffix}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch: curl-no-sslv2.patch %description Curl is a client to get documents and files from or send documents to a @@ -89,13 +88,14 @@ user interaction or any kind of interactivity. %prep %setup -q -n curl-%version%{?cvs_suffix} -%patch + %build # 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) sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure export CFLAGS="$RPM_OPT_FLAGS" +export LDFLAGS="-Wl,--no-copy-dt-needed-entries" ./configure \ --prefix=%{_prefix} \ --enable-ipv6 \ From fd7ee2a250b6ddbc61e23b3917c0c75749082a9093d244baa02e026b2c12674f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 20 May 2011 16:27:14 +0000 Subject: [PATCH 4/8] Accepting request 70846 from home:elvigia:branches:devel:libraries:c_c++ - remove unintented LDFLAGS from the spec file OBS-URL: https://build.opensuse.org/request/show/70846 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=47 --- curl.changes | 5 +++++ curl.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/curl.changes b/curl.changes index a930685..4dd0397 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 20 16:25:34 UTC 2011 - crrodriguez@opensuse.org + +- remove unintented LDFLAGS from the spec file + ------------------------------------------------------------------- Fri May 20 15:37:54 UTC 2011 - crrodriguez@opensuse.org diff --git a/curl.spec b/curl.spec index 69200d3..eb5226b 100644 --- a/curl.spec +++ b/curl.spec @@ -95,7 +95,6 @@ user interaction or any kind of interactivity. # will hopefully change in the future) sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure export CFLAGS="$RPM_OPT_FLAGS" -export LDFLAGS="-Wl,--no-copy-dt-needed-entries" ./configure \ --prefix=%{_prefix} \ --enable-ipv6 \ From 0fd32f71d0703e3be412f65b5af0f9bc8c15c4f890810d42801002c822309108 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 11 Jul 2011 11:18:11 +0000 Subject: [PATCH 5/8] - Fix libcurl inappropriate GSSAPI delegation. Full details at http://curl.haxx.se/docs/adv_20110623.html - Use the lzma compressed tarball provided upstreams. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=48 --- curl-7.21.6.tar.bz2 | 3 --- curl-7.21.7.tar.lzma | 3 +++ curl.changes | 7 +++++++ curl.spec | 10 +++++----- 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 curl-7.21.6.tar.bz2 create mode 100644 curl-7.21.7.tar.lzma diff --git a/curl-7.21.6.tar.bz2 b/curl-7.21.6.tar.bz2 deleted file mode 100644 index 8664a8e..0000000 --- a/curl-7.21.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9a3d3593796147ad9ca994c9e6834a42b49756420a10e996dbf849495d3d955 -size 2311355 diff --git a/curl-7.21.7.tar.lzma b/curl-7.21.7.tar.lzma new file mode 100644 index 0000000..c86691f --- /dev/null +++ b/curl-7.21.7.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b85e3eca6a57e5dcc11625bfbd1252fef65556e1a21556819de135dcf46befe +size 1893556 diff --git a/curl.changes b/curl.changes index 4dd0397..16a82bf 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 11 11:40:17 CEST 2011 - pth@suse.de + +- Fix libcurl inappropriate GSSAPI delegation. Full details at + http://curl.haxx.se/docs/adv_20110623.html +- Use the lzma compressed tarball provided upstreams. + ------------------------------------------------------------------- Fri May 20 16:25:34 UTC 2011 - crrodriguez@opensuse.org diff --git a/curl.spec b/curl.spec index eb5226b..edc79e3 100644 --- a/curl.spec +++ b/curl.spec @@ -22,7 +22,7 @@ %bcond_without testsuite Name: curl -BuildRequires: libidn-devel openldap2-devel pkg-config zlib-devel +BuildRequires: libidn-devel openldap2-devel pkg-config zlib-devel lzma %if %{with openssl} BuildRequires: openssl-devel %endif @@ -41,7 +41,7 @@ BuildRequires: libcares-devel BuildRequires: stunnel %endif #define cvs_suffix -20090302 -Version: 7.21.6 +Version: 7.21.7 Release: 2 AutoReqProv: on # bug437293 @@ -53,7 +53,7 @@ License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Web/Utilities Summary: A Tool for Transferring Data from URLs Url: http://curl.haxx.se/ -Source: curl-%version%{?cvs_suffix}.tar.bz2 +Source: curl-%version%{?cvs_suffix}.tar.lzma Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,7 +94,7 @@ user interaction or any kind of interactivity. # (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 -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" ./configure \ --prefix=%{_prefix} \ --enable-ipv6 \ @@ -146,7 +146,7 @@ perl ./runtests.pl -a -b$base || { %endif %install -make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} +%{makeinstall} rm $RPM_BUILD_ROOT%_libdir/libcurl.la install -d $RPM_BUILD_ROOT/usr/share/aclocal install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/ From b1c16ce5cdc0d677cbafc63557699ab7817e32dc270393d6f1938c0cacd39698 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 11 Jul 2011 11:20:30 +0000 Subject: [PATCH 6/8] - Update to 7.21.7: - Fix libcurl inappropriate GSSAPI delegation. Full details at http://curl.haxx.se/docs/adv_20110623.html - Some other minor fixes. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=49 --- curl.changes | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/curl.changes b/curl.changes index 16a82bf..7262249 100644 --- a/curl.changes +++ b/curl.changes @@ -1,8 +1,11 @@ ------------------------------------------------------------------- Mon Jul 11 11:40:17 CEST 2011 - pth@suse.de -- Fix libcurl inappropriate GSSAPI delegation. Full details at - http://curl.haxx.se/docs/adv_20110623.html +- Update to 7.21.7: + - Fix libcurl inappropriate GSSAPI delegation. Full details at + http://curl.haxx.se/docs/adv_20110623.html + - Some other minor fixes. + - Use the lzma compressed tarball provided upstreams. ------------------------------------------------------------------- From fc4516d97cbeeccc4d184ba0fa1f87a94ab41393c8f3b6ab3a8a8b0e4a320597 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 12 Jul 2011 06:46:16 +0000 Subject: [PATCH 7/8] - remove support for old suse_versions OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=50 --- curl.changes | 5 +++++ curl.spec | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/curl.changes b/curl.changes index 7262249..2097ccb 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 12 06:46:02 UTC 2011 - coolo@novell.com + +- remove support for old suse_versions + ------------------------------------------------------------------- Mon Jul 11 11:40:17 CEST 2011 - pth@suse.de diff --git a/curl.spec b/curl.spec index edc79e3..83e0d7b 100644 --- a/curl.spec +++ b/curl.spec @@ -29,11 +29,7 @@ BuildRequires: openssl-devel %if %{with mozilla_nss} BuildRequires: mozilla-nss-devel %endif -%if 0%{suse_version} > 930 BuildRequires: krb5-devel -%else -BuildRequires: heimdal-devel -%endif BuildRequires: libssh2-devel openssh BuildRequires: libcares-devel %if 0%{?_with_stunnel:1} @@ -107,11 +103,7 @@ export CFLAGS="%{optflags}" --with-nss \ %endif %endif -%if %suse_version > 930 --with-gssapi=/usr/lib/mit \ -%else - --with-gssapi=/usr/lib/heimdal \ -%endif --with-libssh2\ --libdir=%{_libdir} \ --enable-hidden-symbols \ From 5cc5b4cf766070170ec25bce90779c04f1f3ba5181f6aae714d668ad46ad167c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 3 Aug 2011 09:41:39 +0000 Subject: [PATCH 8/8] - bnc#598574 has been fixed in upstream commit 8ab137b2bc9630ce20f4 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=51 --- curl.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/curl.changes b/curl.changes index 2097ccb..4ca5499 100644 --- a/curl.changes +++ b/curl.changes @@ -29,7 +29,7 @@ Fri May 20 15:37:54 UTC 2011 - crrodriguez@opensuse.org ------------------------------------------------------------------- Thu Apr 14 17:02:19 UTC 2011 - crrodriguez@opensuse.org -- bnc598574 has been fixed in upstream commit 8ab137b2bc9630ce20f4 +- bnc#598574 has been fixed in upstream commit 8ab137b2bc9630ce20f4 already, so enable c-ares support again. -------------------------------------------------------------------