X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.unchecked;h=7e2bb29ae4b3a5b5ec52e32dd58d6c9617d6fe28;hb=773f4286615587294d6e6acfb850df53a661bbc5;hp=130922dc40a88a3978b93b8830c2417b92806dd4;hpb=d96dce9205f48f798213711458ad318e3d09abd2;p=dak.git

diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 130922dc..7e2bb29a 100755
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -46,7 +46,7 @@ fi
 
 for queue in embargoed unembargoed; do
     echo "$timestamp: processing ${queue}" >> ${report}
-    dak process-policy ${queue} | mail -a "X-Debian: DAK" -e -s "Automatically accepted from ${queue}" team@security.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+    dak process-policy ${queue} | mail -a "X-Debian: DAK" -e -s "Automatically accepted from ${queue}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" team@security.debian.org
 done
 accepted=$(find ${queuedir}/accepted -type f -name "*.changes")
 if [ -n "${accepted}" ]; then
@@ -73,51 +73,23 @@ if [ "${doanything}" = "false" ] && [ "${dopolicy}" = "false" ]; then
     exit 0
 fi
 
+# Update stable-kfreebsd
+dak update-suite stable stable-kfreebsd
+
 # manage build queues
 dak manage-build-queues -a
 dak generate-packages-sources2 -a build-queues
 dak generate-releases -a build-queues >/dev/null
 ${scriptsdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-security-buildd
 
-# export build queues in old format
-# XXX: This should be removed later.
-for suite in oldstable stable; do
-    overridecodename=$(dak admin suite show ${suite} | awk '$1 == "OverrideCodename:" { print $2 }')
-    rm -rf ${incoming}/${suite}.new
-    mkdir ${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 >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 security" -o APT::FTPArchive::Release::Architectures="$archs" release ${suite}.new >${suite}.Release
-
-    gpg --secret-keyring /srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /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
-
-    if [ -d ${suite} ]; then
-	mv ${suite} ${suite}.old
-    fi
-    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
     dak dominate
-    #dak generate-filelist
     cd $configdir
     $configdir/map.sh
     dak generate-packages-sources2 -a security
-    dak generate-releases -a security
-    /srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh
+    dak generate-releases -a security >/dev/null
+    /srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh >/dev/null
     sudo -u archvsync -H /home/archvsync/signal_security
 fi