config/debian-security/*: More updates for multiarchive changes.

diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index ba1e5751ae197880879c5e47bf0b653457576097..c7baa6e6ad0aa92d90e87e7fc46b44d9ee215c95 100755 (executable)
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -69,7 +69,37 @@ if [ "${doanything}" = "false" ] && [ "${dopolicy}" = "false" ]; then
     exit 0
 fi
 
+# manage build queues
 dak manage-build-queues -a
+dak generate-packages-sources2 -a build-queues
+dak generate-releases -a build-queues >/dev/null
+
+# export build queues in old format
+# XXX: This should be removed later.
+for suite in stable testing; do
+    overridecodename=$(dak admin suite show ${suite} | awk '$1 == "OverrideCodename:" { print $2 }')
+    rm -rf ${incoming}/${suite}.new
+    dak export-suite -s buildd-${suite} -d ${incoming}/${suite}.new
+
+    cd ${incoming}/${suite}.new
+    apt-ftparchive packages . ${overridedir}/override.${overridecodename}.all3 >Packages
+    gzip -9c --rsyncable <Packages >Packages.gz
+    apt-ftparchive sources . ${overridedir}/override.${overridecodename}.all3.src >Sources
+    gzip -9c --rsyncable <Sources >Sources.gz
+    rm -f Release
+
+    cd ${incoming}
+    apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $suite incoming" -o APT::FTPArchive::Release::Architectures="$archs" release ${suite}.new >${suite}.Release
+
+    gpg --secret-keyring /srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg /srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o ${suite}.Release.gpg ${suite}.Release
+
+    mv ${suite}.Release ${suite}.new/Release
+    mv ${suite}.Release.gpg ${suite}.new/Release.gpg
+
+    mv ${suite} ${suite}.old
+    mv ${suite}.new ${suite}
+    rm -rf ${suite}.old
+done
 
 if [ "x${dopolicy}x" = "xtruex" ]; then
     # We had something approved from a policy queue, push out new archive

diff --git a/config/debian-security/map.sh b/config/debian-security/map.sh
index 06cd5384720a222e806142e3bcc22c96c68a2e6d..caa80b9c407ea3cdcf3d848a469ef52dafe821c8 100755 (executable)
--- a/config/debian-security/map.sh
+++ b/config/debian-security/map.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-dak make-pkg-file-mapping | bzip2 -9 > /srv/security-master.debian.org/ftp/indices/package-file.map.bz2
+dak make-pkg-file-mapping security | bzip2 -9 > /srv/security-master.debian.org/ftp/indices/package-file.map.bz2

diff --git a/config/debian-security/vars b/config/debian-security/vars
index 2d040a910fd4eba7f0a3b8673127db4d58cfa1bf..2a94fcd12cef772c07102d7a9196c5d0d4e77a2e 100644 (file)
--- a/config/debian-security/vars
+++ b/config/debian-security/vars
@@ -26,6 +26,7 @@ disembargo=$queuedir/unchecked-disembargo/
 done=$queuedir/done/
 
 mirrordir=$base/mirror/
+incoming=${base}/buildd
 exportdir=$base/export/
 exportpublic=$public/rsync/export/