Update to 7.19.0 (back in sync with net/curl).
Also use MODPY_EGG_VERSION, drop patch applied upstream, regen patches and PLIST. Original diff from Benoit Chesneau <bchesneau at gmail dot com>, tweaks and several periods of slacking on this update by me. Thanks, Benoit!
This commit is contained in:
wcmaier
parent
9ac0770982
commit
80255dc910
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.25 2007/10/08 08:22:42 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.26 2009/02/01 19:49:58 wcmaier Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= Python interface to cURL library
|
||||
|
||||
VERSION= 7.15.5.1
|
||||
DISTNAME= pycurl-${VERSION}
|
||||
PKGNAME= py-curl-${VERSION}p1
|
||||
MODPY_EGG_VERSION= 7.19.0
|
||||
DISTNAME= pycurl-${MODPY_EGG_VERSION}
|
||||
PKGNAME= py-curl-${MODPY_EGG_VERSION}
|
||||
CATEGORIES= net
|
||||
|
||||
HOMEPAGE= http://pycurl.sourceforge.net/
|
||||
@ -23,7 +23,7 @@ MASTER_SITES= ${HOMEPAGE}download/ \
|
||||
|
||||
MODULES= lang/python
|
||||
|
||||
LIB_DEPENDS= curl.>=5::net/curl
|
||||
LIB_DEPENDS= curl.>=12::net/curl
|
||||
|
||||
do-regress: fake
|
||||
@cd ${WRKSRC}/tests && ${MAKE_ENV} \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (pycurl-7.15.5.1.tar.gz) = Rkz766FQ2Z2SpAfHyLdR3g==
|
||||
RMD160 (pycurl-7.15.5.1.tar.gz) = xAhJympnCmRUnSWPbLgVa+T8+Hw=
|
||||
SHA1 (pycurl-7.15.5.1.tar.gz) = 60VxiH6XfCJDubUarVNDCBsRQcY=
|
||||
SHA256 (pycurl-7.15.5.1.tar.gz) = k6eGR2oy+IYiraP+NVoc7xNtllizmsdoBu9LoVS70vk=
|
||||
SIZE (pycurl-7.15.5.1.tar.gz) = 66075
|
||||
MD5 (pycurl-7.19.0.tar.gz) = kZ1Y/jfmn+h85FNNi2ocew==
|
||||
RMD160 (pycurl-7.19.0.tar.gz) = 2rVHs9tn7TDK+1VqGjg/VnBk3kk=
|
||||
SHA1 (pycurl-7.19.0.tar.gz) = P7WeyhRhMxu56ejW/jsj7alhpBY=
|
||||
SHA256 (pycurl-7.19.0.tar.gz) = 63gt/MWnwCNTmgd0Yrg8Fn4XgSjun3IBZlufuxqLBkI=
|
||||
SIZE (pycurl-7.19.0.tar.gz) = 71346
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-setup_py,v 1.4 2006/11/16 17:43:24 naddy Exp $
|
||||
--- setup.py.orig Fri Sep 1 09:54:09 2006
|
||||
+++ setup.py Thu Nov 16 18:20:38 2006
|
||||
@@ -148,20 +148,20 @@ def get_data_files():
|
||||
$OpenBSD: patch-setup_py,v 1.5 2009/02/01 19:49:59 wcmaier Exp $
|
||||
--- setup.py.orig Tue Sep 9 19:40:34 2008
|
||||
+++ setup.py Sat Jan 3 01:13:32 2009
|
||||
@@ -151,20 +151,20 @@ def get_data_files():
|
||||
if sys.platform == "win32":
|
||||
datadir = os.path.join("doc", PACKAGE)
|
||||
else:
|
||||
- datadir = os.path.join("share", "doc", PACKAGE)
|
||||
+ datadir = os.path.join("share")
|
||||
#
|
||||
- files = ["ChangeLog", "COPYING", "INSTALL", "README", "TODO",]
|
||||
- files = ["ChangeLog", "COPYING", "COPYING2", "INSTALL", "README", "TODO",]
|
||||
+ files = []
|
||||
if files:
|
||||
- data_files.append((os.path.join(datadir), files))
|
||||
|
||||
@ -1,79 +0,0 @@
|
||||
$OpenBSD: patch-src_pycurl_c,v 1.1 2006/11/16 17:43:24 naddy Exp $
|
||||
--- src/pycurl.c.orig Fri Aug 11 12:37:19 2006
|
||||
+++ src/pycurl.c Thu Nov 16 18:25:07 2006
|
||||
@@ -48,8 +48,8 @@
|
||||
#if !defined(PY_VERSION_HEX) || (PY_VERSION_HEX < 0x02020000)
|
||||
# error "Need Python version 2.2 or greater to compile pycurl."
|
||||
#endif
|
||||
-#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x070f05)
|
||||
-# error "Need libcurl version 7.15.5 or greater to compile pycurl."
|
||||
+#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x071000)
|
||||
+# error "Need libcurl version 7.16.0 or greater to compile pycurl."
|
||||
#endif
|
||||
|
||||
#undef UNUSED
|
||||
@@ -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);
|
||||
@ -1,7 +1,12 @@
|
||||
@comment $OpenBSD: PLIST,v 1.7 2006/11/16 17:43:24 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.8 2009/02/01 19:49:59 wcmaier Exp $
|
||||
lib/python${MODPY_VERSION}/site-packages/curl/
|
||||
lib/python${MODPY_VERSION}/site-packages/curl/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curl/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
|
||||
lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pycurl.so
|
||||
share/doc/py-curl/
|
||||
share/doc/py-curl/callbacks.html
|
||||
@ -31,11 +36,15 @@ share/examples/py-curl/tests/test_multi3.py
|
||||
share/examples/py-curl/tests/test_multi4.py
|
||||
share/examples/py-curl/tests/test_multi5.py
|
||||
share/examples/py-curl/tests/test_multi6.py
|
||||
share/examples/py-curl/tests/test_multi_socket.py
|
||||
share/examples/py-curl/tests/test_multi_socket_select.py
|
||||
share/examples/py-curl/tests/test_multi_timer.py
|
||||
share/examples/py-curl/tests/test_multi_vs_thread.py
|
||||
share/examples/py-curl/tests/test_post.py
|
||||
share/examples/py-curl/tests/test_post2.py
|
||||
share/examples/py-curl/tests/test_post3.py
|
||||
share/examples/py-curl/tests/test_share.py
|
||||
share/examples/py-curl/tests/test_socketopen.py
|
||||
share/examples/py-curl/tests/test_stringio.py
|
||||
share/examples/py-curl/tests/test_xmlrpc.py
|
||||
share/examples/py-curl/tests/util.py
|
||||
|
||||
Loading…
Reference in New Issue
Block a user