[gentoo-commits] repo/gentoo:master commit in: dev-python/httplib2/, dev-python/httplib2/files/

2019-04-10 Thread Thomas Deutschmann 
commit: 3efe9915bb282a8d50352f09dba88923b0407e52
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Apr 10 17:24:02 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Apr 10 17:24:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3efe9915

dev-python/httplib2: respin use-system-cacerts.patch

Closes: https://bugs.gentoo.org/683010
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/httplib2-0.12.1-use-system-cacerts.patch | 26 ++
 dev-python/httplib2/httplib2-0.12.1.ebuild |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/dev-python/httplib2/files/httplib2-0.12.1-use-system-cacerts.patch 
b/dev-python/httplib2/files/httplib2-0.12.1-use-system-cacerts.patch
new file mode 100644
index 000..e189a540724
--- /dev/null
+++ b/dev-python/httplib2/files/httplib2-0.12.1-use-system-cacerts.patch
@@ -0,0 +1,26 @@
+--- a/python2/httplib2/certs.py
 b/python2/httplib2/certs.py
+@@ -19,9 +19,7 @@ except ImportError:
+ pass
+ 
+ 
+-BUILTIN_CA_CERTS = os.path.join(
+-os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
+-)
++BUILTIN_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+ 
+ 
+ def where():
+--- a/python3/httplib2/certs.py
 b/python3/httplib2/certs.py
+@@ -19,9 +19,7 @@ except ImportError:
+ pass
+ 
+ 
+-BUILTIN_CA_CERTS = os.path.join(
+-os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
+-)
++BUILTIN_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+ 
+ 
+ def where():

diff --git a/dev-python/httplib2/httplib2-0.12.1.ebuild 
b/dev-python/httplib2/httplib2-0.12.1.ebuild
index 0d4ac24b523..e80ad4f83e4 100644
--- a/dev-python/httplib2/httplib2-0.12.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.12.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="app-misc/ca-certificates"
 # tests connect to random remote sites
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.11.3-use-system-cacerts.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
 
 python_prepare_all() {
chmod o+r */*egg*/* || die

[gentoo-commits] repo/gentoo:master commit in: dev-python/httplib2/, dev-python/httplib2/files/

2018-01-04 Thread Michał Górny 
commit: d6794c2701249dd6b435aee6b36c066db5bec305
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan  4 20:05:35 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan  4 20:34:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6794c27

dev-python/httplib2: Clean old up

 dev-python/httplib2/Manifest   |  1 -
 .../files/python-httplib2-0.9-cve-2013-2037.patch  | 21 ---
 dev-python/httplib2/httplib2-0.10.3.ebuild | 37 ---
 dev-python/httplib2/httplib2-0.9.2-r2.ebuild   | 41 --
 4 files changed, 100 deletions(-)

diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 3f7bddd40c3..3e45a6dcbfd 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,2 +1 @@
 DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B 
f71d679b42865bd8e56f708e71d475bfc6988267b07cf7af298ae7ba2c132a67fa04f54f36dfa0d222f86f421ade40724638fdc5840f340da0e8e1a717bb6cdd
 SHA512 
d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa
-DIST httplib2-0.9.2.tar.gz 205165 BLAKE2B 
8bcd1b5786ef2bac51d31766f2477e05cb942feb5edc829ef8d13cd256169da3fb812880fe422e61c3c14d268833e38686452916b5cfc7e0ed1cff17bad6dcfb
 SHA512 
cf1684f2d072588bc676c02491667480bdd2be0b3494703129d9cfa339d1233e14c0b4895b174d4c2ec5e2f5ae265d165b4e001b180f39f81db2178f91a032f8

diff --git a/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch 
b/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch
deleted file mode 100644
index 6a09337b199..000
--- a/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py 
httplib2-0.9/python2/httplib2/__init__.py
 httplib2-0.9.orig/python2/httplib2/__init__.py 2015-04-03 
13:10:43.401035131 -0600
-+++ httplib2-0.9/python2/httplib2/__init__.py  2015-04-03 13:10:08.470685647 
-0600
-@@ -1042,7 +1042,7 @@
- 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:
-@@ -1052,7 +1052,7 @@
- # 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 --git a/dev-python/httplib2/httplib2-0.10.3.ebuild 
b/dev-python/httplib2/httplib2-0.10.3.ebuild
deleted file mode 100644
index a12c08521b0..000
--- a/dev-python/httplib2/httplib2-0.10.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.python.org/pypi/httplib2 
https://github.com/jcgregorio/httplib2;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-python_prepare_all() {
-   chmod o+r */*egg*/* || die
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   if [[ ${EPYTHON} == python2.7 ]] ; then
-   cd python2 || die
-   else
-   cd python3 || die
-   fi
-
-   "${PYTHON}" httplib2test.py || die
-}

diff --git a/dev-python/httplib2/httplib2-0.9.2-r2.ebuild 
b/dev-python/httplib2/httplib2-0.9.2-r2.ebuild
deleted file mode 100644
index 063a7624efe..000
--- a/dev-python/httplib2/httplib2-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.python.org/pypi/httplib2 
https://github.com/jcgregorio/httplib2;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-#

[gentoo-commits] repo/gentoo:master commit in: dev-python/httplib2/, dev-python/httplib2/files/

2017-07-13 Thread Thomas Deutschmann 
commit: 4ebc6fc6c47249c50409be161e37d5584ee51c87
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jul 13 11:03:19 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jul 13 11:03:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ebc6fc6

dev-python/httplib2: Use system certificate store (bug #624476)

Closes: https://github.com/gentoo/gentoo/pull/5092
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../files/httplib2-use-system-cacerts.patch| 59 ++
 dev-python/httplib2/httplib2-0.10.3-r1.ebuild  | 40 +++
 2 files changed, 99 insertions(+)

diff --git a/dev-python/httplib2/files/httplib2-use-system-cacerts.patch 
b/dev-python/httplib2/files/httplib2-use-system-cacerts.patch
new file mode 100644
index 000..cff65bb75ea
--- /dev/null
+++ b/dev-python/httplib2/files/httplib2-use-system-cacerts.patch
@@ -0,0 +1,59 @@
+From 437b5bba5dac2e43815a900dbc6ee093c675bb4c Mon Sep 17 00:00:00 2001
+From: Marc Deslauriers 
+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 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 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 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',

diff --git a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild 
b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
new file mode 100644
index 000..ed28cff1b4b
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="https://pypi.python.org/pypi/httplib2 
https://github.com/jcgregorio/httplib2;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="app-misc/ca-certificates"
+
+# tests connect to random remote sites
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-use-system-cacerts.patch )
+
+python_prepare_all() {
+   chmod o+r */*egg*/* || die
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   if [[ ${EPYTHON} == python2.7 ]] ; then
+   cd python2 || die
+   else
+   cd python3 || die
+   fi
+
+   "${PYTHON}" httplib2test.py || die
+}

[gentoo-commits] repo/gentoo:master commit in: dev-python/httplib2/, dev-python/httplib2/files/

2016-11-19 Thread Mike Gilbert 
commit: ae0c052e47bbfbbf35afaddcd2e828513c5f5acd
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Nov 19 18:42:36 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Nov 19 18:42:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae0c052e

dev-python/httplib2: apply patch for CVE-2013-2037

Bug: https://bugs.gentoo.org/468252

Package-Manager: portage-2.3.2_p8

 .../files/python-httplib2-0.9-cve-2013-2037.patch   | 21 +
 ...ib2-0.9.2-r1.ebuild => httplib2-0.9.2-r2.ebuild} | 12 
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch 
b/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch
new file mode 100644
index ..6a09337
--- /dev/null
+++ b/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch
@@ -0,0 +1,21 @@
+diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py 
httplib2-0.9/python2/httplib2/__init__.py
+--- httplib2-0.9.orig/python2/httplib2/__init__.py 2015-04-03 
13:10:43.401035131 -0600
 httplib2-0.9/python2/httplib2/__init__.py  2015-04-03 13:10:08.470685647 
-0600
+@@ -1042,7 +1042,7 @@
+ 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:
+@@ -1052,7 +1052,7 @@
+ # 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 --git a/dev-python/httplib2/httplib2-0.9.2-r1.ebuild 
b/dev-python/httplib2/httplib2-0.9.2-r2.ebuild
similarity index 71%
rename from dev-python/httplib2/httplib2-0.9.2-r1.ebuild
rename to dev-python/httplib2/httplib2-0.9.2-r2.ebuild
index 9fe30a1b..7382948 100644
--- a/dev-python/httplib2/httplib2-0.9.2-r1.ebuild
+++ b/dev-python/httplib2/httplib2-0.9.2-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -22,6 +22,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 # tests connect to random remote sites
 RESTRICT="test"
 
+PATCHES=(
+   "${FILESDIR}/python-httplib2-0.9-cve-2013-2037.patch"
+)
+
 python_prepare_all() {
chmod o+r */*egg*/* || die
distutils-r1_python_prepare_all