[Reproducible-commits] [dpkg] 24/90: Dpkg::Changelog::Entry::Debian: Remove non-functional timezone name support

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 9849eff1e45bcd0c341a6ffb8675874a478fad9b
Author: Guillem Jover <guillem at debian.org>
Date:   Wed Jul 1 05:10:08 2015 +0200

    Dpkg::Changelog::Entry::Debian: Remove non-functional timezone name support
    
    The Debian changelog trailer regex intended to support a timezone name
    inside parenthesis, like this:
    
     -- Name <mail at example.org>  Sat, 30 May 2015 03:18:43 +0200 (CEST)
    
    is bogus, and it only accepts one character. As in:
    
     -- Name <mail at example.org>  Sat, 30 May 2015 03:18:43 +0200 (C)
    
    which while also "valid", as per RFC822, they are pretty much useless
    as per RFC5322. The implementation has kept that part unchanged since
    its inception in dpkg 1.3.0, 1996-08.
    
    So let's just drop it instead of fixing the regex, given that the
    timezone name has never been accepted, many time-parsing functions
    ignore it, it is redundant, declared obsolete by RFC5322 and Debian
    policy dropped an explicit reference to it due to bug #569174.
---
 debian/changelog                       | 3 +++
 scripts/Dpkg/Changelog/Entry/Debian.pm | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7e8e6b4..6d6ebea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ dpkg (1.18.2) UNRELEASED; urgency=low
 
   [ Guillem Jover ]
   * Fix plural form translations for single plural languages. Closes: #790025
+  * Perl modules:
+    - Remove non-functional timezone name support from
+      Dpkg::Changelog::Entry::Debian.
   * Documentation:
     - Fix grammar in dpkg-architecture(1).
       Thanks to Chris Lamb <lamby at debian.org>. Closes: #787616
diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm
index f9d8b2f..e4c2193 100644
--- a/scripts/Dpkg/Changelog/Entry/Debian.pm
+++ b/scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -64,7 +64,7 @@ our $regex_header = qr/^(\w$name_chars*) \(([^\(\) \t]+)\)((?:\s+$name_chars+)+)
 
 # The matched content is the maintainer name ($1), its email ($2),
 # some blanks ($3) and the timestamp ($4).
-our $regex_trailer = qr/^ \-\- (.*) <(.*)>(  ?)((\w+\,\s*)?\d{1,2}\s+\w+\s+\d{4}\s+\d{1,2}:\d\d:\d\d\s+[-+]\d{4}(\s+\([^\\\(\)]\))?)\s*$/o;
+our $regex_trailer = qr/^ \-\- (.*) <(.*)>(  ?)((\w+\,\s*)?\d{1,2}\s+\w+\s+\d{4}\s+\d{1,2}:\d\d:\d\d\s+[-+]\d{4})\s*$/o;
 
 ## use critic
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git