diff -Nru libproxy-0.4.16/bindings/python/libproxy.py libproxy-0.4.17/bindings/python/libproxy.py --- libproxy-0.4.16/bindings/python/libproxy.py 2020-12-04 11:07:46.000000000 +0000 +++ libproxy-0.4.17/bindings/python/libproxy.py 2020-12-29 11:30:46.000000000 +0000 @@ -35,18 +35,12 @@ return ctypes.cdll.LoadLibrary(name_ver) raise ImportError("Unable to find %s library" % name) -# Load C library -if platform.system() == "Windows": - _libc = ctypes.cdll.msvcrt -else: - _libc = _load("c", 6) - # Load libproxy _libproxy = _load("proxy", 1) _libproxy.px_proxy_factory_new.restype = ctypes.POINTER(ctypes.c_void_p) -_libproxy.px_proxy_factory_free.argtypes = ctypes.c_void_p, +_libproxy.px_proxy_factory_free.argtypes = [ctypes.c_void_p] _libproxy.px_proxy_factory_get_proxies.restype = ctypes.POINTER(ctypes.c_void_p) -_libproxy.px_proxy_factory_free_proxies.argtypes = ctypes.POINTER(ctypes.c_void_p) +_libproxy.px_proxy_factory_free_proxies.argtypes = [ctypes.POINTER(ctypes.c_void_p)] class ProxyFactory(object): """A ProxyFactory object is used to provide potential proxies to use @@ -141,7 +135,7 @@ proxies.append(proxy_bytes.decode('utf-8', errors='replace')) i += 1 - _libproxy.px_proxy_factory_free_proxies(proxies) + _libproxy.px_proxy_factory_free_proxies(array) return proxies diff -Nru libproxy-0.4.16/debian/changelog libproxy-0.4.17/debian/changelog --- libproxy-0.4.16/debian/changelog 2020-12-14 17:39:25.000000000 +0000 +++ libproxy-0.4.17/debian/changelog 2021-01-07 11:38:24.000000000 +0000 @@ -1,3 +1,17 @@ +libproxy (0.4.17-1) unstable; urgency=medium + + * Team upload + + [ Simon McVittie ] + * New upstream release + - Drop patch from 0.4.16-2, included in this release + * Standards-Version: 4.5.1 (no changes required) + + [ Helmut Grohne ] + * Tag test dependencies with (Closes: #979081) + + -- Simon McVittie Thu, 07 Jan 2021 11:38:24 +0000 + libproxy (0.4.16-2) unstable; urgency=medium * Fix the loading of the python module, patch from upstream diff -Nru libproxy-0.4.16/debian/control libproxy-0.4.17/debian/control --- libproxy-0.4.16/debian/control 2020-12-14 17:39:25.000000000 +0000 +++ libproxy-0.4.17/debian/control 2021-01-07 11:38:24.000000000 +0000 @@ -11,17 +11,17 @@ Build-Depends: debhelper-compat (= 13), dh-sequence-gnome, dh-sequence-python3, - netbase, + netbase , cmake, zlib1g-dev, libnm-dev [linux-any], libdbus-1-dev, - libkf5config-bin , - libwebkit2gtk-4.0-dev , + libkf5config-bin , + libwebkit2gtk-4.0-dev , libjavascriptcoregtk-4.0-dev , libglib2.0-dev (>= 2.26) , - libxmu-dev -Standards-Version: 4.5.0 + libxmu-dev +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/gnome-team/libproxy Vcs-Git: https://salsa.debian.org/gnome-team/libproxy.git Homepage: https://libproxy.github.io/libproxy/ diff -Nru libproxy-0.4.16/debian/control.in libproxy-0.4.17/debian/control.in --- libproxy-0.4.16/debian/control.in 2020-12-14 17:39:25.000000000 +0000 +++ libproxy-0.4.17/debian/control.in 2021-01-07 11:38:24.000000000 +0000 @@ -7,17 +7,17 @@ Build-Depends: debhelper-compat (= 13), dh-sequence-gnome, dh-sequence-python3, - netbase, + netbase , cmake, zlib1g-dev, libnm-dev [linux-any], libdbus-1-dev, - libkf5config-bin , - libwebkit2gtk-4.0-dev , + libkf5config-bin , + libwebkit2gtk-4.0-dev , libjavascriptcoregtk-4.0-dev , libglib2.0-dev (>= 2.26) , - libxmu-dev -Standards-Version: 4.5.0 + libxmu-dev +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/gnome-team/libproxy Vcs-Git: https://salsa.debian.org/gnome-team/libproxy.git Homepage: https://libproxy.github.io/libproxy/ diff -Nru libproxy-0.4.16/debian/patches/0002-python-bindings-fix-TypeError-_argtypes_-must-be-a-s.patch libproxy-0.4.17/debian/patches/0002-python-bindings-fix-TypeError-_argtypes_-must-be-a-s.patch --- libproxy-0.4.16/debian/patches/0002-python-bindings-fix-TypeError-_argtypes_-must-be-a-s.patch 2020-12-14 17:39:25.000000000 +0000 +++ libproxy-0.4.17/debian/patches/0002-python-bindings-fix-TypeError-_argtypes_-must-be-a-s.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -From: Dominique Leuenberger -Date: Mon, 14 Dec 2020 15:39:22 +0100 -Subject: python bindings: fix "TypeError: _argtypes_ must be a sequence of - types" - -Fixes #125 ---- - bindings/python/libproxy.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bindings/python/libproxy.py b/bindings/python/libproxy.py -index a29b33a..2224a19 100644 ---- a/bindings/python/libproxy.py -+++ b/bindings/python/libproxy.py -@@ -44,9 +44,9 @@ else: - # Load libproxy - _libproxy = _load("proxy", 1) - _libproxy.px_proxy_factory_new.restype = ctypes.POINTER(ctypes.c_void_p) --_libproxy.px_proxy_factory_free.argtypes = ctypes.c_void_p, -+_libproxy.px_proxy_factory_free.argtypes = [ctypes.c_void_p] - _libproxy.px_proxy_factory_get_proxies.restype = ctypes.POINTER(ctypes.c_void_p) --_libproxy.px_proxy_factory_free_proxies.argtypes = ctypes.POINTER(ctypes.c_void_p) -+_libproxy.px_proxy_factory_free_proxies.argtypes = [ctypes.POINTER(ctypes.c_void_p)] - - class ProxyFactory(object): - """A ProxyFactory object is used to provide potential proxies to use -@@ -141,7 +141,7 @@ class ProxyFactory(object): - proxies.append(proxy_bytes.decode('utf-8', errors='replace')) - i += 1 - -- _libproxy.px_proxy_factory_free_proxies(proxies) -+ _libproxy.px_proxy_factory_free_proxies(array) - - return proxies - diff -Nru libproxy-0.4.16/debian/patches/series libproxy-0.4.17/debian/patches/series --- libproxy-0.4.16/debian/patches/series 2020-12-14 17:39:25.000000000 +0000 +++ libproxy-0.4.17/debian/patches/series 2021-01-07 11:38:24.000000000 +0000 @@ -1,2 +1 @@ disable-pac-test.patch -0002-python-bindings-fix-TypeError-_argtypes_-must-be-a-s.patch diff -Nru libproxy-0.4.16/libproxy/CMakeLists.txt libproxy-0.4.17/libproxy/CMakeLists.txt --- libproxy-0.4.16/libproxy/CMakeLists.txt 2020-12-04 11:07:46.000000000 +0000 +++ libproxy-0.4.17/libproxy/CMakeLists.txt 2020-12-29 11:30:46.000000000 +0000 @@ -1,6 +1,6 @@ ### Project info project(libproxy) -set_project_version(0 4 16) +set_project_version(0 4 17) ### Add a global compilation stuff if (WIN32) diff -Nru libproxy-0.4.16/libproxy/url.cpp libproxy-0.4.17/libproxy/url.cpp --- libproxy-0.4.16/libproxy/url.cpp 2020-12-04 11:07:46.000000000 +0000 +++ libproxy-0.4.17/libproxy/url.cpp 2020-12-29 11:30:46.000000000 +0000 @@ -26,6 +26,7 @@ #include // For int/string conversion (using stringstream) #include // For sscanf() #include // For atoi() +#include // For errno and EINTR #include // For stat() #include // For transform() diff -Nru libproxy-0.4.16/NEWS libproxy-0.4.17/NEWS --- libproxy-0.4.16/NEWS 2020-12-04 11:07:46.000000000 +0000 +++ libproxy-0.4.17/NEWS 2020-12-29 11:30:46.000000000 +0000 @@ -1,3 +1,7 @@ +New in version 0.4.17: +============================== +* python bindings: fix "TypeError: _argtypes_ must be a sequence of types" (#125) + New in version 0.4.16: ============================== * Port to, and require, SpiderMonkey 68