Hello community, here is the log from the commit of package python-curl checked in at Fri Feb 2 16:14:01 CET 2007. -------- --- python-curl/python-curl.changes 2006-10-02 13:52:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-curl/python-curl.changes 2007-02-02 14:28:28.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 2 14:28:05 CET 2007 - mmarek@suse.cz + +- applied cvs fix for build with curl-7.16 + +------------------------------------------------------------------- New: ---- pycurl-7.15.5.1-cvs-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-curl.spec ++++++ --- /var/tmp/diff_new_pack.y22177/_old 2007-02-02 16:13:56.000000000 +0100 +++ /var/tmp/diff_new_pack.y22177/_new 2007-02-02 16:13:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-curl (Version 7.15.5.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,12 +14,13 @@ BuildRequires: curl-devel >= 7.15.5 BuildRequires: curl-devel python-devel Version: 7.15.5.1 -Release: 2 +Release: 29 Summary: Python module interface to the cURL library Source: pycurl-%{version}.tar.bz2 +Patch0: pycurl-7.15.5.1-cvs-fix.patch URL: http://pycurl.sourceforge.net/ Group: Development/Libraries/Python -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: curl >= 7.15.5 @@ -38,6 +39,7 @@ %prep %setup -q -n pycurl-%{version} +%patch0 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -60,6 +62,8 @@ %endif %changelog -n python-curl +* Fri Feb 02 2007 - mmarek@suse.cz +- applied cvs fix for build with curl-7.16 * Mon Oct 02 2006 - cthiel@suse.de - fix build on older distributions * Sun Oct 01 2006 - cthiel@suse.de ++++++ pycurl-7.15.5.1-cvs-fix.patch ++++++ --- src/pycurl.c +++ src/pycurl.c @@ -132,8 +132,6 @@ typedef struct { struct curl_slist *quote; struct curl_slist *postquote; struct curl_slist *prequote; - struct curl_slist *source_prequote; - struct curl_slist *source_postquote; /* callbacks */ PyObject *w_cb; PyObject *h_cb; @@ -669,8 +667,6 @@ util_curl_new(void) self->quote = NULL; self->postquote = NULL; self->prequote = NULL; - self->source_postquote = NULL; - self->source_prequote = NULL; /* Set callback pointers to NULL by default */ self->w_cb = NULL; @@ -860,8 +856,6 @@ util_curl_close(CurlObject *self) SFREE(self->quote); SFREE(self->postquote); SFREE(self->prequote); - SFREE(self->source_postquote); - SFREE(self->source_prequote); #undef SFREE /* Last, free the options. This must be done after the curl handle @@ -1475,9 +1469,6 @@ do_curl_setopt(CurlObject *self, PyObjec case CURLOPT_URL: case CURLOPT_USERAGENT: case CURLOPT_USERPWD: - case CURLOPT_SOURCE_HOST: - case CURLOPT_SOURCE_USERPWD: - case CURLOPT_SOURCE_PATH: case CURLOPT_FTP_ALTERNATIVE_TO_USER: /* FIXME: check if more of these options allow binary data */ str = PyString_AsString_NoNUL(obj); @@ -1646,12 +1637,6 @@ do_curl_setopt(CurlObject *self, PyObjec case CURLOPT_PREQUOTE: old_slist = &self->prequote; break; - case CURLOPT_SOURCE_PREQUOTE: - old_slist = &self->source_prequote; - break; - case CURLOPT_SOURCE_POSTQUOTE: - old_slist = &self->source_postquote; - break; case CURLOPT_HTTPPOST: break; default: @@ -3180,14 +3165,9 @@ initpycurl(void) insint_c(d, "FTP_SSL", CURLOPT_FTP_SSL); insint_c(d, "POSTFIELDSIZE_LARGE", CURLOPT_POSTFIELDSIZE_LARGE); insint_c(d, "TCP_NODELAY", CURLOPT_TCP_NODELAY); - insint_c(d, "SOURCE_USERPWD", CURLOPT_SOURCE_USERPWD); - insint_c(d, "SOURCE_PREQUOTE", CURLOPT_SOURCE_PREQUOTE); - insint_c(d, "SOURCE_POSTQUOTE", CURLOPT_SOURCE_POSTQUOTE); insint_c(d, "FTPSSLAUTH", CURLOPT_FTPSSLAUTH); insint_c(d, "IOCTLFUNCTION", CURLOPT_IOCTLFUNCTION); insint_c(d, "IOCTLDATA", CURLOPT_IOCTLDATA); - insint_c(d, "SOURCE_URL", CURLOPT_SOURCE_URL); - insint_c(d, "SOURCE_QUOTE", CURLOPT_SOURCE_QUOTE); insint_c(d, "FTP_ACCOUNT", CURLOPT_FTP_ACCOUNT); insint_c(d, "IGNORE_CONTENT_LENGTH", CURLOPT_IGNORE_CONTENT_LENGTH); insint_c(d, "COOKIELIST", CURLOPT_COOKIELIST); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org