From d915a8423011e871f1b63ccc7c23cd1e556b770f9645f366ece9dc53e0307292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Wed, 16 Jun 2010 14:02:02 +0000 Subject: [PATCH 1/3] Accepting request 41589 from home:lnussel:nss Copy from home:lnussel:nss/curl via accept of submit request 41589 revision 3. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/41589 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=38 --- curl.changes | 5 +++++ curl.spec | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/curl.changes b/curl.changes index bab915a..8e3770c 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 2 14:12:54 UTC 2010 - lnussel@suse.de + +- allowing switching to nss instead of openssl via bcond + ------------------------------------------------------------------- Mon May 10 01:12:22 UTC 2010 - crrodriguez@opensuse.org diff --git a/curl.spec b/curl.spec index 1d6c565..b2f830f 100644 --- a/curl.spec +++ b/curl.spec @@ -17,9 +17,18 @@ # norootforbuild +%bcond_without openssl +%bcond_with mozilla_nss +%bcond_without testsuite Name: curl -BuildRequires: libidn-devel openldap2-devel openssl-devel pkg-config zlib-devel +BuildRequires: libidn-devel openldap2-devel pkg-config zlib-devel +%if %{with openssl} +BuildRequires: openssl-devel +%endif +%if %{with mozilla_nss} +BuildRequires: mozilla-nss-devel +%endif %if 0%{suse_version} > 930 BuildRequires: krb5-devel %else @@ -88,8 +97,15 @@ export CFLAGS="$RPM_OPT_FLAGS" ./configure \ --prefix=%{_prefix} \ --enable-ipv6 \ +%if %{with openssl} --with-ssl \ --with-ca-path=/etc/ssl/certs/ \ +%else + --without-ssl \ +%if %{with mozilla_nss} + --with-nss \ +%endif +%endif %if %suse_version > 930 --with-gssapi=/usr/lib/mit \ %else @@ -103,6 +119,9 @@ export CFLAGS="$RPM_OPT_FLAGS" ./libtool --config | grep -q link_all_deplibs=no # enable-hidden-symbols needs gcc4 and causes that curl exports only its API make %{?jobs:-j%jobs} + +%if %{with testsuite} +%check cd tests make # make sure the testsuite runs don't race on MP machines in autobuild @@ -120,6 +139,7 @@ perl ./runtests.pl -a -b$base || { echo "WARNING: runtests.pl failed with code $?, continuing nevertheless" %endif } +%endif %install make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} From dcc865d447c0cbc84503e3bd3a18869acebb6df3af31a201a28252aeea3e4b80 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 18 Jun 2010 03:58:32 +0000 Subject: [PATCH 2/3] Accepting request 41607 from devel:libraries:c_c++ checked in (request 41607) OBS-URL: https://build.opensuse.org/request/show/41607 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=39 --- curl.changes | 5 ----- curl.spec | 22 +--------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/curl.changes b/curl.changes index 8e3770c..bab915a 100644 --- a/curl.changes +++ b/curl.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Jun 2 14:12:54 UTC 2010 - lnussel@suse.de - -- allowing switching to nss instead of openssl via bcond - ------------------------------------------------------------------- Mon May 10 01:12:22 UTC 2010 - crrodriguez@opensuse.org diff --git a/curl.spec b/curl.spec index b2f830f..1d6c565 100644 --- a/curl.spec +++ b/curl.spec @@ -17,18 +17,9 @@ # norootforbuild -%bcond_without openssl -%bcond_with mozilla_nss -%bcond_without testsuite Name: curl -BuildRequires: libidn-devel openldap2-devel pkg-config zlib-devel -%if %{with openssl} -BuildRequires: openssl-devel -%endif -%if %{with mozilla_nss} -BuildRequires: mozilla-nss-devel -%endif +BuildRequires: libidn-devel openldap2-devel openssl-devel pkg-config zlib-devel %if 0%{suse_version} > 930 BuildRequires: krb5-devel %else @@ -97,15 +88,8 @@ export CFLAGS="$RPM_OPT_FLAGS" ./configure \ --prefix=%{_prefix} \ --enable-ipv6 \ -%if %{with openssl} --with-ssl \ --with-ca-path=/etc/ssl/certs/ \ -%else - --without-ssl \ -%if %{with mozilla_nss} - --with-nss \ -%endif -%endif %if %suse_version > 930 --with-gssapi=/usr/lib/mit \ %else @@ -119,9 +103,6 @@ export CFLAGS="$RPM_OPT_FLAGS" ./libtool --config | grep -q link_all_deplibs=no # enable-hidden-symbols needs gcc4 and causes that curl exports only its API make %{?jobs:-j%jobs} - -%if %{with testsuite} -%check cd tests make # make sure the testsuite runs don't race on MP machines in autobuild @@ -139,7 +120,6 @@ perl ./runtests.pl -a -b$base || { echo "WARNING: runtests.pl failed with code $?, continuing nevertheless" %endif } -%endif %install make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} From 1c1dbecbb5da22a472a42f22f056e5efd8eb4b045117c2b3c7d91c9e416a8730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 22 Oct 2010 17:36:46 +0000 Subject: [PATCH 3/3] Accepting request 51270 from home:elvigia:branches:devel:libraries:c_c++ OBS-URL: https://build.opensuse.org/request/show/51270 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=40 --- _service | 13 +++++++++++++ curl-7.20.1.tar.bz2 | 3 --- curl.changes | 42 ++++++++++++++++++++++++++++++++++++++++++ curl.spec | 27 ++++++++++++++++++++++++--- 4 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 _service delete mode 100644 curl-7.20.1.tar.bz2 diff --git a/_service b/_service new file mode 100644 index 0000000..05be4a1 --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + + http + curl.haxx.se + /download/curl-7.21.2.tar.bz2 + + + _service:download_url:curl-7.21.2.tar.bz2 + sha256 + f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21 + + diff --git a/curl-7.20.1.tar.bz2 b/curl-7.20.1.tar.bz2 deleted file mode 100644 index 9399c57..0000000 --- a/curl-7.20.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70664da8e2a8c84327abd10ed30d5a3fc9fa2151def9ee5b75f27e3538554e56 -size 2097637 diff --git a/curl.changes b/curl.changes index bab915a..8f404a4 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Fri Oct 22 16:37:03 UTC 2010 - cristian.rodriguez@opensuse.org + +- Update to version 7.21.2 + * curl -T: ignore file size of special files + * Added GOPHER protocol support + * Added mk-ca-bundle.vbs script + * c-ares build now requires c-ares >= 1.6.0 + * --remote-header-name security vulnerability fixed + * multi: support the timeouts correctly, fixes known bug #62 + * multi: use timeouts properly for MAX_RECV/SEND_SPEED + * negotiation: Wrong proxy authorization + * multi: avoid sending multiple complete messages + * cmdline: make -F type= accept ;charset= + * RESUME_FROM: clarify what ftp uploads do + * http: handle trailer headers in all chunked responses + * Curl_is_connected: use correct errno + * progress: callback for POSTs less than MAX_INITIAL_POST_SIZE + * Link curl and the test apps with -lrt explicitly when necessary + * chunky parser: only rewind stream internally if needed + * remote-header-name: don't output filename when NULL + * Curl_timeleft: avoid returning "no timeout" by mistake + * timeout: use the correct start value as offset + * FTP: fix wrong timeout trigger + * rtsp: avoid SIGSEGV on malformed header + * LDAP: Support for tunnelling queries through HTTP proxy + * curl_easy_duphandle: clone the c-ares handle correctly + * support URL containing colon without trailing port number + * parsedate: allow time specified without seconds + * curl_easy_escape: don't escape "unreserved" characters + * SFTP: avoid downloading negative sizes + * Lots of GSS/KRB FTP fixes + * TFTP: Work around tftpd-hpa upload bug + * libcurl.m4: several fixes + * HTTP: remove special case for 416 + * globbing: fix crash on unballanced open brace + +------------------------------------------------------------------- +Wed Jun 2 14:12:54 UTC 2010 - lnussel@suse.de + +- allowing switching to nss instead of openssl via bcond + ------------------------------------------------------------------- Mon May 10 01:12:22 UTC 2010 - crrodriguez@opensuse.org diff --git a/curl.spec b/curl.spec index 1d6c565..47f6229 100644 --- a/curl.spec +++ b/curl.spec @@ -17,9 +17,18 @@ # norootforbuild +%bcond_without openssl +%bcond_with mozilla_nss +%bcond_without testsuite Name: curl -BuildRequires: libidn-devel openldap2-devel openssl-devel pkg-config zlib-devel +BuildRequires: libidn-devel openldap2-devel pkg-config zlib-devel +%if %{with openssl} +BuildRequires: openssl-devel +%endif +%if %{with mozilla_nss} +BuildRequires: mozilla-nss-devel +%endif %if 0%{suse_version} > 930 BuildRequires: krb5-devel %else @@ -31,8 +40,8 @@ BuildRequires: libssh2-devel openssh BuildRequires: stunnel %endif #define cvs_suffix -20090302 -Version: 7.20.1 -Release: 2 +Version: 7.21.2 +Release: 3 AutoReqProv: on # bug437293 %ifarch ppc64 @@ -88,8 +97,15 @@ export CFLAGS="$RPM_OPT_FLAGS" ./configure \ --prefix=%{_prefix} \ --enable-ipv6 \ +%if %{with openssl} --with-ssl \ --with-ca-path=/etc/ssl/certs/ \ +%else + --without-ssl \ +%if %{with mozilla_nss} + --with-nss \ +%endif +%endif %if %suse_version > 930 --with-gssapi=/usr/lib/mit \ %else @@ -103,6 +119,10 @@ export CFLAGS="$RPM_OPT_FLAGS" ./libtool --config | grep -q link_all_deplibs=no # enable-hidden-symbols needs gcc4 and causes that curl exports only its API make %{?jobs:-j%jobs} + +%if %{with testsuite} + +%check cd tests make # make sure the testsuite runs don't race on MP machines in autobuild @@ -120,6 +140,7 @@ perl ./runtests.pl -a -b$base || { echo "WARNING: runtests.pl failed with code $?, continuing nevertheless" %endif } +%endif %install make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}