From f957b3b90f103a1468fa499a88eb3d2357367f3c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 20 May 2011 12:19:28 -0400
Subject: Use md5sums for woody and potato, which only had those checksums in
 the Packages files. Closes: #627365

---
 debian/changelog     |  7 +++++++
 functions            | 13 +++++++++++--
 scripts/potato       |  1 +
 scripts/woody        |  1 +
 scripts/woody.buildd |  1 +
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ed60a5..15af0cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debootstrap (1.0.31) UNRELEASED; urgency=low
+
+  * Use md5sums for woody and potato, which only had those checksums
+    in the Packages files. Closes: #627365
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 20 May 2011 12:08:37 -0400
+
 debootstrap (1.0.30) unstable; urgency=low
 
   [ Mark Hymers ]
diff --git a/functions b/functions
index 48ba59e..b6e3ba8 100644
--- a/functions
+++ b/functions
@@ -226,11 +226,20 @@ mirror_style () {
 	export DOWNLOAD_DEBS
 }
 
+force_md5 () {
+	DEBOOTSTRAP_CHECKSUM_FIELD=MD5SUM
+	export DEBOOTSTRAP_CHECKSUM_FIELD
+}
+
 verify_checksum () {
 	# args: dest checksum size
 	local expchecksum="$2"
 	local expsize="$3"
-	relchecksum=`sha${SHA_SIZE}sum < "$1" | sed 's/ .*$//'`
+	if [ "$DEBOOTSTRAP_CHECKSUM_FIELD" = "MD5SUM" ]; then
+		relchecksum=`md5sum < "$1" | sed 's/ .*$//'`
+	else
+		relchecksum=`sha${SHA_SIZE}sum < "$1" | sed 's/ .*$//'`
+	fi
 	relsize=`wc -c < "$1"`
 	if [ "$expsize" -ne "$relsize" ] || [ "$expchecksum" != "$relchecksum" ]; then
 		return 1
@@ -1027,7 +1036,7 @@ while (<STDIN>) {
 		$ver = $v if ($f eq "version:");
 		$arc = $v if ($f eq "architecture:");
 		$fil = $v if ($f eq "filename:");
-		$chk = $v if ($f eq lc($ENV{DEBOOTSTRAP_CHECKSUM_FIELD}).":");
+		$chk = $v if (lc $f eq lc($ENV{DEBOOTSTRAP_CHECKSUM_FIELD}).":");
 		$siz = $v if ($f eq "size:");
 		$val = $v if ($f eq $field);
 	} elsif (/^$/) {
diff --git a/scripts/potato b/scripts/potato
index 304cbe0..50dc86a 100644
--- a/scripts/potato
+++ b/scripts/potato
@@ -1,5 +1,6 @@
 mirror_style release
 download_style apt var-state
+force_md5
 
 LIBC=libc6
 if [ "$ARCH" = alpha ]; then
diff --git a/scripts/woody b/scripts/woody
index fa0920a..12c65a3 100644
--- a/scripts/woody
+++ b/scripts/woody
@@ -1,5 +1,6 @@
 mirror_style release
 download_style apt
+force_md5
 
 LIBC=libc6
 if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
diff --git a/scripts/woody.buildd b/scripts/woody.buildd
index 2942478..0dd8d50 100644
--- a/scripts/woody.buildd
+++ b/scripts/woody.buildd
@@ -1,5 +1,6 @@
 mirror_style release
 download_style apt
+force_md5
 
 LIBC=libc6
 if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
-- 
cgit v1.2.3