parsecdata: Fix parsing of fields starting with a colon

Fix regex to determine the field name correctly if the field's value
starts with a colon.

diff --git a/ChangeLog b/ChangeLog
index 63c996f4a91954980f686521cdbcd50a0e9471bc..3f38c61803f411952daf54f826887b767efdac18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-29  Frank Lichtenheld  <djpig@debian.org>
+
+       * scripts/controllib.pl (parsecdata): Fix
+       regex to determine the field name correctly
+       if the field's value starts with a colon.
+
 2007-11-29  Guillem Jover  <guillem@debian.org>
 
        * configure.ac: Bump version to 1.14.13~.

diff --git a/debian/changelog b/debian/changelog
index 8aadeaedf9d94537170ae67779a07e26f00d1b2a..fc5f6f3db3135c81b18aa802c5083902d07733e9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ dpkg (1.14.13) UNRELEASED; urgency=low
   [ Frank Lichtenheld ]
   * Add an own manpage for Dpkg's version format. Mostly stolen
     from policy. Closes: #373003
+  * Fix control file parsing for field values starting with a colon.
+    Apparently nobody ever needed this until Vcs-Cvs came along.
+    Closes: #453364
 
- -- Guillem Jover <guillem@debian.org>  Thu, 29 Nov 2007 07:08:35 +0200
+ -- Frank Lichtenheld <djpig@debian.org>  Thu, 29 Nov 2007 23:04:33 +0100
 
 dpkg (1.14.12) unstable; urgency=low
 

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index 6e2a4b40f3cd7bfd2ececf93db381f2783377984..2d6e36b7d3025221943290ce75c6ae12c3cfca2d 100755 (executable)
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -281,7 +281,7 @@ sub parsecdata {
        next if (m/^$/ and $paraborder);
        next if (m/^#/);
        $paraborder=0;
-        if (m/^(\S+)\s*:\s*(.*)$/) {
+        if (m/^(\S+?)\s*:\s*(.*)$/) {
            $cf = $1;
            my $v = $2;
             $cf= &capit($cf);