diff -Nru pycurl-7.43.0.6/debian/changelog pycurl-7.43.0.6/debian/changelog --- pycurl-7.43.0.6/debian/changelog 2020-12-07 17:41:28.000000000 +0000 +++ pycurl-7.43.0.6/debian/changelog 2021-01-12 20:04:36.000000000 +0000 @@ -1,8 +1,11 @@ -pycurl (7.43.0.6-4build1) hirsute; urgency=medium +pycurl (7.43.0.6-5) unstable; urgency=medium - * No-change rebuild to drop python3.8 extensions. + * Team upload + * Fix tests + - Skip invalid UTF-8 tests not working with latest python-bottle + - Disable IPv6 proxy for accessing ::1 - -- Matthias Klose Mon, 07 Dec 2020 18:41:28 +0100 + -- Balint Reczey Tue, 12 Jan 2021 21:04:36 +0100 pycurl (7.43.0.6-4) unstable; urgency=medium diff -Nru pycurl-7.43.0.6/debian/patches/0001-tests-Don-t-use-proxy-when-testing-connection-to-1.patch pycurl-7.43.0.6/debian/patches/0001-tests-Don-t-use-proxy-when-testing-connection-to-1.patch --- pycurl-7.43.0.6/debian/patches/0001-tests-Don-t-use-proxy-when-testing-connection-to-1.patch 1970-01-01 00:00:00.000000000 +0000 +++ pycurl-7.43.0.6/debian/patches/0001-tests-Don-t-use-proxy-when-testing-connection-to-1.patch 2021-01-12 20:04:36.000000000 +0000 @@ -0,0 +1,30 @@ +From 4f5d7ccc6a082dbc3ce0b87b3c34fb9ec98f4301 Mon Sep 17 00:00:00 2001 +From: Balint Reczey +Date: Tue, 12 Jan 2021 17:35:17 +0100 +Subject: [PATCH] tests: Don't use proxy when testing connection to ::1 +Forwarded: https://github.com/pycurl/pycurl/pull/668 + +The environment where the test is run may not disable proxy for ::1, +which is the case in Ubuntu CI due to older releases not handling ::1 +in no_proxy properly. + +https://bugs.launchpad.net/ubuntu/+source/curl/+bug/1908136 +--- + tests/open_socket_cb_test.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/open_socket_cb_test.py b/tests/open_socket_cb_test.py +index b2ddbeb..a9a9d70 100644 +--- a/tests/open_socket_cb_test.py ++++ b/tests/open_socket_cb_test.py +@@ -77,6 +77,7 @@ class OpenSocketCbTest(unittest.TestCase): + def test_socket_open_ipv6(self): + self.curl.setopt(pycurl.OPENSOCKETFUNCTION, socket_open_ipv6) + self.curl.setopt(self.curl.URL, 'http://[::1]:8380/success') ++ self.curl.setopt(self.curl.NOPROXY, '::1') + sio = util.BytesIO() + self.curl.setopt(pycurl.WRITEFUNCTION, sio.write) + try: +-- +2.25.1 + diff -Nru pycurl-7.43.0.6/debian/patches/0002-Skip-in-tests-of-handling-invalid-UTF-8-headers-beca.patch pycurl-7.43.0.6/debian/patches/0002-Skip-in-tests-of-handling-invalid-UTF-8-headers-beca.patch --- pycurl-7.43.0.6/debian/patches/0002-Skip-in-tests-of-handling-invalid-UTF-8-headers-beca.patch 1970-01-01 00:00:00.000000000 +0000 +++ pycurl-7.43.0.6/debian/patches/0002-Skip-in-tests-of-handling-invalid-UTF-8-headers-beca.patch 2021-01-12 20:04:36.000000000 +0000 @@ -0,0 +1,50 @@ +From ed7310854173ff306b21a9e1ea548358b83a4b91 Mon Sep 17 00:00:00 2001 +From: Balint Reczey +Date: Tue, 12 Jan 2021 20:40:36 +0100 +Subject: [PATCH 2/2] Skip in tests of handling invalid UTF-8 headers because + Bottle 0.12.17 fixes them +Forwarded: https://github.com/pycurl/pycurl/issues/669 + +--- + tests/getinfo_test.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/getinfo_test.py b/tests/getinfo_test.py +index 6e47ebe..222ec54 100644 +--- a/tests/getinfo_test.py ++++ b/tests/getinfo_test.py +@@ -75,6 +75,7 @@ class GetinfoTest(unittest.TestCase): + self.assertEqual([expected], self.curl.getinfo(pycurl.INFO_COOKIELIST)) + + @util.only_python3 ++ @unittest.skip("Bottle 0.12.17 and later does not send invalid UTF-8 in the header") + def test_getinfo_cookie_invalid_utf8_python3(self): + self.curl.setopt(self.curl.COOKIELIST, '') + self.make_request('/set_cookie_invalid_utf8', 'cookie set') +@@ -87,6 +88,7 @@ class GetinfoTest(unittest.TestCase): + else: + self.fail('Should have raised') + ++ @unittest.skip("Bottle 0.12.17 and later does not send invalid UTF-8 in the header") + def test_getinfo_raw_cookie_invalid_utf8(self): + self.curl.setopt(self.curl.COOKIELIST, '') + self.make_request('/set_cookie_invalid_utf8', 'cookie set') +@@ -103,6 +105,7 @@ class GetinfoTest(unittest.TestCase): + expected = '\xb3\xd2\xda\xcd\xd7' + self.assertEqual(expected, self.curl.getinfo(pycurl.CONTENT_TYPE)) + ++ @unittest.skip("Bottle 0.12.17 and later does not send invalid UTF-8 in the header") + @util.only_python3 + def test_getinfo_content_type_invalid_utf8_python3(self): + self.make_request('/content_type_invalid_utf8', 'content type set') +@@ -116,6 +119,7 @@ class GetinfoTest(unittest.TestCase): + else: + self.fail('Should have raised') + ++ @unittest.skip("Bottle 0.12.17 and later does not send invalid UTF-8 in the header") + def test_getinfo_raw_content_type_invalid_utf8(self): + self.make_request('/content_type_invalid_utf8', 'content type set') + +-- +2.25.1 + diff -Nru pycurl-7.43.0.6/debian/patches/series pycurl-7.43.0.6/debian/patches/series --- pycurl-7.43.0.6/debian/patches/series 2020-09-06 13:17:43.000000000 +0000 +++ pycurl-7.43.0.6/debian/patches/series 2021-01-12 20:04:36.000000000 +0000 @@ -1,3 +1,5 @@ +0001-tests-Don-t-use-proxy-when-testing-connection-to-1.patch +0002-Skip-in-tests-of-handling-invalid-UTF-8-headers-beca.patch 20_build_doc_for_debian.patch 30_debianize_tests.patch 0004-Removed-privacy-breach-in-docs.patch