Merge branch 'master' into security

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

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 96607e4850c48a216b03b4acc7cb4959e49a7c0c..d73033c740f5efec51b8cb1f52f1c925487d970c 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -2,14 +2,14 @@
 #
 # Executed after cron.unchecked
 
-ARCHS_oldstable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390 amd64"
-ARCHS_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc s390"
-ARCHS_testing="$ARCHS_stable"
+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.debian.org/dak/config/debian-security/vars
+export SCRIPTVARS=/org/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
 if [ -e $ftpdir/Archive_Maintenance_In_Progress ]; then
@@ -51,26 +51,14 @@ done
 
 if [ ! -z "$dists" ]; then
        # setup ssh master process
-       ssh buildd@buildd -S $SSH_SOCKET -MN 2> /dev/null &
+       ssh wbadm@buildd -S $SSH_SOCKET -MN 2> /dev/null &
        SSH_PID=$!
        while [ ! -S $SSH_SOCKET ]; do
                sleep 1
        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 buildd@buildd -S $SSH_SOCKET wanna-build -d $d-security -b $a/build-db --merge-partial-quinn
-
-                               ssh buildd@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