[Python-modules-commits] [pycurl] 76/140: Import pycurl_7.18.1.orig.tar.gz
Barry Warsaw
barry at moszumanska.debian.org
Wed Oct 1 21:45:09 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 8c7208875703aa29462c7b317473d594266bf23b
Author: Barry Warsaw <barry at python.org>
Date: Wed Oct 1 16:43:43 2014 -0400
Import pycurl_7.18.1.orig.tar.gz
---
COPYING2 | 22 ++++++++++++++++++++++
ChangeLog | 18 ++++++++++++++++--
MANIFEST.in | 1 +
PKG-INFO | 4 ++--
README | 17 +++++++++--------
TODO | 4 +++-
setup.py | 13 ++++++++-----
setup_win32_ssl.py | 4 ++--
src/pycurl.c | 16 +++++++++++-----
9 files changed, 74 insertions(+), 25 deletions(-)
diff --git a/COPYING2 b/COPYING2
new file mode 100644
index 0000000..3a19f22
--- /dev/null
+++ b/COPYING2
@@ -0,0 +1,22 @@
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
+Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
diff --git a/ChangeLog b/ChangeLog
index 1c117ff..c605279 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,25 @@
-Version 7.16.4 [requires libcurl-7.16.4 or better]
+Version 7.18.1 [requires libcurl-7.18.1 or better]
+--------------
+
+ * Added POST301, SSH_HOST_PUBLIC_KEY_MD5,
+ COPYPOSTFIELDS and PROXY_TRANSFER_MODE options.
+
+ * Check for static libs in setup.py to better detect
+ whether libcurl was linked with OpenSSL or GNUTLS.
+
+ * PycURL is now dual licensed under the LGPL and
+ a license similar to the cURL license (an MIT/X
+ derivate).
+
+
+Version 7.16.4
--------------
* Allow any callable object as the callback function.
This change comes handy when you would like to use objects
which are callable but are not functions or methods, for
example those objects created by the functions in the functools
- module (patch by Daniel Peña Arteaga <dpena at ph.tum.de>).
+ module (patch by Daniel Pena Arteaga <dpena at ph.tum.de>).
* Added NEW_DIRECTORY_PERMS and NEW_FILE_PERMS options.
diff --git a/MANIFEST.in b/MANIFEST.in
index f4e3837..7d5aaf5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,7 @@
include ChangeLog
include COPYING
+include COPYING2
include INSTALL
include Makefile
include README
diff --git a/PKG-INFO b/PKG-INFO
index 655bfda..47238d3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,11 +1,11 @@
Metadata-Version: 1.0
Name: pycurl
-Version: 7.16.4
+Version: 7.18.1
Summary: PycURL -- cURL library module for Python
Home-page: http://pycurl.sourceforge.net/
Author: Kjetil Jacobsen, Markus F.X.J. Oberhumer
Author-email: kjetilja at gmail.com, markus at oberhumer.com
-License: GNU Lesser General Public License (LGPL)
+License: LGPL/MIT
Description:
This module provides Python bindings for the cURL library.
Platform: All
diff --git a/README b/README
index f8983cc..6b3e1d4 100644
--- a/README
+++ b/README
@@ -1,12 +1,13 @@
-LICENSE
+License
-------
-Copyright (C) 2001-2007 by Kjetil Jacobsen <kjetilja at gmail.com>
-Copyright (C) 2001-2007 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
+Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
+Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
-PycURL is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+All rights reserved.
-A full copy of the LGPL license is included in the file COPYING.
+PycURL is dual licensed under the LGPL and an MIT/X derivative license
+based on the cURL license. A full copy of the LGPL license is included
+in the file COPYING. A full copy of the MIT/X derivative license is
+included in the file COPYING2. You can redistribute and/or modify PycURL
+according to the terms of either license.
diff --git a/TODO b/TODO
index 5cad43e..24b95ee 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-# $Id: TODO,v 1.98 2007/04/23 19:49:15 kjetilja Exp $
+# $Id: TODO,v 1.99 2008/04/22 13:47:15 kjetilja Exp $
# vi:ts=4:et
If you want to hack on pycurl, here's our list of unresolved issues:
@@ -6,6 +6,8 @@ If you want to hack on pycurl, here's our list of unresolved issues:
NEW FEATURES/IMPROVEMENTS:
+ * Callback handling for opening socket and stream seek.
+
* Add docs to the high-level interface.
* Add more options to the undocumented and currently mostly useless
diff --git a/setup.py b/setup.py
index 0829b21..d0df478 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.143 2007/07/11 17:31:07 kjetilja Exp $
+# $Id: setup.py,v 1.147 2008/04/22 14:00:45 kjetilja Exp $
"""Setup script for the PycURL module distribution."""
PACKAGE = "pycurl"
PY_PACKAGE = "curl"
-VERSION = "7.16.4"
+VERSION = "7.18.1"
import glob, os, re, sys, string
import distutils
@@ -96,7 +96,10 @@ else:
include_dirs.append(e[2:])
else:
extra_compile_args.append(e)
- for e in split_quoted(os.popen("'%s' --libs" % CURL_CONFIG).read()):
+ libs = split_quoted(
+ os.popen("'%s' --libs" % CURL_CONFIG).read()+\
+ os.popen("'%s' --static-libs" % CURL_CONFIG).read())
+ for e in libs:
if e[:2] == "-l":
libraries.append(e[2:])
if e[2:] == 'ssl':
@@ -150,7 +153,7 @@ def get_data_files():
else:
datadir = os.path.join("share", "doc", PACKAGE)
#
- files = ["ChangeLog", "COPYING", "INSTALL", "README", "TODO",]
+ files = ["ChangeLog", "COPYING", "COPYING2", "INSTALL", "README", "TODO",]
if files:
data_files.append((os.path.join(datadir), files))
files = glob.glob(os.path.join("doc", "*.html"))
@@ -184,7 +187,7 @@ setup_args = get_kw(
maintainer="Kjetil Jacobsen, Markus F.X.J. Oberhumer",
maintainer_email="kjetilja at gmail.com, markus at oberhumer.com",
url="http://pycurl.sourceforge.net/",
- license="GNU Lesser General Public License (LGPL)",
+ license="LGPL/MIT",
data_files=get_data_files(),
ext_modules=[ext],
long_description="""
diff --git a/setup_win32_ssl.py b/setup_win32_ssl.py
index eb3f679..18406d2 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.42 2007/07/11 20:12:59 kjetilja Exp $
+# $Id: setup_win32_ssl.py,v 1.43 2008/04/22 13:47:15 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.16.4-ssl"
+CURL_DIR = r"c:\src\build\pycurl\curl-7.18.1-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 e8b6f8c..0ea0f69 100644
--- a/src/pycurl.c
+++ b/src/pycurl.c
@@ -1,4 +1,4 @@
-/* $Id: pycurl.c,v 1.136 2007/07/11 17:31:07 kjetilja Exp $ */
+/* $Id: pycurl.c,v 1.138 2008/04/22 13:47:15 kjetilja Exp $ */
/* PycURL -- cURL Python module
*
@@ -22,9 +22,9 @@
* Bastian Kleineidam
* Mark Eichin
* Aaron Hill <visine19 at hotmail.com>
- * Daniel Peña Arteaga <dpena ph.tum.de>
+ * Daniel Pena Arteaga <dpena ph.tum.de>
*
- * See file COPYING for license information.
+ * See file README for license information.
*/
#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
@@ -51,8 +51,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 < 0x071004)
-# error "Need libcurl version 7.16.4 or greater to compile pycurl."
+#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x071201)
+# error "Need libcurl version 7.18.1 or greater to compile pycurl."
#endif
/* Python < 2.5 compat for Py_ssize_t */
@@ -1527,6 +1527,8 @@ do_curl_setopt(CurlObject *self, PyObject *args)
case CURLOPT_FTP_ALTERNATIVE_TO_USER:
case CURLOPT_SSH_PUBLIC_KEYFILE:
case CURLOPT_SSH_PRIVATE_KEYFILE:
+ case CURLOPT_COPYPOSTFIELDS:
+ case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
/* FIXME: check if more of these options allow binary data */
str = PyString_AsString_NoNUL(obj);
if (str == NULL)
@@ -3569,6 +3571,10 @@ initpycurl(void)
insint_c(d, "HTTP_CONTENT_DECODING", CURLOPT_HTTP_CONTENT_DECODING);
insint_c(d, "NEW_FILE_PERMS", CURLOPT_NEW_FILE_PERMS);
insint_c(d, "NEW_DIRECTORY_PERMS", CURLOPT_NEW_DIRECTORY_PERMS);
+ insint_c(d, "POST301", CURLOPT_POST301);
+ insint_c(d, "PROXY_TRANSFER_MODE", CURLOPT_PROXY_TRANSFER_MODE);
+ insint_c(d, "COPYPOSTFIELDS", CURLOPT_COPYPOSTFIELDS);
+ insint_c(d, "SSH_HOST_PUBLIC_KEY_MD5", CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
insint_c(d, "M_TIMERFUNCTION", CURLMOPT_TIMERFUNCTION);
insint_c(d, "M_SOCKETFUNCTION", CURLMOPT_SOCKETFUNCTION);
--
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