Control: tags 906127 + patch
Dear maintainer,
I've prepared an NMU for pysimplesoap (versioned as 1.16-2.1).
The diff is attached to this message.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru pysimplesoap-1.16/debian/changelog pysimplesoap-1.16/debian/changelog
--- pysimplesoap-1.16/debian/changelog 2017-01-08 06:51:39.000000000 +0200
+++ pysimplesoap-1.16/debian/changelog 2018-09-12 18:19:58.000000000 +0300
@@ -1,3 +1,11 @@
+pysimplesoap (1.16-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Add patch from Aiden Woodruff to fix the version check
+ with httplib2 0.11. (Closes: #906127)
+
+ -- Adrian Bunk <[email protected]> Wed, 12 Sep 2018 18:19:58 +0300
+
pysimplesoap (1.16-2) unstable; urgency=medium
[ Sandro Tosi ]
diff -Nru pysimplesoap-1.16/debian/patches/fix-httplib2-version-check.patch pysimplesoap-1.16/debian/patches/fix-httplib2-version-check.patch
--- pysimplesoap-1.16/debian/patches/fix-httplib2-version-check.patch 1970-01-01 02:00:00.000000000 +0200
+++ pysimplesoap-1.16/debian/patches/fix-httplib2-version-check.patch 2018-09-12 18:14:52.000000000 +0300
@@ -0,0 +1,32 @@
+--- pysimplesoap-1.16.orig/pysimplesoap/transport.py
++++ pysimplesoap-1.16/pysimplesoap/transport.py
+@@ -15,6 +15,8 @@
+
+ import logging
+ import sys
++from distutils.version import LooseVersion
++
+ try:
+ import urllib2
+ from cookielib import CookieJar
+@@ -61,7 +63,7 @@ class TransportBase:
+ #
+ try:
+ import httplib2
+- if sys.version > '3' and httplib2.__version__ <= "0.7.7":
++ if sys.version > '3' and LooseVersion(httplib2.__version__) <= LooseVersion("0.7.7"):
+ import http.client
+ # httplib2 workaround: check_hostname needs a SSL context with either
+ # CERT_OPTIONAL or CERT_REQUIRED
+@@ -91,9 +93,9 @@ else:
+ log.info("using proxy %s" % proxy)
+
+ # set optional parameters according supported httplib2 version
+- if httplib2.__version__ >= '0.3.0':
++ if LooseVersion(httplib2.__version__) >= LooseVersion('0.3.0'):
+ kwargs['timeout'] = timeout
+- if httplib2.__version__ >= '0.7.0':
++ if LooseVersion(httplib2.__version__) >= LooseVersion('0.7.0'):
+ kwargs['disable_ssl_certificate_validation'] = cacert is None
+ kwargs['ca_certs'] = cacert
+ httplib2.Http.__init__(self, **kwargs)
diff -Nru pysimplesoap-1.16/debian/patches/series pysimplesoap-1.16/debian/patches/series
--- pysimplesoap-1.16/debian/patches/series 2017-01-08 06:51:39.000000000 +0200
+++ pysimplesoap-1.16/debian/patches/series 2018-09-12 18:15:03.000000000 +0300
@@ -1 +1,2 @@
9c062558f14f7045a0ee1d232cee434d917b0d5b.patch
+fix-httplib2-version-check.patch
