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

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)