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 <joerg@debian.org>

diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd
index f9010a8872ebfd751d8c86bff44e9bc9bc6aaa81..b16d0c97c137712646ef04ee90fd3c2b695a8763 100644 (file)
--- 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 67b9094400847217ec98c65ff9e827870af738b2..0ea2b4fe836b3dcae0e607353f3911282488a323 100755 (executable)
--- 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 0fd13983f0c327b3d836221c6da4b4e5e09af4e0..08ccbc748e19fb325b2e03e0790a02ce893d629c 100755 (executable)
--- 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)