X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.buildd;h=33f847c35db0fbe4bff26c7c90e6d6fcbc1a6e8e;hb=19ffc1de995fd165d9438a8b7769cd7c45bbce60;hp=bdf13d93ae1b8d50e59679debd45fc515255f049;hpb=290343bd9e607cb870f315d68a19796c5e9989c0;p=dak.git

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index bdf13d93..33f847c3 100755
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -2,63 +2,62 @@
 #
 # Executed after cron.unchecked
 
-ARCHS_oldstable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc s390"
-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="oldstable stable testing"
-SSH_SOCKET=~/.ssh/buildd.debian.org.socket
-
 set -e
-export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
+set -o pipefail
+set -u
+
+export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
+SSH_SOCKET=~/.ssh/buildd.debian.org.socket
+DISTS="stable testing"
 
 if [ -e $ftpdir/Archive_Maintenance_In_Progress ]; then
-	exit 0
+    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`
-done
-
-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
-		if [ -z "$dists" ]; then
-			dists="$d"
-		else
-			dists="$dists $d"
-		fi
-		continue
-	fi
-	old=PACKAGES_$d
-	new=NEW_$old
-        if [ ${!new} -gt ${!old} ]; then
-		if [ -z "$dists" ]; then
-			dists="$d"
-		else
-			dists="$dists $d"
-		fi
-		continue
-	fi
+now=$(date +%s)
+check=$(( now - 3*60 ))
+
+for dist in $DISTS; do
+    smodtime=$(stat -c "%Y" $base/build-queues/dists/buildd-$dist/updates/*/source/Sources.gz | sort -n | tail -1)
+    pmodtime=$(stat -c "%Y" $base/build-queues/dists/buildd-$dist/updates/*/binary-*/Packages.gz | sort -n | tail -1)
+
+    if [ ${smodtime} -gt ${check} ] || [ ${pmodtime} -gt ${check} ]; then
+        # Packages/Sources changed in the last minutes
+        dists="${dists} ${dist}"
+    else
+        continue
+    fi
 done
 
-if [ ! -z "$dists" ]; then
-	# setup ssh master process
-	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
-		ssh wbadm@buildd -S $SSH_SOCKET trigger.security $d
-	done
-fi
+if [ ! -z "${dists}" ]; then
+    # setup ssh master process
+    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
+        case ${d} in
+            oldoldstable)
+                send=squeeze
+                ;;
+            oldstable)
+                send=wheezy
+                ;;
+            stable)
+                send=jessie
+                ;;
+            testing)
+                send=stretch
+                ;;
+            *)
+                send=unknown
+                ;;
+        esac
 
+        ssh wbadm@buildd -S $SSH_SOCKET trigger.security $send
+    done
+fi