[Python-modules-commits] r27036 - in packages/pycurl/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Saturday, January 4, 2014 @ 16:18:29
  Author: morph
Revision: 27036

removed debian/patches/50_dont_leak_user_agent.patch too

Modified:
  packages/pycurl/trunk/debian/changelog
  packages/pycurl/trunk/debian/patches/series
Deleted:
  packages/pycurl/trunk/debian/patches/50_dont_leak_user_agent.patch

Modified: packages/pycurl/trunk/debian/changelog
===================================================================
--- packages/pycurl/trunk/debian/changelog	2014-01-04 16:16:03 UTC (rev 27035)
+++ packages/pycurl/trunk/debian/changelog	2014-01-04 16:18:29 UTC (rev 27036)
@@ -5,10 +5,11 @@
     - refreshed, due to new upstream code
   * debian/patches/{20_remove_string_options.patch,
       30_fix_refcounts_calling_reset_twice.patch,
-      40_add_CURLOPT_SEEKFUNCTION_and_CURLOPT_SEEKDATA.patch}
+      40_add_CURLOPT_SEEKFUNCTION_and_CURLOPT_SEEKDATA.patch,
+      debian/patches/50_dont_leak_user_agent.patch}
     - removed, merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Sat, 04 Jan 2014 17:15:47 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 04 Jan 2014 17:18:15 +0100
 
 pycurl (7.19.0-7) unstable; urgency=low
 

Deleted: packages/pycurl/trunk/debian/patches/50_dont_leak_user_agent.patch
===================================================================
--- packages/pycurl/trunk/debian/patches/50_dont_leak_user_agent.patch	2014-01-04 16:16:03 UTC (rev 27035)
+++ packages/pycurl/trunk/debian/patches/50_dont_leak_user_agent.patch	2014-01-04 16:18:29 UTC (rev 27036)
@@ -1,43 +0,0 @@
-Description: fix a memory leak in reset() function
-Author: Örjan Persson <orjan at spotify.com>
-
-Index: pycurl-openssl/src/pycurl.c
-===================================================================
---- pycurl-openssl.orig/src/pycurl.c	2013-05-14 18:51:53.040481318 -0700
-+++ pycurl-openssl/src/pycurl.c	2013-05-14 18:58:03.705278225 -0700
-@@ -98,6 +98,9 @@
- #define OPTIONS_SIZE    ((int)CURLOPT_LASTENTRY % 10000)
- #define MOPTIONS_SIZE   ((int)CURLMOPT_LASTENTRY % 10000)
- 
-+/* Keep some default variables around */
-+static const char g_pycurl_useragent[7 + sizeof(LIBCURL_VERSION) + 1];
-+
- /* Type objects */
- static PyObject *ErrorObject = NULL;
- static PyTypeObject *p_Curl_Type = NULL;
-@@ -780,14 +783,8 @@
-     }
- 
-     /* Set default USERAGENT */
--    s = (char *) malloc(7 + strlen(LIBCURL_VERSION) + 1);
--    if (s == NULL) {
--        return (-1);
--    }
--    strcpy(s, "PycURL/"); strcpy(s+7, LIBCURL_VERSION);
--    res = curl_easy_setopt(self->handle, CURLOPT_USERAGENT, (char *) s);
-+    res = curl_easy_setopt(self->handle, CURLOPT_USERAGENT, (char *) g_pycurl_useragent);
-     if (res != CURLE_OK) {
--        free(s);
-         return (-1);
-     }
-     return (0);
-@@ -3953,6 +3950,9 @@
-         assert(0);
-     }
- 
-+    strcpy(g_pycurl_useragent, "PycURL/");
-+    strcpy(g_pycurl_useragent+7, LIBCURL_VERSION);
-+
-     /* Initialize callback locks if ssl is enabled */
- #if defined(PYCURL_NEED_SSL_TSL)
-     pycurl_ssl_init();

Modified: packages/pycurl/trunk/debian/patches/series
===================================================================
--- packages/pycurl/trunk/debian/patches/series	2014-01-04 16:16:03 UTC (rev 27035)
+++ packages/pycurl/trunk/debian/patches/series	2014-01-04 16:18:29 UTC (rev 27036)
@@ -1,2 +1 @@
 10_setup.py.patch
-50_dont_leak_user_agent.patch