[Python-modules-commits] [python-httplib2] 06/10: change version to 0.9.2+dfsg-1 New upstream release
Scott Kitterman
kitterman at moszumanska.debian.org
Wed Nov 9 21:34:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
kitterman pushed a commit to branch master
in repository python-httplib2.
commit 1baa7247d5a55ead1e2016dd3d1d232f0f4abd12
Merge: 472511b 871c40f
Author: Scott Kitterman <scott at kitterman.com>
Date: Wed Nov 9 16:13:48 2016 -0500
change version to 0.9.2+dfsg-1
New upstream release
CHANGELOG | 8 ++++++++
README.md | 26 +++++++++++++-------------
debian/.git-dpm | 6 +++---
debian/changelog | 5 +++--
debian/patches/ssl-mismatch-check.patch | 4 ++--
debian/patches/use_system_cacerts.patch | 8 ++++----
doc/html/searchindex.json | 1 -
python2/httplib2/__init__.py | 7 ++++---
python3/httplib2/__init__.py | 7 ++++---
setup.py | 2 +-
10 files changed, 42 insertions(+), 32 deletions(-)
diff --cc debian/.git-dpm
index 21a61ba,0000000..ad1d054
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- b5ce965b64cf8a8332bb25a69beeff18c61afdd6
- b5ce965b64cf8a8332bb25a69beeff18c61afdd6
- d554970db63e5af03437bb981f41063fc5df4ff0
++871c40f5144e27d0344734cff78806d925a96d38
++871c40f5144e27d0344734cff78806d925a96d38
++2638dd65066ee67711ab78dd29490b2277c7a08c
+2638dd65066ee67711ab78dd29490b2277c7a08c
+python-httplib2_0.9.2+dfsg.orig.tar.gz
+7e912c114c3ecbc426cc3b6c825144ca61f0392b
+311087
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 4e949fd,0000000..31c5d90
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,269 -1,0 +1,270 @@@
- python-httplib2 (0.9.1+dfsg-2) UNRELEASED; urgency=medium
++python-httplib2 (0.9.2+dfsg-1) UNRELEASED; urgency=medium
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
+ [ Scott Kitterman ]
+ * Update debian/watch and get-orig-source rule to work with current upstream
+ location
+ * Also remove sourceless searchindex.json file when repacking
++ * New upstream release
+
- -- Scott Kitterman <scott at kitterman.com> Wed, 09 Nov 2016 16:12:55 -0500
++ -- Scott Kitterman <scott at kitterman.com> Wed, 09 Nov 2016 16:13:48 -0500
+
+python-httplib2 (0.9.1+dfsg-1) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Ilias Tsitsimpis ]
+ * New upstream release (Closes: #794750).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 08 Sep 2015 13:55:42 +0300
+
+python-httplib2 (0.9+dfsg-2) unstable; urgency=medium
+
+ * New maintainer. (Closes: #755302)
+ * debian/control: bump Standars-Version (no changes required).
+
+ -- Andrea Colangelo <warp10 at debian.org> Sun, 28 Sep 2014 12:27:43 +0200
+
+python-httplib2 (0.9+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/patches/use_system_cacerts.patch:
+ - Refresh for new upstream release.
+ * debian/control:
+ - Update Homepage field to the new location.
+ - Bump Standards-Version to 3.9.5, no changes required.
+ * debian/copyright:
+ - Adjust copyright years.
+ * debian/python3-httplib2.docs:
+ - Install documentation for python3-httplib2 package too.
+ * debian/rules:
+ - Switch to pybuild.
+ - Provide get-orig-source target.
+ * debian/watch:
+ - Point to GitHub portal.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Mon, 28 Apr 2014 22:33:06 +0200
+
+python-httplib2 (0.8-2) unstable; urgency=low
+
+ * Team upload.
+
+ [ Vincent Bernat ]
+ * Upload to unstable.
+ * Fix CVE-2013-2037 with the appropriate patch. Closes: #706602.
+
+ -- Vincent Bernat <bernat at debian.org> Fri, 16 Aug 2013 17:53:42 +0200
+
+python-httplib2 (0.8-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/patches/use_system_cacerts.patch:
+ - Refresh for new upstream release.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Mon, 18 Mar 2013 22:41:38 +0100
+
+python-httplib2 (0.7.7-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/patches/use_system_cacerts.patch:
+ - Do not ship bundled certificates, package already uses system ones,
+ provided by ca-certificates.
+ * debian/rules:
+ - Remove stale egg-info created during build.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sun, 25 Nov 2012 15:24:29 +0100
+
+python-httplib2 (0.7.6-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - Bump Standards-Version to 3.9.4, no changes required.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sat, 10 Nov 2012 10:57:02 +0100
+
+python-httplib2 (0.7.5-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/patches/egg-info.patch:
+ - Removed, no longer needed.
+ * debian/patches/use_system_cacerts.patch:
+ - Refresh for new upstream release.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sat, 08 Sep 2012 11:56:49 +0200
+
+python-httplib2 (0.7.4-2) unstable; urgency=low
+
+ * debian/patches/egg-info.patch:
+ - Complete egg-info data with missing details.
+ * debian/compat:
+ - Bump compatibility level to 9.
+ * debian/rules:
+ - Delete build directory during clean phase (Closes: #671108).
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sun, 27 May 2012 12:07:29 +0200
+
+python-httplib2 (0.7.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/use_system_cacerts.patch:
+ - Refresh for new upstream release.
+ * debian/watch:
+ - Use code.google.com to watch for upstream releases.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Fri, 16 Mar 2012 22:19:04 +0100
+
+python-httplib2 (0.7.2-2) unstable; urgency=low
+
+ * debian/patches/use_system_cacerts.patch:
+ - Use system ca certificates, not the bundled ones, to always use
+ the most recent ones, thanks to Marc Deslauriers (Closes: #652105).
+ * debian/control:
+ - Depend on ca-certificates.
+ - Bump Standards-Version to 3.9.3.
+ * debian/copyright:
+ - Format now points to copyright-format site.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Thu, 23 Feb 2012 21:42:54 +0100
+
+python-httplib2 (0.7.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/ssl-validation.patch:
+ - Removed, applied upstream.
+ * debian/patches/godaddy-certificate.patch:
+ - Removed, applied upstream.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Mon, 14 Nov 2011 21:07:54 +0100
+
+python-httplib2 (0.7.1-2) unstable; urgency=low
+
+ * debian/patches/ssl-validation.patch:
+ - Cherry-pick patch from upstream hg to fix incorrect checks for
+ SSL certificate domain names.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Tue, 13 Sep 2011 20:32:44 +0200
+
+python-httplib2 (0.7.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - Install cacerts.txt file (Closes: #631841).
+ * debian/patches/godaddy-certificate.patch:
+ - Cherry-pick GoDaddy root certificate from upstream to fix access
+ to Launchpad services (Closes: #631164).
+
+ -- Luca Falavigna <dktrkranz at debian.org> Tue, 28 Jun 2011 21:53:34 +0200
+
+python-httplib2 (0.7.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - Do not hardcode $Rev$ in the User-Agent field (Closes: #609576).
+ * debian/copyright:
+ - Update copyright information.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Mon, 13 Jun 2011 23:47:18 +0200
+
+python-httplib2 (0.6.0-5) unstable; urgency=low
+
+ * Python transition:
+ - Add support for python2.7
+ - Drop support for python2.5
+ * debian/control:
+ - Bump Standards-Version to 3.9.2, no changes required.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sat, 16 Apr 2011 15:15:29 +0200
+
+python-httplib2 (0.6.0-4) unstable; urgency=low
+
+ * Team upload.
+
+ [ Luca Falavigna ]
+ * debian/control:
+ - Add Breaks: ${python:Breaks} to generate correct dependencies, this
+ also makes lintian override useless now.
+
+ [ Piotr Ożarowski ]
+ * Bump minimum required python3-all version to 3.1.2-10
+ (and rebuild for /usr/lib/python3/dist-packages transtion)
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 26 Sep 2010 22:10:33 +0200
+
+python-httplib2 (0.6.0-3) unstable; urgency=medium
+
+ * debian/control:
+ - Depend on ${python3:Depends} for python3-httplib2 to generate
+ correct dependencies for Python 3.X (Closes: #591956).
+ - Bump Standards-Version to 3.9.1, no changes required.
+ * debian/python-httplib2.lintian-overrides:
+ - Override old-versioned-python-dependency, needs fixing in Lintian.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sat, 07 Aug 2010 15:39:46 +0200
+
+python-httplib2 (0.6.0-2) unstable; urgency=low
+
+ * Switch to format 3.0 (quilt).
+ * Switch to dh_python2.
+ * debian/control:
+ - Add python3-httplib2 package.
+ - Bump Standards-Version to 3.8.4, no changes required.
+ * debian/rules:
+ - Install files for python3-httplib2 package.
+ * debian/watch:
+ - Use googlecode.debian.net provider.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sun, 27 Jun 2010 10:59:40 +0200
+
+python-httplib2 (0.6.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add new copyright holders.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sun, 03 Jan 2010 17:12:21 +0100
+
+python-httplib2 (0.5.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: #461200) (LP: #373589).
+ * debian/compat:
+ - Bump compat level to 7.
+ * debian/control:
+ - New Maintainer (Closes: #542786).
+ - Add Debian Python Modules Team to Uploaders.
+ - Switch to python section to match override.
+ - Remove cdbs from Build-Depends.
+ - Bump debhelper required version to 7.2.18.
+ - Do not build-depend on python-all-dev, depend on python instead.
+ - Move python-support to Build-Depends-Indep.
+ - Bump Standards-Version to 3.8.3.
+ - Add Homepage field.
+ - Add XS-Python-Version field.
+ - Add Vcs-* fields to store Debian packaging.
+ - Set Architecture to all.
+ - Remove ${shlibs:Depends} from Depends.
+ - Fix spelling errors in package description.
+ * debian/copyright:
+ - Adjust copyright informations.
+ * debian/README.Debian:
+ - Removed, already provided by upstream README.
+ * debian/pycompat:
+ - Removed, useless.
+ * debian/rules:
+ - Switch to debhelper 7.
+ * debian/watch:
+ - Provide a watch file.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Wed, 26 Aug 2009 20:16:16 +0200
+
+python-httplib2 (0.2.0-2) unstable; urgency=low
+
+ * reformat description closes: #392116
+ * add missing-build-dependency python-all-dev
+
+ -- Matthias Jahn <jahn.matthias at freenet.de> Wed, 11 Oct 2006 08:39:48 +0200
+
+python-httplib2 (0.2.0-1) unstable; urgency=low
+
+ * Initial upload. closes: #386944
+
+ -- Matthias Jahn <jahn.matthias at freenet.de> Mon, 31 Jul 2006 11:24:22 +0200
+
diff --cc debian/patches/ssl-mismatch-check.patch
index d983b24,0000000..331c016
mode 100644,000000..100644
--- a/debian/patches/ssl-mismatch-check.patch
+++ b/debian/patches/ssl-mismatch-check.patch
@@@ -1,34 -1,0 +1,34 @@@
- From b5ce965b64cf8a8332bb25a69beeff18c61afdd6 Mon Sep 17 00:00:00 2001
++From 871c40f5144e27d0344734cff78806d925a96d38 Mon Sep 17 00:00:00 2001
+From: Roman Podolyaka <rpodolyaka...mirantis.com>
+Date: Thu, 8 Oct 2015 12:15:45 -0700
+Subject: Close connection on certificate mismatch to avoid reuse
+
+Forwarded: https://code.google.com/p/httplib2/issues/detail?id=282
+
+Patch-Name: ssl-mismatch-check.patch
+---
+ python2/httplib2/__init__.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
- index 70b860a..8a9865d 100644
++index e996d01..4564991 100644
+--- a/python2/httplib2/__init__.py
++++ b/python2/httplib2/__init__.py
+@@ -1044,7 +1044,7 @@ class HTTPSConnectionWithTimeout(httplib.HTTPSConnection):
+ raise CertificateHostnameMismatch(
+ 'Server presented certificate that does not match '
+ 'host %s: %s' % (hostname, cert), hostname, cert)
+- except ssl_SSLError, e:
++ except (ssl_SSLError, CertificateHostnameMismatch), e:
+ if sock:
+ sock.close()
+ if self.sock:
+@@ -1054,7 +1054,7 @@ class HTTPSConnectionWithTimeout(httplib.HTTPSConnection):
+ # to get at more detailed error information, in particular
+ # whether the error is due to certificate validation or
+ # something else (such as SSL protocol mismatch).
+- if e.errno == ssl.SSL_ERROR_SSL:
++ if hasattr(e, 'errno') and e.errno == ssl.SSL_ERROR_SSL:
+ raise SSLHandshakeError(e)
+ else:
+ raise
diff --cc debian/patches/use_system_cacerts.patch
index bde7423,0000000..cff65bb
mode 100644,000000..100644
--- a/debian/patches/use_system_cacerts.patch
+++ b/debian/patches/use_system_cacerts.patch
@@@ -1,59 -1,0 +1,59 @@@
- From 047c43be46e078ff8e9fca4c1fe1690ca3ff2743 Mon Sep 17 00:00:00 2001
++From 437b5bba5dac2e43815a900dbc6ee093c675bb4c Mon Sep 17 00:00:00 2001
+From: Marc Deslauriers <marc.deslauriers at canonical.com>
+Date: Thu, 8 Oct 2015 12:15:44 -0700
+Subject: Use system ca certificates, not the bundled ones
+
+Forwarded: not-needed
+Bug-Ubuntu: https://launchpad.net/bugs/882027
+
+Patch-Name: use_system_cacerts.patch
+---
+ python2/httplib2/__init__.py | 5 ++---
+ python3/httplib2/__init__.py | 5 ++---
+ setup.py | 1 -
+ 3 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
- index 19e7cff..70b860a 100644
++index 6fa3cc6..e996d01 100644
+--- a/python2/httplib2/__init__.py
++++ b/python2/httplib2/__init__.py
+@@ -190,9 +190,8 @@ try:
+ import ca_certs_locater
+ CA_CERTS = ca_certs_locater.get()
+ except ImportError:
+- # Default CA certificates file bundled with httplib2.
+- CA_CERTS = os.path.join(
+- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
++ # Use system CA certificates
++ CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+
+ # Which headers are hop-by-hop headers by default
+ HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
+diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
- index 260fa6b..3c05286 100644
++index 3ce019e..8383cc4 100644
+--- a/python3/httplib2/__init__.py
++++ b/python3/httplib2/__init__.py
+@@ -123,9 +123,8 @@ DEFAULT_MAX_REDIRECTS = 5
+ # Which headers are hop-by-hop headers by default
+ HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
+
+-# Default CA certificates file bundled with httplib2.
+-CA_CERTS = os.path.join(
+- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
++# Use system CA certificates
++CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+
+ def _get_end2end_headers(response):
+ hopbyhop = list(HOP_BY_HOP)
+diff --git a/setup.py b/setup.py
- index 4240f6c..119d8d9 100755
++index fb00ed2..2c31f44 100755
+--- a/setup.py
++++ b/setup.py
+@@ -61,7 +61,6 @@ A comprehensive HTTP client library, ``httplib2`` supports many features left ou
+ """,
+ package_dir=pkgdir,
+ packages=['httplib2'],
+- package_data={'httplib2': ['*.txt']},
+ classifiers=[
+ 'Development Status :: 4 - Beta',
+ 'Environment :: Web Environment',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-httplib2.git
More information about the Python-modules-commits
mailing list