@@ -1,3 +1,9 @@

+chiark-utils (3.0.3) unstable; urgency=low
+
+  * Compatibility with md5sum from dpkg 1.10.4.
+
+ --
+
 chiark-utils (3.0.2) unstable; urgency=low

   * Enhanced portability: cope with (and preserve) comments and

diff --git a/backup/full b/backup/full
index 668b5fdaec6fa9216e1ad1c7bcd1fe299261de2a..af6ebc95a3f14bd8dedfb5c6187b827f62278386 100755 (executable)
--- a/backup/full
+++ b/backup/full
@@ -213,9 +213,10 @@ system "mt -f $ntape fsf 1"; $? and die $?;
 open S,"this-md5sums" or die $!;
 for $tf (@fsys) {
     printdate();
-    chomp($orgsum= <S>);
+    chomp($orgsum= <S>); $orgsum =~ s/\ +\-?$//;
     $orgsum =~ m/^[0-9a-fA-F]{32}$/i or die "orgsum \`$orgsum' ?";
     chomp($csum= `dd if=$ntape ibs=$blocksizebytes | readbuffer | md5sum`);
+    $csum =~ s/\ +\-?$//;
     $orgsum eq $csum or die "MISMATCH $tf $csum $orgsum\n";
     print "checksum ok $csum\t$tf\n" or die $!;
     print LOG "checksum ok $csum\t$tf\n" or die $!;

diff --git a/debian/changelog b/debian/changelog
index 40fedf2f048a5602161d978bbf8a45583cf3dc7e..1fbf9288e64c1f2513ecdf51a2b3376d530b6047 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chiark-utils (3.0.3) unstable; urgency=low
+
+  * Compatibility with md5sum from dpkg 1.10.4.
+
+ --
+
 chiark-utils (3.0.2) unstable; urgency=low
 
   * Enhanced portability: cope with (and preserve) comments and