mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-25 08:37:27 -08:00
56bd759df1
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
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
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
|
|
|