python/python-pycurl
SHA256
14
0
Fork 0
forked from pool/python-pycurl
Code Pull Requests Activity

Accepting request 234864 from home:TheBlackCat:branches:devel:languages:python

Browse Source 
Update to version 7.19.3.1

OBS-URL: https://build.opensuse.org/request/show/234864
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=19
This commit is contained in:
Todd R
2014-05-20 14:19:04 +00:00
committed by Git OBS Bridge
parent 1e59230168
commit 5b4fb2390c
7 changed files with 161 additions and 1060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pycurl-7.18.1-nostaticlibs.patch
View File

@@ -1,14 +0,0 @@
Index: setup.py
===================================================================
--- setup.py.orig 2008-04-22 11:00:45.000000000 -0300
+++ setup.py 2008-04-25 17:52:50.000000000 -0300
@@ -97,8 +97,7 @@ else:
else:
extra_compile_args.append(e)
libs = split_quoted(
- os.popen("'%s' --libs" % CURL_CONFIG).read()+\
- os.popen("'%s' --static-libs" % CURL_CONFIG).read())
+ os.popen("'%s' --libs" % CURL_CONFIG).read())
for e in libs:
if e[:2] == "-l":
libraries.append(e[2:])

3
pycurl-7.19.0.tar.gz
View File

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

3
pycurl-7.19.3.1.tar.gz Normal file
View File

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

38
pycurl-no-runtime-curlvercheck.patch
View File

@@ -1,27 +1,27 @@
--- pycurl-7.19.0.orig/src/pycurl.c
+++ pycurl-7.19.0/src/pycurl.c
@@ -3450,7 +3450,7 @@ initpycurl(void)
/* Add version strings to the module */
insstr(d, "version", curl_version());
- insstr(d, "COMPILE_DATE", __DATE__ " " __TIME__);
+ //insstr(d, "COMPILE_DATE", __DATE__ " " __TIME__);
insint(d, "COMPILE_PY_VERSION_HEX", PY_VERSION_HEX);
insint(d, "COMPILE_LIBCURL_VERSION_NUM", LIBCURL_VERSION_NUM);
@@ -3883,6 +3883,7 @@ initpycurl(void)
insint_s(d, "LOCK_DATA_COOKIE", CURL_LOCK_DATA_COOKIE);
insint_s(d, "LOCK_DATA_DNS", CURL_LOCK_DATA_DNS);
--- a/src/pycurl.c 2014-02-06 10:27:56.000000000 +0100
+++ b/src/pycurl.c 2014-05-20 16:09:57.513592172 +0200
@@ -4440,6 +4440,7 @@
const char *libcurl_version, *runtime_ssl_lib;
int libcurl_version_len, pycurl_version_len;
+#if 0
/* Check the version, as this has caused nasty problems in
* some cases. */
vi = curl_version_info(CURLVERSION_NOW);
@@ -3894,6 +3895,7 @@ initpycurl(void)
Py_FatalError("pycurl: libcurl link-time version is older than compile-time version");
assert(0);
@@ -4451,6 +4452,7 @@
PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time version (%s) is older than compile-time version (%s)", vi->version, LIBCURL_VERSION);
PYCURL_MODINIT_RETURN_NULL;
}
+#endif
/* Our compiled crypto locks should correspond to runtime ssl library. */
if (vi->ssl_version == NULL) {
@@ -4526,7 +4528,7 @@
#undef PYCURL_VERSION_PREFIX_SIZE
insobj2(d, NULL, "version", PyText_FromString(g_pycurl_useragent));
- insstr(d, "COMPILE_DATE", __DATE__ " " __TIME__);
+ //insstr(d, "COMPILE_DATE", __DATE__ " " __TIME__);
insint(d, "COMPILE_PY_VERSION_HEX", PY_VERSION_HEX);
insint(d, "COMPILE_LIBCURL_VERSION_NUM", LIBCURL_VERSION_NUM);
/* Initialize callback locks if ssl is enabled */
#if defined(PYCURL_NEED_SSL_TSL)

1015
pycurl-python3.patch
View File

File diff suppressed because it is too large Load Diff

124
python-pycurl.changes
View File

@@ -1,3 +1,127 @@
-------------------------------------------------------------------
Tue May 20 12:13:23 UTC 2014 - toddrme2178@gmail.com
- Update to version 7.19.3.1
* Added --avoid-stdio setup.py option to avoid passing FILE
pointers from Python to libcurl. Applies to Python 2 only.
* Added CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE,
CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE, CURLMOPT_MAX_HOST_CONNECTIONS
CURLMOPT_MAX_PIPELINE_LENGTH, CURLMOPT_MAX_TOTAL_CONNECTIONS
multi options (patch by Jakob Truelsen).
* SSL detection logic changed to consult `curl-config --static-libs`
even if `curl-config --libs` succeeded. This should achieve
pre-7.19.3 behavior with respect to automatic SSL detection
(patch by Andjelko Horvat).
- Update to version 7.19.3
* Added CURLOPT_NOPROXY.
* Added CURLINFO_LOCAL_PORT, CURLINFO_PRIMARY_PORT and
CURLINFO_LOCAL_IP (patch by Adam Jacob Muller).
* When running on Python 2.x, for compatibility with Python 3.x,
Unicode strings containing ASCII code points only are now accepted
in setopt() calls.
* PycURL now requires that compile time SSL backend used by libcurl
is the same as the one used at runtime. setup.py supports
--with-ssl, --with-gnutls and --with-nss options like libcurl does,
to specify which backend libcurl uses. On some systems PycURL can
automatically figure out libcurl's backend.
If the backend is not one for which PycURL provides crypto locks
(i.e., any of the other backends supported by libcurl),
no runtime SSL backend check is performed.
* Default PycURL user agent string is now built at runtime, and will
include the user agent string of libcurl loaded at runtime rather
than the one present at compile time.
* PycURL will now use WSAduplicateSocket rather than dup on Windows
to duplicate sockets obtained from OPENSOCKETFUNCTION.
Using dup may have caused crashes, OPENSOCKETFUNCTION should
now be usable on Windows.
* A new script, winbuild.py, was added to build PycURL on Windows
against Python 2.6, 2.7, 3.2 and 3.3.
* Added CURL_LOCK_DATA_SSL_SESSION (patch by Tom Pierce).
* Added E_OPERATION_TIMEDOUT (patch by Romuald Brunet).
* setup.py now handles --help argument and will print PycURL-specific
configuration options in addition to distutils help.
* Windows build configuration has been redone:
PYCURL_USE_LIBCURL_DLL #define is gone, use --use-libcurl-dll
argument to setup.py to build against a libcurl DLL.
CURL_STATICLIB is now #defined only when --use-libcurl-dll is not
given to setup.py, and PycURL is built against libcurl statically.
--libcurl-lib-name option can be used to override libcurl import
library name.
* Added CURLAUTH_DIGEST_IE as pycurl.HTTPAUTH_DIGEST_IE.
* Added CURLOPT_POSTREDIR option and CURL_REDIR_POST_301,
CURL_REDIR_POST_302, CURL_REDIR_POST_303 and CURL_REDIR_POST_ALL
constants. CURL_REDIR_POST_303 requires libcurl 7.26.0 or higher,
all others require libcurl 7.19.1 or higher.
* PycURL now supports Python 3.1 through 3.3. Python 3.0 might
work but it appears to ship with broken distutils, making virtualenv
not function on it.
* PycURL multi objects now have the multi constants defined on them.
Previously the constants were only available on pycurl module.
The new behavior matches that of curl and share objects.
* PycURL share objects can now be closed via the close() method.
* PycURL will no longer call `curl-config --static-libs` if
`curl-config --libs` succeeds and returns output.
Systems on which neither `curl-config --libs` nor
`curl-config --static-libs` do the right thing should provide
a `curl-config` wrapper that is sane.
* Added CURLFORM_BUFFER and CURLFORM_BUFFERPTR.
* pycurl.version and user agent string now include both
PycURL version and libcurl version as separate items.
* Added CURLOPT_DNS_SERVERS.
* PycURL can now be dynamically linked against libcurl on Windows
if PYCURL_USE_LIBCURL_DLL is #defined during compilation.
* Breaking change: opensocket callback now takes an additional
(address, port) tuple argument. Existing callbacks will need to
be modified to accept this new argument.
https://github.com/pycurl/pycurl/pull/18
- Update to version 7.19.0.3
* Re-release of 7.19.0.2 with minor changes to build Windows packages
due to botched 7.19.0.2 files on PyPi.
http://curl.haxx.se/mail/curlpython-2013-12/0021.html
- Update to version 7.19.0.2 [requires libcurl-7.19.0 or better] - 2013-10-08
* Fixed a bug in a commit made in 2008 but not released until 7.19.0.1
which caused CURLOPT_POSTFIELDS to not correctly increment reference
count of the object being given as its argument, despite libcurl not
copying the data provided by said object.
* Added support for libcurl pause/unpause functionality,
via curl_easy_pause call and returning READFUNC_PAUSE from
read callback function.
- Update to version 7.19.0.1 [requires libcurl-7.19.0 or better] - 2013-09-23
* Test matrix tool added to test against all supported Python and
libcurl versions.
* Python 2.4 is now the minimum required version.
* Source code, bugs and patches are now kept on GitHub.
* Added CURLINFO_CERTINFO and CURLOPT_CERTINFO.
* Added CURLOPT_RESOLVE.
* PycURL can now be used with Python binaries without thread
support.
* gcrypt is no longer initialized when a newer version of gnutls
is used.
* Marked NSS as supported.
* Fixed relative URL request logic.
* Fixed a memory leak in util_curl_init.
* Added CURLOPT_USERNAME and CURLOPT_PASSWORD.
* Fixed handling of big timeout values.
* Added GLOBAL_ACK_EINTR.
* setopt(..., None) can be used as unsetopt().
* CURLOPT_RANGE can now be unset.
* Write callback can return -1 to signal user abort.
* Reorganized tests into an automated test suite.
* Added CURLOPT_SEEKFUNCTION and CURLOPT_SEEKDATA.
* Cleaned up website.
* Fix pycurl.reset() (patch by <johansen at sun.com>).
* Fix install routine in setup.py where
certain platforms (Solaris, Mac OSX, etc)
would search for a static copy of libcurl (dbp).
* Fixed build on OpenSolaris 0906 and other platforms on which
curl-config does not have a --static-libs option.
* No longer keep string options copies in the
Curl Python objects, since string options are
now managed by libcurl.
- Add additional dependencies
- Remove no longer necessary patch:
* pycurl-7.18.1-nostaticlibs.patch
-------------------------------------------------------------------
Fri Aug 30 18:07:30 UTC 2013 - crrodriguez@opensuse.org

24
python-pycurl.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-pycurl
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,25 @@
Name: python-pycurl
Version: 7.19.0
Version: 7.19.3.1
Release: 0
Url: http://pycurl.sourceforge.net/
Summary: PycURL -- cURL library module
License: LGPL-2.1+ and MIT
Group: Development/Languages/Python
Source: http://pycurl.sourceforge.net/download/pycurl-%{version}.tar.gz
Patch0: pycurl-7.18.1-nostaticlibs.patch
Patch1: pycurl-no-runtime-curlvercheck.patch
Source: https://pypi.python.org/packages/source/p/pycurl/pycurl-%{version}.tar.gz
Patch0: pycurl-no-runtime-curlvercheck.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libcurl-devel >= 7.19.0
BuildRequires: openssl-devel
BuildRequires: python-devel
BuildRequires: python-bottle
BuildRequires: python-CherryPy
BuildRequires: python-nose
BuildRequires: python-simplejson
Requires: python-bottle
Requires: python-CherryPy
Requires: python-simplejson
%if 0%{?suse_version}
%py_requires
%endif
@@ -52,8 +58,8 @@ This package contains documentation and examples.
%prep
%setup -q -n pycurl-%{version}
%patch0
%patch1 -p1
%patch0 -p1
%build
CFLAGS="%{optflags}" python setup.py build
@@ -63,11 +69,11 @@ rm -rf %{buildroot}%{_datadir}/doc # Remove wrongly installed junk
%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%doc AUTHORS ChangeLog COPYING-LGPL COPYING-MIT README.rst
%{python_sitearch}/*
%files doc
%defattr(-,root,root)
%doc examples doc/*.html
%doc examples doc/*.rst
%changelog