X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.unchecked;h=dcf26f43df55cb8a1ed405bb0155f34aebf1ee4c;hb=7066337f607d0b8e116557a94ab2d4978094f2be;hp=130922dc40a88a3978b93b8830c2417b92806dd4;hpb=58aa25693341c753ac2309e8177426753a0b5e2e;p=dak.git diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked index 130922dc..dcf26f43 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 " team@security.debian.org done accepted=$(find ${queuedir}/accepted -type f -name "*.changes") if [ -n "${accepted}" ]; then @@ -79,36 +79,6 @@ 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.gz - apt-ftparchive sources . ${overridedir}/override.${overridecodename}.all3 >Sources - gzip -9c --rsyncable 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