[Python-modules-commits] [pycurl] 108/140: update debian/patches directory
Barry Warsaw
barry at moszumanska.debian.org
Wed Oct 1 21:45:13 UTC 2014
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository pycurl.
commit 953959856e2e3fbc1261c3a882c24b1a09a309ca
Author: Barry Warsaw <barry at python.org>
Date: Wed Oct 1 16:44:00 2014 -0400
update debian/patches directory
---
debian/.git-dpm | 2 +-
debian/patches/10_setup.py.patch | 22 ++++++++---
debian/patches/20_remove_string_options.patch | 44 ++++++++++++++--------
.../30_fix_refcounts_calling_reset_twice.patch | 24 +++++++++---
...CURLOPT_SEEKFUNCTION_and_CURLOPT_SEEKDATA.patch | 29 +++++++++-----
5 files changed, 83 insertions(+), 38 deletions(-)
diff --git a/debian/.git-dpm b/debian/.git-dpm
index c4df314..d0f7d4c 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
# see git-dpm(1) from git-dpm package
-NONE
+178341a1f4f653a895c2525b16143d7454089228
178341a1f4f653a895c2525b16143d7454089228
1beefa196373329e3f3a4d4d19463deed7a855c6
1beefa196373329e3f3a4d4d19463deed7a855c6
diff --git a/debian/patches/10_setup.py.patch b/debian/patches/10_setup.py.patch
index 800df4f..2c714c5 100644
--- a/debian/patches/10_setup.py.patch
+++ b/debian/patches/10_setup.py.patch
@@ -1,8 +1,18 @@
-Author: Sandro Tosi <morph at debian.org>
-Description: Adjust setup.py file for Debian architecture
---- pycurl-7.19.0.orig/setup.py
-+++ pycurl-7.19.0/setup.py
-@@ -17,7 +17,7 @@
+From 47020466ae1cf27acb508b8a92571470f7e15902 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Sat, 11 Feb 2012 17:22:11 +0100
+Subject: Adjust setup.py file for Debian architecture
+
+Patch-Name: 10_setup.py.patch
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 0ffd9d2..d2e5f8e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -17,7 +17,7 @@ from distutils.util import split_quoted
from distutils.version import LooseVersion
include_dirs = []
@@ -11,7 +21,7 @@ Description: Adjust setup.py file for Debian architecture
library_dirs = []
libraries = []
runtime_library_dirs = []
-@@ -188,7 +188,6 @@
+@@ -188,7 +188,6 @@ setup_args = get_kw(
maintainer_email="kjetilja at gmail.com, markus at oberhumer.com",
url="http://pycurl.sourceforge.net/",
license="LGPL/MIT",
diff --git a/debian/patches/20_remove_string_options.patch b/debian/patches/20_remove_string_options.patch
index 901701e..d11e96a 100644
--- a/debian/patches/20_remove_string_options.patch
+++ b/debian/patches/20_remove_string_options.patch
@@ -1,15 +1,27 @@
-Description: No longer keep copies of string options since this is managed by libcurl
+From 5e3048e14177eb3b0438d15c476dc266da47c872 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Sun, 28 Oct 2012 11:20:44 +0100
+Subject: No longer keep copies of string options since this is managed by
+ libcurl
+
Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1.147&r2=1.148
---- pycurl-7.19.0.orig/src/pycurl.c 2008/09/09 17:40:34 1.147
-+++ pycurl-7.19.0/src/pycurl.c 2008/09/29 10:56:57 1.148
+Patch-Name: 20_remove_string_options.patch
+---
+ src/pycurl.c | 60 ++----------------------------------------------------------
+ 1 file changed, 2 insertions(+), 58 deletions(-)
+
+diff --git a/src/pycurl.c b/src/pycurl.c
+index a17a23b..6de1514 100644
+--- a/src/pycurl.c
++++ b/src/pycurl.c
@@ -1,4 +1,4 @@
-/* $Id: pycurl.c,v 1.147 2008/09/09 17:40:34 kjetilja Exp $ */
+/* $Id: pycurl.c,v 1.148 2008/09/29 10:56:57 kjetilja Exp $ */
/* PycURL -- cURL Python module
*
-@@ -97,12 +97,6 @@
+@@ -97,12 +97,6 @@ static void pycurl_ssl_cleanup(void);
/* Calculate the number of OBJECTPOINT options we need to store */
#define OPTIONS_SIZE ((int)CURLOPT_LASTENTRY % 10000)
#define MOPTIONS_SIZE ((int)CURLMOPT_LASTENTRY % 10000)
@@ -22,7 +34,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
/* Type objects */
static PyObject *ErrorObject = NULL;
-@@ -161,7 +155,6 @@
+@@ -161,7 +155,6 @@ typedef struct {
PyObject *writedata_fp;
PyObject *writeheader_fp;
/* misc */
@@ -30,7 +42,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
char error[CURL_ERROR_SIZE+1];
} CurlObject;
-@@ -741,7 +734,6 @@
+@@ -741,7 +734,6 @@ util_curl_new(void)
self->writeheader_fp = NULL;
/* Zero string pointer memory buffer used by setopt */
@@ -38,7 +50,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
memset(self->error, 0, sizeof(self->error));
return self;
-@@ -804,7 +796,6 @@
+@@ -804,7 +796,6 @@ do_curl_new(PyObject *dummy)
free(s);
goto error;
}
@@ -46,7 +58,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
/* Success - return new object */
return self;
-@@ -872,7 +863,6 @@
+@@ -872,7 +863,6 @@ static void
util_curl_close(CurlObject *self)
{
CURL *handle;
@@ -54,7 +66,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
/* Zero handle and thread-state to disallow any operations to be run
* from now on */
-@@ -916,16 +906,6 @@
+@@ -916,16 +906,6 @@ util_curl_close(CurlObject *self)
SFREE(self->postquote);
SFREE(self->prequote);
#undef SFREE
@@ -71,7 +83,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
}
-@@ -1424,8 +1404,6 @@
+@@ -1424,8 +1404,6 @@ verbose_error:
static PyObject*
do_curl_reset(CurlObject *self)
{
@@ -80,7 +92,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
curl_easy_reset(self->handle);
/* Decref callbacks and file handles */
-@@ -1443,15 +1421,6 @@
+@@ -1443,15 +1421,6 @@ do_curl_reset(CurlObject *self)
SFREE(self->postquote);
SFREE(self->prequote);
#undef SFREE
@@ -96,7 +108,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
return Py_None;
}
-@@ -1461,7 +1430,6 @@
+@@ -1461,7 +1430,6 @@ static PyObject *
util_curl_unsetopt(CurlObject *self, int option)
{
int res;
@@ -104,7 +116,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
#define SETOPT2(o,x) \
if ((res = curl_easy_setopt(self->handle, (o), (x))) != CURLE_OK) goto error
-@@ -1502,7 +1470,6 @@
+@@ -1502,7 +1470,6 @@ util_curl_unsetopt(CurlObject *self, int option)
case CURLOPT_SSL_CIPHER_LIST:
case CURLOPT_USERPWD:
SETOPT((char *) 0);
@@ -112,7 +124,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
break;
/* info: we explicitly list unsupported options here */
-@@ -1512,11 +1479,6 @@
+@@ -1512,11 +1479,6 @@ util_curl_unsetopt(CurlObject *self, int option)
return NULL;
}
@@ -124,7 +136,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
Py_INCREF(Py_None);
return Py_None;
-@@ -1587,8 +1549,6 @@
+@@ -1587,8 +1549,6 @@ do_curl_setopt(CurlObject *self, PyObject *args)
if (PyString_Check(obj)) {
char *str = NULL;
Py_ssize_t len = -1;
@@ -133,7 +145,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
/* Check that the option specified a string as well as the input */
switch (option) {
-@@ -1651,28 +1611,12 @@
+@@ -1651,28 +1611,12 @@ do_curl_setopt(CurlObject *self, PyObject *args)
}
/* Allocate memory to hold the string */
assert(str != NULL);
diff --git a/debian/patches/30_fix_refcounts_calling_reset_twice.patch b/debian/patches/30_fix_refcounts_calling_reset_twice.patch
index 1180cdd..d116611 100644
--- a/debian/patches/30_fix_refcounts_calling_reset_twice.patch
+++ b/debian/patches/30_fix_refcounts_calling_reset_twice.patch
@@ -1,16 +1,28 @@
-Description: Fixes refcount bug and provides better organization of PyCurl object. Submitted by dbprice1.
+From 2ae4c02eb1ea52e484edbf8c391f57fb284ff4d4 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Sun, 28 Oct 2012 11:20:44 +0100
+Subject: Fixes refcount bug and provides better organization of PyCurl object.
+ Submitted by dbprice1.
+
Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1.148&r2=1.149
Bug: https://sourceforge.net/tracker/?func=detail&aid=2893665&group_id=28236&atid=392777
---- pycurl-7.19.0.orig/src/pycurl.c 2008/09/29 10:56:57 1.148
-+++ pycurl-7.19.0/src/pycurl.c 2010/04/28 16:02:41 1.149
+Patch-Name: 30_fix_refcounts_calling_reset_twice.patch
+---
+ src/pycurl.c | 89 +++++++++++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 58 insertions(+), 31 deletions(-)
+
+diff --git a/src/pycurl.c b/src/pycurl.c
+index 6de1514..32c7ca5 100644
+--- a/src/pycurl.c
++++ b/src/pycurl.c
@@ -1,4 +1,4 @@
-/* $Id: pycurl.c,v 1.148 2008/09/29 10:56:57 kjetilja Exp $ */
+/* $Id: pycurl.c,v 1.149 2010/04/28 16:02:41 zanee Exp $ */
/* PycURL -- cURL Python module
*
-@@ -739,64 +739,80 @@
+@@ -739,64 +739,80 @@ util_curl_new(void)
return self;
}
@@ -121,7 +133,7 @@ Bug: https://sourceforge.net/tracker/?func=detail&aid=2893665&group_id=28236&ati
/* Success - return new object */
return self;
-@@ -1404,6 +1420,8 @@
+@@ -1404,6 +1420,8 @@ verbose_error:
static PyObject*
do_curl_reset(CurlObject *self)
{
@@ -130,7 +142,7 @@ Bug: https://sourceforge.net/tracker/?func=detail&aid=2893665&group_id=28236&ati
curl_easy_reset(self->handle);
/* Decref callbacks and file handles */
-@@ -1421,10 +1439,19 @@
+@@ -1421,10 +1439,19 @@ do_curl_reset(CurlObject *self)
SFREE(self->postquote);
SFREE(self->prequote);
#undef SFREE
diff --git a/debian/patches/40_add_CURLOPT_SEEKFUNCTION_and_CURLOPT_SEEKDATA.patch b/debian/patches/40_add_CURLOPT_SEEKFUNCTION_and_CURLOPT_SEEKDATA.patch
index a95d6ce..0a72ca7 100644
--- a/debian/patches/40_add_CURLOPT_SEEKFUNCTION_and_CURLOPT_SEEKDATA.patch
+++ b/debian/patches/40_add_CURLOPT_SEEKFUNCTION_and_CURLOPT_SEEKDATA.patch
@@ -1,15 +1,26 @@
-Description: Added CURLOPT_SEEKFUNCTION, CURLOPT_SEEKDATA
+From 178341a1f4f653a895c2525b16143d7454089228 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Sun, 28 Oct 2012 11:20:44 +0100
+Subject: Added CURLOPT_SEEKFUNCTION, CURLOPT_SEEKDATA
+
Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1.149&r2=1.150
---- pycurl-7.19.0.orig/src/pycurl.c 2010/04/28 16:02:41 1.149
-+++ pycurl-7.19.0/src/pycurl.c 2010/10/13 15:53:40 1.150
+Patch-Name: 40_add_CURLOPT_SEEKFUNCTION_and_CURLOPT_SEEKDATA.patch
+---
+ src/pycurl.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 89 insertions(+), 2 deletions(-)
+
+diff --git a/src/pycurl.c b/src/pycurl.c
+index 32c7ca5..ed0c0e5 100644
+--- a/src/pycurl.c
++++ b/src/pycurl.c
@@ -1,4 +1,4 @@
-/* $Id: pycurl.c,v 1.149 2010/04/28 16:02:41 zanee Exp $ */
+/* $Id: pycurl.c,v 1.150 2010/10/13 15:53:40 zanee Exp $ */
/* PycURL -- cURL Python module
*
-@@ -150,6 +150,7 @@
+@@ -150,6 +150,7 @@ typedef struct {
PyObject *debug_cb;
PyObject *ioctl_cb;
PyObject *opensocket_cb;
@@ -17,7 +28,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
/* file objects */
PyObject *readdata_fp;
PyObject *writedata_fp;
-@@ -727,6 +728,7 @@
+@@ -727,6 +728,7 @@ util_curl_new(void)
self->debug_cb = NULL;
self->ioctl_cb = NULL;
self->opensocket_cb = NULL;
@@ -25,7 +36,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
/* Set file object pointers to NULL by default */
self->readdata_fp = NULL;
-@@ -1181,6 +1183,82 @@
+@@ -1181,6 +1183,82 @@ verbose_error:
goto silent_error;
}
@@ -108,7 +119,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
static size_t
read_callback(char *ptr, size_t size, size_t nmemb, void *stream)
{
-@@ -1988,7 +2066,8 @@
+@@ -1988,7 +2066,8 @@ do_curl_setopt(CurlObject *self, PyObject *args)
const curl_progress_callback pro_cb = progress_callback;
const curl_debug_callback debug_cb = debug_callback;
const curl_ioctl_callback ioctl_cb = ioctl_callback;
@@ -118,7 +129,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
switch(option) {
case CURLOPT_WRITEFUNCTION:
-@@ -2046,6 +2125,13 @@
+@@ -2046,6 +2125,13 @@ do_curl_setopt(CurlObject *self, PyObject *args)
curl_easy_setopt(self->handle, CURLOPT_OPENSOCKETFUNCTION, opensocket_cb);
curl_easy_setopt(self->handle, CURLOPT_OPENSOCKETDATA, self);
break;
@@ -132,7 +143,7 @@ Origin: http://pycurl.cvs.sourceforge.net/viewvc/pycurl/pycurl/src/pycurl.c?r1=1
default:
/* None of the function options were recognized, throw exception */
-@@ -3616,6 +3702,7 @@
+@@ -3616,6 +3702,7 @@ initpycurl(void)
insint_c(d, "PREQUOTE", CURLOPT_PREQUOTE);
insint_c(d, "WRITEHEADER", CURLOPT_WRITEHEADER);
insint_c(d, "HEADERFUNCTION", CURLOPT_HEADERFUNCTION);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pycurl.git
More information about the Python-modules-commits
mailing list