[Python-modules-commits] [pycurl] 33/140: Import pycurl_7.15.0.orig.tar.gz

Wed Oct 1 21:45:03 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 01931107de211f749832b9c8d350339097276ef1
Author: Barry Warsaw <barry at python.org>
Date:   Wed Oct 1 16:43:29 2014 -0400

    Import pycurl_7.15.0.orig.tar.gz
---
 ChangeLog          | 10 +++++++++-
 INSTALL            |  7 ++-----
 PKG-INFO           |  2 +-
 setup.py           |  6 +++---
 setup_win32_ssl.py |  4 ++--
 src/pycurl.c       |  7 ++++---
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d6463bc..959a802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-Version 7.14.1 [requires libcurl-7.14.1 or better]
+Version 7.15.0 [requires libcurl-7.15.0 or better]
+--------------
+
+2005-10-18  Kjetil Jacobsen  <kjetilja>
+
+        * Added CURLOPT_FTP_SKIP_PASV_IP.
+
+
+Version 7.14.1
 --------------
 
 2005-09-05  Kjetil Jacobsen  <kjetilja>
diff --git a/INSTALL b/INSTALL
index ef42cf6..f6603f7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,16 +7,14 @@ install the developer specific RPM which is usually called curl-dev.
 Distutils
 ---------
 
-Assuming that distutils is installed (which it is by default on Python
-versions greater than 1.5.2) build and install pycurl with the
-following commands:
+Build and install pycurl with the following commands:
 
     (if necessary, become root)
     tar -zxvf pycurl-$VER.tar.gz
     cd pycurl-$VER
     python setup.py install
 
-$VER should be substituted with the version number, e.g. 7.10.5.
+$VER should be substituted with the pycurl version number, e.g. 7.10.5.
 
 Note that the installation script assumes that 'curl-config' can be
 located in your path setting.  If curl-config is installed outside
@@ -41,4 +39,3 @@ the curl source tree, specified with the CURL_DIR variable in the file
 commandline option '--curl-dir' when invoking setup.py:
 
     python setup.py install --curl-dir=c:\curl-7.10.5
-
diff --git a/PKG-INFO b/PKG-INFO
index ab046a3..ee21105 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: pycurl
-Version: 7.14.1
+Version: 7.15.0
 Summary: PycURL -- cURL library module for Python
 Home-page: http://pycurl.sourceforge.net/
 Author: Kjetil Jacobsen, Markus F.X.J. Oberhumer
diff --git a/setup.py b/setup.py
index 176bfa4..0ab81d4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,13 @@
 #! /usr/bin/env python
 # -*- coding: iso-8859-1 -*-
 # vi:ts=4:et
-# $Id: setup.py,v 1.127 2005/09/05 12:05:08 kjetilja Exp $
+# $Id: setup.py,v 1.128 2005/10/18 07:17:46 kjetilja Exp $
 
 """Setup script for the PycURL module distribution."""
 
 PACKAGE = "pycurl"
 PY_PACKAGE = "curl"
-VERSION = "7.14.1"
+VERSION = "7.15.0"
 
 import glob, os, re, sys, string
 import distutils
@@ -63,7 +63,7 @@ if sys.platform == "win32":
     # Windows users have to configure the CURL_DIR path parameter to match
     # their cURL source installation.  The path set here is just an example
     # and thus unlikely to match your installation.
-    CURL_DIR = r"c:\src\build\pycurl\curl-7.14.0"
+    CURL_DIR = r"c:\src\build\pycurl\curl-7.15.0"
     CURL_DIR = scan_argv("--curl-dir=", CURL_DIR)
     print "Using curl directory:", CURL_DIR
     assert os.path.isdir(CURL_DIR), "please check CURL_DIR in setup.py"
diff --git a/setup_win32_ssl.py b/setup_win32_ssl.py
index f847ca9..f821252 100644
--- a/setup_win32_ssl.py
+++ b/setup_win32_ssl.py
@@ -1,13 +1,13 @@
 #! /usr/bin/env python
 # -*- coding: iso-8859-1 -*-
 # vi:ts=4:et
-# $Id: setup_win32_ssl.py,v 1.31 2005/09/05 12:05:08 kjetilja Exp $
+# $Id: setup_win32_ssl.py,v 1.32 2005/10/18 07:17:46 kjetilja Exp $
 
 import os, sys, string
 assert sys.platform == "win32", "Only for building on Win32 with SSL and zlib"
 
 
-CURL_DIR = r"c:\src\build\pycurl\curl-7.14.1-ssl"
+CURL_DIR = r"c:\src\build\pycurl\curl-7.15.0-ssl"
 OPENSSL_DIR = r"c:\src\build\pycurl\openssl-0.9.7g"
 sys.argv.insert(1, "--curl-dir=" + CURL_DIR)
 
diff --git a/src/pycurl.c b/src/pycurl.c
index 24f6f32..fb495bf 100644
--- a/src/pycurl.c
+++ b/src/pycurl.c
@@ -1,4 +1,4 @@
-/* $Id: pycurl.c,v 1.93 2005/09/05 12:05:09 kjetilja Exp $ */
+/* $Id: pycurl.c,v 1.95 2005/10/18 07:17:46 kjetilja Exp $ */
 
 /* PycURL -- cURL Python module
  *
@@ -49,8 +49,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 < 0x070e01)
-#  error "Need libcurl version 7.14.1 or greater to compile pycurl."
+#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x070f00)
+#  error "Need libcurl version 7.15.0 or greater to compile pycurl."
 #endif
 
 #undef UNUSED
@@ -2698,6 +2698,7 @@ initpycurl(void)
     insint_c(d, "FTP_ACCOUNT", CURLOPT_FTP_ACCOUNT);
     insint_c(d, "IGNORE_CONTENT_LENGTH", CURLOPT_IGNORE_CONTENT_LENGTH);
     insint_c(d, "COOKIELIST", CURLOPT_COOKIELIST);
+    insint_c(d, "FTP_SKIP_PASV_IP", CURLOPT_FTP_SKIP_PASV_IP);
 
     /* constants for setopt(IPRESOLVE, x) */
     insint_c(d, "IPRESOLVE_WHATEVER", CURL_IPRESOLVE_WHATEVER);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pycurl.git

