Merge branch 'master' into dbtests

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

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 368cd988b382eda440fabdae56ee58f32802cf09..0ea2b4fe836b3dcae0e607353f3911282488a323 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -11,54 +11,64 @@ SSH_SOCKET=~/.ssh/buildd.debian.org.socket
 DISTS=$(dak admin s list)
 
 if [ -e $ftpdir/Archive_Maintenance_In_Progress ]; then
-       exit 0
+    exit 0
 fi
 
 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`
+    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*
+    darchs=$(dak admin s-a list-arch $dist | tr '\n' ' ')
+    codename=$(dak admin s show ${dist} | grep ^Codename | awk '{print $2}')
+    apt-ftparchive -qq -o APT::FTPArchive::Release::Codename="${codename}" -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="${darchs}" 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 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
+    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="$dist"
-               else
-                       dists="$dists $dist"
-               fi
-               continue
-       fi
-       old=PACKAGES_$dist
-       new=NEW_$old
+        if [ -z "$dists" ]; then
+            dists="$dist"
+        else
+            dists="$dists $dist"
+        fi
+        continue
+    fi
+    old=PACKAGES_$dist
+    new=NEW_$old
     if [ ${!new} -gt ${!old} ]; then
-               if [ -z "$dists" ]; then
-                       dists="$dist"
-               else
-                       dists="$dists $dist"
-               fi
-               continue
-       fi
+        if [ -z "$dists" ]; then
+            dists="$dist"
+        else
+            dists="$dists $dist"
+        fi
+        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
+    # 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