From eb52dcfa3fc1d9460c901d1dfd988e81c9ff6da9 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Mon, 10 Jan 2011 23:11:06 +0100 Subject: [PATCH] bugfixes merge bugfixes from Torsten and Mark: - built uncompressed and bz2 packages/sources too for buildd - set a codename in the release file - strip epoch from version Signed-off-by: Joerg Jaspert --- config/debian-security/apt.conf.buildd | 4 ++-- config/debian-security/cron.buildd | 3 ++- dak/new_security_install.py | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd index f9010a88..b16d0c97 100644 --- a/config/debian-security/apt.conf.buildd +++ b/config/debian-security/apt.conf.buildd @@ -9,8 +9,8 @@ Dir Default { - Packages::Compress "gzip"; - Sources::Compress "gzip"; + Packages::Compress ". gzip bzip2"; + Sources::Compress ". gzip bzip2"; DeLinkLimit 0; FileMode 0664; } diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd index 67b90944..0ea2b4fe 100755 --- a/config/debian-security/cron.buildd +++ b/config/debian-security/cron.buildd @@ -26,7 +26,8 @@ cd ${base}/buildd for dist in $DISTS; do rm -f $dist/Release* darchs=$(dak admin s-a list-arch $dist | tr '\n' ' ') - apt-ftparchive -qq -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 + 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 diff --git a/dak/new_security_install.py b/dak/new_security_install.py index 0fd13983..08ccbc74 100755 --- a/dak/new_security_install.py +++ b/dak/new_security_install.py @@ -168,7 +168,10 @@ def main(): # Yes, we could do this inside do_Approve too. But this way we see who exactly # called it (ownership of the file) dbchange=get_dbchange(os.path.basename(changes[0]), session) - acceptfilename="%s/COMMENTS/ACCEPT.%s_%s" % (os.path.dirname(os.path.abspath(changes[0])), dbchange.source, dbchange.version) + # strip epoch from version + version=dbchange.version + version=version[(version.find(':')+1):] + acceptfilename="%s/COMMENTS/ACCEPT.%s_%s" % (os.path.dirname(os.path.abspath(changes[0])), dbchange.source, version) if Options["No-Action"]: print "Would create %s now and then go on to accept this package, but No-Action is set" % (acceptfilename) sys.exit(0) -- 2.39.5