From f4deeafd5ac3257310499e74bc6d0890cdd089b6 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Tue, 2 May 2017 15:35:11 +0200 Subject: dev-python/python-debian: Clean old versions up --- .../files/python-debian-0.1.26-CVE-2015-0840.patch | 29 ---------------------- .../files/python-debian-0.1.26-fix-tests.patch | 24 ------------------ 2 files changed, 53 deletions(-) delete mode 100644 dev-python/python-debian/files/python-debian-0.1.26-CVE-2015-0840.patch delete mode 100644 dev-python/python-debian/files/python-debian-0.1.26-fix-tests.patch (limited to 'dev-python/python-debian/files') diff --git a/dev-python/python-debian/files/python-debian-0.1.26-CVE-2015-0840.patch b/dev-python/python-debian/files/python-debian-0.1.26-CVE-2015-0840.patch deleted file mode 100644 index d4cde15e6d2c..000000000000 --- a/dev-python/python-debian/files/python-debian-0.1.26-CVE-2015-0840.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 94a5864b6666ca5c2d0760702f386047189a248e Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Thu, 9 Apr 2015 23:16:48 +0200 -Subject: [PATCH] deb822: Fix OpenPGP Armor Header Line parsing - -We should only accept [\r\t ] as trailing whitespace, although RFC4880 -does not clarify what whitespace really maps to, we should really match -the GnuPG implementation anyway, as that is what we use to verify the -signatures. ---- - lib/debian/deb822.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py -index 0c0748e..c1dcb17 100644 ---- a/lib/debian/deb822.py -+++ b/lib/debian/deb822.py -@@ -638,7 +638,7 @@ class Deb822(Deb822Dict): - lines = [] - gpg_post_lines = [] - state = b'SAFE' -- gpgre = re.compile(br'^-----(?PBEGIN|END) PGP (?P[^-]+)-----\s*$') -+ gpgre = re.compile(br'^-----(?PBEGIN|END) PGP (?P[^-]+)-----[\r\t ]*$') - # Include whitespace-only lines in blank lines to split paragraphs. - # (see #715558) - blank_line = re.compile(b'^\s*$') --- -2.2.1.209.g41e5f3a - diff --git a/dev-python/python-debian/files/python-debian-0.1.26-fix-tests.patch b/dev-python/python-debian/files/python-debian-0.1.26-fix-tests.patch deleted file mode 100644 index 189f83ac28e5..000000000000 --- a/dev-python/python-debian/files/python-debian-0.1.26-fix-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ - tests/test_deb822.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/test_deb822.py b/tests/test_deb822.py -index 698366b..c989d3f 100755 ---- a/tests/test_deb822.py -+++ b/tests/test_deb822.py -@@ -468,6 +468,7 @@ class TestDeb822(unittest.TestCase): - for d in deb822.Deb822.iter_paragraphs(text)]) - self.assertEqual(2, count) - -+ @unittest.skip("Seems to be broken") - def test_iter_paragraphs_with_extra_whitespace(self): - """ Paragraphs not elided when stray whitespace is between - -@@ -920,7 +921,7 @@ Description: python modules to work with Debian-related data formats - with open_utf8(filename) as fh: - paragraphs = list(deb822.Deb822.iter_paragraphs( - fh, use_apt_pkg=True)) -- self.assertEqual(paragraphs[0]['Build-Depends'], 'debhelper,') -+ self.assertEqual(paragraphs[0]['Build-Depends'], 'debhelper,\n python') - finally: - os.remove(filename) - -- cgit v1.2.3-65-gdbad