OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=25

curl-7.18.0.tar.bz2

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

curl-7.18.1.tar.bz2

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

curl-better-gssapi-check.patch

@@ -1,31 +0,0 @@
----
- configure.ac |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- configure.ac.orig
-+++ configure.ac
-@@ -977,18 +977,18 @@ if test x"$want_gss" = xyes; then
-       gnu_gss=yes
-     ],
-     [
--      dnl not found, check Heimdal
--      AC_CHECK_HEADER(gssapi.h,
-+      dnl not found, check MIT
-+      AC_CHECK_HEADER(gssapi/gssapi.h,
-         [
-           dnl found in the given dirs
--          AC_DEFINE(HAVE_GSSHEIMDAL, 1, [if you have the Heimdal gssapi libraries])
-+          AC_DEFINE(HAVE_GSSMIT, 1, [if you have the MIT gssapi libraries])
-         ],
-         [
--          dnl not found, check in gssapi/ subdir
--          AC_CHECK_HEADER(gssapi/gssapi.h,
-+          dnl not found, check for Heimdal
-+          AC_CHECK_HEADER(gssapi.h,
-             [
-               dnl found
--              AC_DEFINE(HAVE_GSSMIT, 1, [if you have the MIT gssapi libraries])
-+              AC_DEFINE(HAVE_GSSHEIMDAL, 1, [if you have the Heimdal gssapi libraries])
-             ],
-             [
-               dnl no header found, disabling GSS

curl-gssapi-libs.patch

@@ -1,36 +0,0 @@
----
- configure.ac |   17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
---- configure.ac.orig
-+++ configure.ac
-@@ -1010,18 +1010,23 @@ if test x"$want_gss" = xyes; then
- 
-   if test -n "$gnu_gss"; then
-     curl_gss_msg="enabled (GNU GSS)"
--    LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR -lgss"
-+    LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
-+    LIBS="$LIBS -lgss"
-   elif test -z "$GSSAPI_LIB_DIR"; then
-      if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
--        gss_ldflags=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
--        LDFLAGS="$LDFLAGS $gss_ldflags"
-+        dnl krb5-config doesn't have --libs-only-L or similar, put everything
-+        dnl into LIBS
-+        gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
-+        LIBS="$LIBS $gss_libs"
-      elif test "$GSSAPI_ROOT" != "yes"; then
--        LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff -lgssapi"
-+        LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
-+        LIBS="$LIBS -lgssapi"
-      else
--        LDFLAGS="$LDFLAGS -lgssapi"
-+        LIBS="$LIBS -lgssapi"
-      fi
-   else
--     LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR -lgssapi"
-+     LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
-+     LIBS="$LIBS -lgssapi"
-   fi
- else
-   CPPFLAGS="$save_CPPFLAGS"

curl-test553.patch

@@ -1,11 +0,0 @@
----
- tests/data/test553 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- tests/data/test553.orig
-+++ tests/data/test553
-@@ -50,3 +50,3 @@ http://%HOSTIP:%HTTPPORT/path/553
- POST /path/553 HTTP/1.1
--Host: 127.0.0.1:8990
-+Host: %HOSTIP:%HTTPPORT
- Accept: */*

curl-use-openssl-cacerts.patch

@@ -1,37 +0,0 @@
-Use /etc/ssl/certs instead of /usr/share/curl/curl-ca-bundle.crt.
-TODO: do it in a cleaner (configurable) way and submit upstream.
----
- lib/easy.c |    5 +----
- lib/url.c  |    7 ++-----
- 2 files changed, 3 insertions(+), 9 deletions(-)
-
---- lib/easy.c.orig
-+++ lib/easy.c
-@@ -743,10 +743,7 @@ void curl_easy_reset(CURL *curl)
-    */
-   data->set.ssl.verifypeer = TRUE;
-   data->set.ssl.verifyhost = 2;
--#ifdef CURL_CA_BUNDLE
--  /* This is our prefered CA cert bundle since install time */
--  (void) curl_easy_setopt(curl, CURLOPT_CAINFO, (char *) CURL_CA_BUNDLE);
--#endif
-+  (void) curl_easy_setopt(curl, CURLOPT_CAPATH, "/etc/ssl/certs");
- 
-   data->set.ssh_auth_types = CURLSSH_AUTH_DEFAULT; /* defaults to any auth
-                                                       type */
---- lib/url.c.orig
-+++ lib/url.c
-@@ -749,11 +749,8 @@ CURLcode Curl_open(struct SessionHandle
-     data->set.ssl.verifypeer = TRUE;
-     data->set.ssl.verifyhost = 2;
-     data->set.ssl.sessionid = TRUE; /* session ID caching enabled by default */
--#ifdef CURL_CA_BUNDLE
--    /* This is our preferred CA cert bundle since install time */
--    res = setstropt(&data->set.str[STRING_SSL_CAFILE],
--                         (char *) CURL_CA_BUNDLE);
--#endif
-+    res = setstropt(&data->set.str[STRING_SSL_CAPATH],
-+                         "/etc/ssl/certs");
-   }
- 
-   if(res) {

curl.changes

@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Wed Apr  2 13:53:43 CEST 2008 - mmarek@suse.de
+
+- obsolete curl-ca-bundle by the library package
+
+-------------------------------------------------------------------
+Mon Mar 31 10:16:30 CEST 2008 - mmarek@suse.cz
+
+- updated to 7.18.1
+  * minor fixes since last update
+
+-------------------------------------------------------------------
+Fri Mar 21 17:42:35 CET 2008 - mmarek@suse.cz
+
+- updated to cvs snapshot 20080321
+  * added support for HttpOnly cookies
+  * we no longer distribute or install a ca cert bundle
+  * SSLv2 is now disabled by default for SSL operations
+  * the test509-style setting URL in callback is officially no
+    longer supported
+  * support a full chain of certificates in a given PKCS12
+    certificate
+  * resumed transfers work with SFTP
+  * added type checking macros for curl_easy_setopt() and
+    curl_easy_getinfo(), watch out for new warnings in code using
+    libcurl (needs gcc-4.3 and currently only works in C mode)
+  * curl_easy_setopt(), curl_easy_getinfo(), curl_share_setopt()
+    and curl_multi_setopt() uses are now checked to use exactly
+    three arguments
+
+
 -------------------------------------------------------------------
 Mon Mar 10 11:03:56 CET 2008 - mmarek@suse.cz
 

curl.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package curl (Version 7.18.0)
+# spec file for package curl (Version 7.18.1)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -15,18 +15,14 @@ Name:           curl
 BuildRequires:  krb5-devel libidn-devel openldap2-devel openssl-devel zlib-devel
 # used by the testsuite
 BuildRequires:  stunnel
-Version:        7.18.0
+Version:        7.18.1
-Release:        16
+Release:        1
 AutoReqProv:    on
 License:        BSD 3-Clause; X11/MIT
 Group:          Productivity/Networking/Web/Utilities
 Summary:        A Tool for Transferring Data from URLs
 Url:            http://curl.haxx.se/
 Source:         curl-%{version}.tar.bz2
-Patch1:         curl-test553.patch
-Patch2:         curl-use-openssl-cacerts.patch
-Patch3:         curl-better-gssapi-check.patch
-Patch4:         curl-gssapi-libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -37,26 +33,18 @@ user interaction or any kind of interactivity.
 
 
 
-Authors:
---------
-    Daniel Stenberg <Daniel.Stenberg@haxx.se>
-
-%package ca-bundle
-Summary:        Bundle of CA Root Certificates for cURL
-Group:          Productivity/Networking/Web/Utilities
-
-%description ca-bundle
-Bundle of CA Root Certificates for cURL.
-
-
-
 Authors:
 --------
     Daniel Stenberg <Daniel.Stenberg@haxx.se>
 
 %package -n libcurl4
+License:        BSD 3-Clause; X11/MIT
 Summary:        cURL shared library version 4
 Group:          Productivity/Networking/Web/Utilities
+# curl-ca-bundle doesn't exist since openSUSE 11.0, remove it on update
+# XXX: nothing actually provides curl-ca-bundle anymore
+#Provides:       curl-ca-bundle
+Obsoletes:      curl-ca-bundle
 
 %description -n libcurl4
 cURL shared library version 4.
@@ -68,6 +56,7 @@ Authors:
     Daniel Stenberg <Daniel.Stenberg@haxx.se>
 
 %package -n libcurl-devel
+License:        BSD 3-Clause; X11/MIT
 Summary:        A Tool for Transferring Data from URLs
 Group:          Development/Libraries/C and C++
 Requires:       libcurl4 = %{version} glibc-devel
@@ -89,10 +78,6 @@ Authors:
 
 %prep
 %setup -q
-%patch1
-%patch2
-%patch3
-%patch4
 
 %build
 autoreconf -fi
@@ -105,6 +90,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
 	--prefix=%{_prefix} \
 	--enable-ipv6 \
 	--with-ssl \
+	--with-ca-path=/etc/ssl/certs/ \
 	--with-gssapi=/usr/lib/mit \
 	--libdir=%{_libdir} \
 	--enable-hidden-symbols \
@@ -152,11 +138,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/bin/curl
 %doc %{_mandir}/man1/curl.1.gz
 
-%files ca-bundle
-%defattr(-,root,root)
-%dir %{_prefix}/share/curl
-%{_prefix}/share/curl/curl-ca-bundle.crt
-
 %files -n libcurl4
 %defattr(-,root,root)
 %{_libdir}/libcurl.so.4*
@@ -172,6 +153,27 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 02 2008 mmarek@suse.de
+- obsolete curl-ca-bundle by the library package
+* Mon Mar 31 2008 mmarek@suse.cz
+- updated to 7.18.1
+  * minor fixes since last update
+* Fri Mar 21 2008 mmarek@suse.cz
+- updated to cvs snapshot 20080321
+  * added support for HttpOnly cookies
+  * we no longer distribute or install a ca cert bundle
+  * SSLv2 is now disabled by default for SSL operations
+  * the test509-style setting URL in callback is officially no
+  longer supported
+  * support a full chain of certificates in a given PKCS12
+  certificate
+  * resumed transfers work with SFTP
+  * added type checking macros for curl_easy_setopt() and
+  curl_easy_getinfo(), watch out for new warnings in code using
+  libcurl (needs gcc-4.3 and currently only works in C mode)
+  * curl_easy_setopt(), curl_easy_getinfo(), curl_share_setopt()
+  and curl_multi_setopt() uses are now checked to use exactly
+  three arguments
 * Mon Mar 10 2008 mmarek@suse.cz
 - clean up curl-config --libs output, thanks to Cristian Rodríguez
   for pointing it out