diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/python-debian/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/python-debian/files')
-rw-r--r-- | dev-python/python-debian/files/python-debian-0.1.26-CVE-2015-0840.patch | 29 | ||||
-rw-r--r-- | dev-python/python-debian/files/python-debian-0.1.26-fix-tests.patch | 24 |
2 files changed, 53 insertions, 0 deletions
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 new file mode 100644 index 000000000000..d4cde15e6d2c --- /dev/null +++ b/dev-python/python-debian/files/python-debian-0.1.26-CVE-2015-0840.patch @@ -0,0 +1,29 @@ +From 94a5864b6666ca5c2d0760702f386047189a248e Mon Sep 17 00:00:00 2001 +From: Guillem Jover <guillem@debian.org> +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'^-----(?P<action>BEGIN|END) PGP (?P<what>[^-]+)-----\s*$') ++ gpgre = re.compile(br'^-----(?P<action>BEGIN|END) PGP (?P<what>[^-]+)-----[\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 new file mode 100644 index 000000000000..189f83ac28e5 --- /dev/null +++ b/dev-python/python-debian/files/python-debian-0.1.26-fix-tests.patch @@ -0,0 +1,24 @@ + 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) + |