From cd725954f6df5b809fe8d90ee135e222d1cef30e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 19 Aug 2010 00:32:56 +0200
Subject: sign the created Release files with our own dummy key "Joe Sixpack"

---
 test/integration/framework      |  15 ++++++++++++---
 test/integration/joesixpack.pub | Bin 0 -> 639 bytes
 test/integration/joesixpack.sec | Bin 0 -> 1290 bytes
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 test/integration/joesixpack.pub
 create mode 100644 test/integration/joesixpack.sec

diff --git a/test/integration/framework b/test/integration/framework
index e964235b0..01b795ba9 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -82,7 +82,7 @@ setupenvironment() {
 	local OLDWORKINGDIRECTORY=$(pwd)
 	trap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
 	cd $TMPWORKINGDIRECTORY
-	mkdir rootdir aptarchive
+	mkdir rootdir aptarchive keys
 	cd rootdir
 	mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d var/cache
 	mkdir -p var/log/apt var/lib/apt
@@ -93,7 +93,7 @@ setupenvironment() {
 	else
 		touch var/lib/dpkg/status
 	fi
-	touch var/lib/apt/extended_states var/lib/dpkg/available
+	touch var/lib/dpkg/available
 	mkdir -p usr/lib/apt
 	ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods
 	cd ..
@@ -103,6 +103,8 @@ setupenvironment() {
 	else
 		touch aptarchive/Packages
 	fi
+	cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
+	ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
 	echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
 	echo "Debug::NoLocking \"true\";" >> aptconfig.conf
 	echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
@@ -275,7 +277,7 @@ buildaptarchivefromincoming() {
 	msgdone "info"
 	msgninfo "\tGenerate Release files… "
 	for dir in $(find ./dists -mindepth 1 -maxdepth 1 -type d); do
-		aptftparchive -qq release $dir | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
+		aptftparchive -qq release $dir -o APT::FTPArchive::Release::Codename="$(echo "$dir" | cut -d'/' -f 3)" | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
 	done
 	cd - > /dev/null
 	msgdone "info"
@@ -342,7 +344,14 @@ setupaptarchive() {
 	else
 		setupflataptarchive
 	fi
+	msgninfo "\tSign archive with Joe Sixpack key… "
+	for RELEASE in $(find aptarchive/ -name Release); do
+		gpg --no-default-keyring --secret-keyring ./keys/joesixpack.sec --keyring ./keys/joesixpack.pub --default-key Joe -abs -o ${RELEASE}.gpg ${RELEASE}
+	done
+	msgdone "info"
+	msgninfo "\tSync APT's cache with the archive… "
 	aptget update -qq
+	msgdone "info"
 }
 
 diff() {
diff --git a/test/integration/joesixpack.pub b/test/integration/joesixpack.pub
new file mode 100644
index 000000000..2b40b97b6
Binary files /dev/null and b/test/integration/joesixpack.pub differ
diff --git a/test/integration/joesixpack.sec b/test/integration/joesixpack.sec
new file mode 100644
index 000000000..92aaada76
Binary files /dev/null and b/test/integration/joesixpack.sec differ
-- 
cgit v1.2.3-70-g09d2