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

2007-10-09 14:57:38 +00:00 · 2007-10-09 14:57:38 +00:00 · 2a68970f04
commit 2a68970f04
parent 16a56af88e
6 changed files with 114 additions and 57 deletions
--- a/curl-7.16.4.tar.bz2
+++ b/curl-7.16.4.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45c69529126b6ff50e7ebe2c2b8157a4ecb405174a1349234903021e9ac5c87b
-size 1668101
--- a/curl-7.17.0-cvs-fixes.patch
+++ b/curl-7.17.0-cvs-fixes.patch
@ -1,10 +1,55 @@
+Index: lib/escape.c
+===================================================================
+RCS file: /cvsroot/curl/curl/lib/escape.c,v
+retrieving revision 1.40
+retrieving revision 1.41
+diff -u -p -r1.40 -r1.41
+--- lib/escape.c	26 Aug 2007 05:53:26 -0000	1.40
+++ lib/escape.c	30 Sep 2007 22:40:24 -0000	1.41
+@@ -5,7 +5,7 @@
+  *                            | (__| |_| |  _ <| |___
+  *                             \___|\___/|_| \_\_____|
+  *
+- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution. The terms
+@@ -18,7 +18,7 @@
+  * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+  * KIND, either express or implied.
+  *
+- * $Id: escape.c,v 1.40 2007-08-26 05:53:26 danf Exp $
+ * $Id: escape.c,v 1.41 2007-09-30 22:40:24 bagder Exp $
+  ***************************************************************************/
+ 
+ /* Escape and unescape URL encoding in strings. The functions return a new
+@@ -59,7 +59,7 @@ char *curl_easy_escape(CURL *handle, con
+   size_t alloc = (inlength?(size_t)inlength:strlen(string))+1;
+   char *ns;
+   char *testing_ptr = NULL;
+-  char in;
+  unsigned char in; /* we need to treat the characters unsigned */
+   size_t newlen = alloc;
+   int strindex=0;
+   size_t length;
 Index: lib/http.c
 ===================================================================
 RCS file: /cvsroot/curl/curl/lib/http.c,v
 retrieving revision 1.334
-diff -u -p -r1.334 http.c
+retrieving revision 1.335
+diff -u -p -r1.334 -r1.335
 --- lib/http.c	27 Aug 2007 06:31:28 -0000	1.334
-+++ lib/http.c	14 Sep 2007 08:22:31 -0000
+++ lib/http.c	15 Sep 2007 21:14:13 -0000	1.335
+@@ -18,7 +18,7 @@
+  * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+  * KIND, either express or implied.
+  *
+- * $Id: http.c,v 1.334 2007-08-27 06:31:28 danf Exp $
+ * $Id: http.c,v 1.335 2007-09-15 21:14:13 bagder Exp $
+  ***************************************************************************/
+ 
+ #include "setup.h"
@@ -1740,6 +1740,7 @@ CURLcode Curl_http(struct connectdata *c
   CURLcode result=CURLE_OK;
   struct HTTP *http;
@ -30,9 +75,9 @@ diff -u -p -r1.334 http.c
 +          p = NULL;
 +        }
 +      }
-+      if (!p) {
-+        sprintf(ftp_typecode, ";type=%c", data->set.prefer_ascii ? 'a' : 'i');
-+      }
+      if (!p)
+        snprintf(ftp_typecode, sizeof(ftp_typecode), ";type=%c",
+                 data->set.prefer_ascii ? 'a' : 'i');
 +    }
   }
   if(HTTPREQ_POST_FORM == httpreq) {
@ -54,13 +99,33 @@ diff -u -p -r1.334 http.c
                 httpstring,
                 conn->allocptr.proxyuserpwd?
                 conn->allocptr.proxyuserpwd:"",
+Index: tests/data/test79
+===================================================================
+RCS file: /cvsroot/curl/curl/tests/data/test79,v
+retrieving revision 1.9
+retrieving revision 1.11
+diff -u -p -r1.9 -r1.11
+--- tests/data/test79	9 Mar 2007 21:01:40 -0000	1.9
+++ tests/data/test79	15 Sep 2007 21:14:13 -0000	1.11
+@@ -45,8 +45,8 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/pag
+ ^User-Agent:.*
+ </strip>
+ <protocol>
+-GET ftp://127.0.0.1:%HTTPPORT/we/want/that/page/79 HTTP/1.1
+-Host: 127.0.0.1:%HTTPPORT
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79;type=i HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+ Pragma: no-cache
+ Accept: */*
+ Proxy-Connection: Keep-Alive
 Index: tests/data/test208
 ===================================================================
 RCS file: /cvsroot/curl/curl/tests/data/test208,v
 retrieving revision 1.5
-diff -u -p -r1.5 test208
+retrieving revision 1.6
+diff -u -p -r1.5 -r1.6
 --- tests/data/test208	9 Mar 2007 21:01:40 -0000	1.5
-+++ tests/data/test208	14 Sep 2007 08:22:31 -0000
+++ tests/data/test208	15 Sep 2007 21:14:13 -0000	1.6
@@ -44,7 +44,7 @@ the
 ^User-Agent:.*
 </strip>
@ -70,19 +135,3 @@ diff -u -p -r1.5 test208
 Authorization: Basic ZGFuaWVsOm15c2VjcmV0
 Host: host.com:21
 Pragma: no-cache
-Index: tests/data/test79
-===================================================================
-RCS file: /cvsroot/curl/curl/tests/data/test79,v
-retrieving revision 1.9
-diff -u -p -r1.9 test79
--- tests/data/test79	9 Mar 2007 21:01:40 -0000	1.9
-+++ tests/data/test79	14 Sep 2007 08:22:31 -0000
-@@ -45,7 +45,7 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/pag
- ^User-Agent:.*
- </strip>
- <protocol>
-GET ftp://127.0.0.1:%HTTPPORT/we/want/that/page/79 HTTP/1.1
-+GET ftp://127.0.0.1:%HTTPPORT/we/want/that/page/79;type=i HTTP/1.1
- Host: 127.0.0.1:%HTTPPORT
- Pragma: no-cache
- Accept: */*
--- a/curl-7.17.0.tar.bz2
+++ b/curl-7.17.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3aabf85ef56afeddd66c7180971fbd6412133d85311a76b7a274f80982301cc3
+size 1698728
--- a/curl-strict-aliasing.patch
+++ b/curl-strict-aliasing.patch
@ -1,18 +0,0 @@
---
- lib/ldap.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
--- lib/ldap.c.orig
-+++ lib/ldap.c
-@@ -198,7 +198,10 @@ static dynafunc DynaGetFunction(const ch
-      * cannot typecast a data pointer to a function pointer, but that's
-      * exactly what we need to do here to avoid compiler warnings on picky
-      * compilers! */
-    *(void**) (&func) = dlsym(libldap, name);
-+    /* mmarek@suse.cz: I guess we can live with the void* -> funcptr conversion
-+     * on systems where dlsym is supported... anyway less harm that risking
-+     * strict aliasing bugs... */
-+    func = dlsym(libldap, name);
-   }
- #ifdef DL_LBER_FILE
-   if (!func && liblber) {
--- a/curl.changes
+++ b/curl.changes
@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Oct  8 17:28:01 CEST 2007 - mmarek@suse.cz
+
+- updated to 7.17.0
+  * curl_easy_setopt() now allocates strings passed to it
+  * LDAP libraries are now linked "regularly" and not with dlopen
+    (the strict-aliasing patch can go away)
+  * HTTP transfers have the download size info "available" earlier
+  * FTP transfers have the download size info "available" earlier
+  * several error codes and options were marked as obsolete and
+    subject to future removal (set CURL_NO_OLDIES to see if your
+    application is using them)
+  * some bugfixes (see /usr/share/doc/packages/curl/RELEASE-NOTES)
+- added fixes for some post-7.17 bugs
+- removed some less useful %%doc files
+
 -------------------------------------------------------------------
 Fri Sep 14 09:20:35 CEST 2007 - mmarek@suse.cz

--- a/curl.spec
+++ b/curl.spec
@ -1,5 +1,5 @@
 #
-# spec file for package curl (Version 7.16.4)
+# spec file for package curl (Version 7.17.0)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@ -11,18 +11,17 @@
 # norootforbuild

 Name:           curl
-BuildRequires:  libidn-devel libopenssl-devel zlib-devel
-Version:        7.16.4
-Release:        11
+BuildRequires:  libidn-devel libopenssl-devel openldap2-devel zlib-devel
+Version:        7.17.0
+Release:        1
 AutoReqProv:    on
-License:        BSD 3-Clause, X11/MIT
+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
+Patch0:         curl-7.17.0-cvs-fixes.patch
 Patch2:         curl-ipv6tests.patch
-Patch3:         curl-strict-aliasing.patch
-Patch4:         curl-ftp-httpproxy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@ -66,7 +65,7 @@ Authors:

 %package -n libcurl-devel
 Summary:        A Tool for Transferring Data from URLs
-Group:          Productivity/Networking/Web/Utilities
+Group:          Development/Libraries/C and C++
 Requires:       libcurl4 = %{version} zlib-devel libopenssl-devel libidn-devel
 # curl-devel (v 7.15.5) was last used in 10.2
 Provides:       curl-devel <= 7.15.5
@ -86,9 +85,8 @@ Authors:

 %prep
 %setup -q
+%patch0
 %patch2
-%patch3
-%patch4

 %build
 autoreconf -fi
@ -135,8 +133,8 @@ rm -rf $RPM_BUILD_ROOT

 %files
 %defattr(-,root,root)
-%doc CHANGES README RELEASE-NOTES
-%doc docs/{BUGS,CONTRIBUTE,FAQ,FEATURES,INTERNALS,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting}
+%doc README RELEASE-NOTES
+%doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting}
 %{_prefix}/bin/curl
 %doc %{_mandir}/man1/curl.1.gz

@ -158,8 +156,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcurl.pc
 %doc %{_mandir}/man1/curl-config.1.gz
 %doc %{_mandir}/man3/*
-
 %changelog
+* Mon Oct 08 2007 - mmarek@suse.cz
+- updated to 7.17.0
+  * curl_easy_setopt() now allocates strings passed to it
+  * LDAP libraries are now linked "regularly" and not with dlopen
+  (the strict-aliasing patch can go away)
+  * HTTP transfers have the download size info "available" earlier
+  * FTP transfers have the download size info "available" earlier
+  * several error codes and options were marked as obsolete and
+  subject to future removal (set CURL_NO_OLDIES to see if your
+  application is using them)
+  * some bugfixes (see /usr/share/doc/packages/curl/RELEASE-NOTES)
+- added fixes for some post-7.17 bugs
+- removed some less useful %%doc files
 * Fri Sep 14 2007 - mmarek@suse.cz
 - set transfer mode (binary/ascii) when retrieving ftp:// urls via
  an http proxy (curl-ftp-httpproxy.patch) [#306272]