cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 7.15.5.1

Browse Source 
- add patch from upstream CVS for curl 7.16.0 compatibility
This commit is contained in:
naddy 2006-11-16 17:43:24 +00:00
parent 3b81c33e1e
commit ae60a647b9
5 changed files with 92 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/py-curl/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2006/08/03 23:15:58 espie Exp $
# $OpenBSD: Makefile,v 1.22 2006/11/16 17:43:24 naddy Exp $
SHARED_ONLY= Yes
COMMENT= "Python interface to cURL library"
VERSION= 7.15.4.2
VERSION= 7.15.5.1
DISTNAME= pycurl-${VERSION}
PKGNAME= py-curl-${VERSION}
CATEGORIES= net
@ -23,7 +23,7 @@ MASTER_SITES= ${HOMEPAGE}download/ \
MODULES= lang/python
LIB_DEPENDS= curl.>=2.2::net/curl
LIB_DEPENDS= curl.>=5::net/curl
do-regress: fake
@cd ${WRKSRC}/tests && ${MAKE_ENV} \

8
net/py-curl/distinfo
View File

@ -1,4 +1,4 @@
MD5 (pycurl-7.15.4.2.tar.gz) = 623d755ec8b938d9f9de3caa24078c51
RMD160 (pycurl-7.15.4.2.tar.gz) = 6842b30f22933cc6fc37021b748015bdcb9759ab
SHA1 (pycurl-7.15.4.2.tar.gz) = 12a1d66c32fd82ae0de1e9dbb1492d32a169bb49
SIZE (pycurl-7.15.4.2.tar.gz) = 65694
MD5 (pycurl-7.15.5.1.tar.gz) = 464cfbeba150d99d92a407c7c8b751de
RMD160 (pycurl-7.15.5.1.tar.gz) = c40849ca6a670a64549d258f6cb8156be4fcf87c
SHA1 (pycurl-7.15.5.1.tar.gz) = eb4571887e977c2243b9b51aad5343081b1141c6
SIZE (pycurl-7.15.5.1.tar.gz) = 66075

8
net/py-curl/patches/patch-setup_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-setup_py,v 1.3 2006/07/13 16:58:46 steven Exp $
--- setup.py.orig Wed Jul 5 08:52:19 2006
+++ setup.py Thu Jul 13 18:56:06 2006
@@ -145,20 +145,20 @@ def get_data_files():
$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():
if sys.platform == "win32":
datadir = os.path.join("doc", PACKAGE)
else:

79
net/py-curl/patches/patch-src_pycurl_c Normal file
View File

@ -0,0 +1,79 @@
$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);

3
net/py-curl/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2006/07/13 16:58:46 steven Exp $
@comment $OpenBSD: PLIST,v 1.7 2006/11/16 17:43:24 naddy 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
@ -20,6 +20,7 @@ share/examples/py-curl/tests/
share/examples/py-curl/tests/test.py
share/examples/py-curl/tests/test_cb.py
share/examples/py-curl/tests/test_debug.py
share/examples/py-curl/tests/test_ftp.py
share/examples/py-curl/tests/test_getinfo.py
share/examples/py-curl/tests/test_gtk.py
share/examples/py-curl/tests/test_internals.py