updated for new version

[dak.git] / config / debian-security / cron.buildd

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index d38e093de96c4f47deddcc3c31433fdeb04f4e95..368cd988b382eda440fabdae56ee58f32802cf09 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -2,47 +2,49 @@
 #
 # Executed after cron.unchecked
 
-ARCHS_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc s390"
-ARCHS_testing="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc sparc s390"
-DISTS="stable testing"
-SSH_SOCKET=~/.ssh/buildd.debian.org.socket
-
 set -e
-export SCRIPTVARS=/org/security.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
+
 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
@@ -57,19 +59,6 @@ if [ ! -z "$dists" ]; then
        done
        trap 'kill -TERM $SSH_PID' 0
        for d in $dists; do
-               archs=ARCHS_$d
-               ARCHS=${!archs}
-               cd /org/security.debian.org/buildd/$d
-               if [ "$d" != "oldstable" ]; then
-                       # disabled for oldstable-security by ajt 2008-01-01
-                       for a in $ARCHS; do
-                               quinn-diff -a /org/security.debian.org/buildd/Packages-arch-specific -A $a 2>/dev/null | ssh wbadm@buildd -S $SSH_SOCKET wanna-build -d $d-security -b $a/build-db --merge-partial-quinn
-
-                               ssh wbadm@buildd -S $SSH_SOCKET wanna-build -d $d-security -A $a -b $a/build-db --merge-packages < Packages
-                       done
-               else
-                       ssh buildd@bester.farm.ftbfs.de -i ~/.ssh/id_bester sleep 1
-               fi
+               ssh wbadm@buildd -S $SSH_SOCKET trigger.security $d
        done
 fi
-