X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.buildd;h=e52cbb4a8c4d084d499761b370052b44cdbd5926;hb=2380849f2c632e17b8318e344e8af20e97c6bde9;hp=d73033c740f5efec51b8cb1f52f1c925487d970c;hpb=b43ed3ff3738940ce46caa836d88b6937a76582c;p=dak.git

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index d73033c7..e52cbb4a 100755
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -2,48 +2,58 @@
 #
 # Executed after cron.unchecked
 
-ARCHS_oldstable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc s390"
-ARCHS_stable="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc sparc s390"
-ARCHS_testing="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc sparc s390"
-DISTS="oldstable stable testing"
-SSH_SOCKET=~/.ssh/buildd.debian.org.socket
-
 set -e
-export SCRIPTVARS=/org/security-master.debian.org/dak/config/debian-security/vars
+set -u
+
+export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
+SSH_SOCKET=~/.ssh/buildd.debian.org.socket
+DISTS=$(dak admin s list)
 
 if [ -e $ftpdir/Archive_Maintenance_In_Progress ]; then
 	exit 0
 fi
 
-cd $masterdir
-for d in $DISTS; do
-	eval SOURCES_$d=`stat -c "%Y" $base/buildd/$d/Sources.gz`
-	eval PACKAGES_$d=`stat -c "%Y" $base/buildd/$d/Packages.gz`
+for dist in $DISTS; do
+	eval SOURCES_$dist=`stat -c "%Y" $base/buildd/$dist/Sources.gz`
+	eval PACKAGES_$dist=`stat -c "%Y" $base/buildd/$dist/Packages.gz`
 done
 
+cd $configdir
 apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
+
+cd  ${base}/buildd
+for dist in $DISTS; do
+    rm -f $dist/Release*
+    archs=$(dak admin s-a list-arch $dist | tr '\n' ' ')
+    apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $dist security" -o APT::FTPArchive::Release::Architectures="${archs}" release $dist > Release
+    gpg --secret-keyring ${base}/s3kr1t/dot-gnupg/secring.gpg --keyring ${base}/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o Release.gpg Release
+    mv Release* $dist/.
+done
+
 dists=
-for d in $DISTS; do
-	eval NEW_SOURCES_$d=`stat -c "%Y" $base/buildd/$d/Sources.gz`
-	eval NEW_PACKAGES_$d=`stat -c "%Y" $base/buildd/$d/Packages.gz`
-	old=SOURCES_$d
-        new=NEW_$old
-        if [ ${!new} -gt ${!old} ]; then
+
+
+for dist in $DISTS; do
+	eval NEW_SOURCES_$dist=`stat -c "%Y" $base/buildd/$dist/Sources.gz`
+	eval NEW_PACKAGES_$dist=`stat -c "%Y" $base/buildd/$dist/Packages.gz`
+	old=SOURCES_$dist
+    new=NEW_$old
+    if [ ${!new} -gt ${!old} ]; then
 		if [ -z "$dists" ]; then
-			dists="$d"
+			dists="$dist"
 		else
-			dists="$dists $d"
+			dists="$dists $dist"
 		fi
 		continue
 	fi
-	old=PACKAGES_$d
+	old=PACKAGES_$dist
 	new=NEW_$old
-        if [ ${!new} -gt ${!old} ]; then
+    if [ ${!new} -gt ${!old} ]; then
 		if [ -z "$dists" ]; then
-			dists="$d"
+			dists="$dist"
 		else
-			dists="$dists $d"
+			dists="$dists $dist"
 		fi
 		continue
 	fi
@@ -61,4 +71,3 @@ if [ ! -z "$dists" ]; then
 		ssh wbadm@buildd -S $SSH_SOCKET trigger.security $d
 	done
 fi
-