From: Adam Heath <doogie@debian.org>
Date: Fri, 23 Aug 2002 04:12:50 +0000 (+0000)
Subject: Fix extraction of md5sum in dpkg-scanpackages.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e326ba46e22d7543159ca99af5a4f32cf71b0133;p=dpkg

Fix extraction of md5sum in dpkg-scanpackages.
---

diff --git a/ChangeLog b/ChangeLog
index 39451722..fa7300a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 22 23:06:39 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-scanpackages.pl: Fix extraction of md5sum in
+    dpkg-scanpackages.
+
 Thu Aug 22 23:01:53 CDT 2002 Adam Heath <doogie@debian.org>
 
   * utils/md5sum.c: Fix segfault in md5sum if the file being checked
diff --git a/debian/changelog b/debian/changelog
index ac3243fc..4a167e7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dpkg (1.10.5) unstable; urgency=low
 
   * Fix segfault in md5sum if the file being checked doesn't exist.
     Closes: #154503.
+  * Fix extraction of md5sum in dpkg-scanpackages.  Closes: #153769.
 
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index bc403ceb..50c85974 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -104,7 +104,7 @@ while (<F>) {
 
     open(C,"md5sum <$fn |") || die "$fn $!";
     chop($_=<C>); close(C); $? and die "\`md5sum < $fn' exited with $?\n";
-    /^[0-9a-f]{32}\s*-?\s*$/ or die "Strange text from \`md5sum < $fn': \`$_'\n";
+    /^([0-9a-f]{32})\s*-?\s*$/ or die "Strange text from \`md5sum < $fn': \`$_'\n";
     $tv{'MD5sum'}= $1;
 
     @stat= stat($fn) or die "Couldn't stat $fn: $!\n";