Add security support for the lenny release

 * Move etch to oldstable
 * Rename lenny to stable
 * Create squeeze as testing
 * Make sure that all stable references now have arm and armel
 * Make sure that all testing/unstable/experimental references only have armel
   (i.e. drop arm)

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index 2df6072da4a7f83f9deb3f20978feac73402dd35..fcaa611348f265c5db5390ff1f68da52348a1468 100644 (file)
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -15,10 +15,10 @@ Default
    FileMode 0664;
 }
 
-tree "dists/stable/updates"
+tree "dists/oldstable/updates"
 {
-   FileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
+   FileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.etch.$(SECTION)";
@@ -29,10 +29,10 @@ tree "dists/stable/updates"
    Sources::Compress "gzip bzip2";
 };
 
-tree "dists/testing/updates"
+tree "dists/stable/updates"
 {
-   FileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
+   FileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.lenny.$(SECTION)";
@@ -42,3 +42,17 @@ tree "dists/testing/updates"
    Packages::Compress "gzip bzip2";
    Sources::Compress "gzip bzip2";
 };
+
+tree "dists/testing/updates"
+{
+   FileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+   BinOverride "override.squeeze.$(SECTION)";
+   ExtraOverride "override.squeeze.extra.$(SECTION)";
+   SrcOverride "override.squeeze.$(SECTION).src";
+   Contents " ";
+   Packages::Compress "gzip bzip2";
+   Sources::Compress "gzip bzip2";
+};

diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd
index 16154a64dbaab4c92db2d91ca30fd46d4735f60c..85c1f3dca0ab91c99f30b175abe28fdb8193e166 100644 (file)
--- a/config/debian-security/apt.conf.buildd
+++ b/config/debian-security/apt.conf.buildd
@@ -41,3 +41,16 @@ bindirectory "lenny"
    Packages::Extensions ".deb .udeb";
 };
 
+bindirectory "squeeze"
+{
+   Packages "squeeze/Packages";
+   Sources "squeeze/Sources";
+   Contents " ";
+
+   BinOverride "override.squeeze.all3";
+   SrcOverride "override.squeeze.all3.src";
+   BinCacheDB "packages-accepted-squeeze.db";
+   PathPrefix "";
+   Packages::Extensions ".deb .udeb";
+};
+

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index c5bcbb055c7d7230fcaf570be9f650d4e284fce7..bdf13d93ae1b8d50e59679debd45fc515255f049 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -2,9 +2,10 @@
 #
 # Executed after cron.unchecked
 
+ARCHS_oldstable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc s390"
 ARCHS_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc s390"
 ARCHS_testing="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc sparc s390"
-DISTS="stable testing"
+DISTS="oldstable stable testing"
 SSH_SOCKET=~/.ssh/buildd.debian.org.socket
 
 set -e

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 8d949781f9816b891695bca67a69ae7fe8d7575b..e482a192b4b2e44a23b4a52690aa89e1b1acce75 100755 (executable)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -20,9 +20,9 @@ find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
 
 for suite in $suites; do
     case $suite in
-               oldstable) override_suite=sarge;;
-               stable) override_suite=etch;;
-               testing) override_suite=lenny;;
+               oldstable) override_suite=etch;;
+               stable) override_suite=lenny;;
+               testing) override_suite=squeeze;;
                *) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
@@ -44,7 +44,7 @@ for suite in $suites; do
 done
 
 # Generate .all3 overides for the buildd support
-for dist in etch lenny; do
+for dist in etch lenny squeeze; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer.gz ]; then

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index ff74a599bf07cc5fed1f18f01b252b77b767ab34..a71b85563254d047e83022b8e4a3aef9d71dc05b 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -25,6 +25,7 @@ Dinstall
    BXANotify "false";
    QueueBuildSuites
    {
+     oldstable;
      stable;
      testing;
    };
@@ -110,7 +111,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  Stable
+  OldStable
   {
        Components 
        {
@@ -145,7 +146,7 @@ Suite
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
-  Testing
+  Stable
   {
        Components 
        {
@@ -174,12 +175,47 @@ Suite
        Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian testing Security Updates";
+       Description "Debian 5.0 Security Updates";
        ValidTime 864000; // 10 days
        CodeName "lenny";
        OverrideCodeName "lenny";
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
+
+  Testing
+  {
+       Components
+       {
+         updates/main;
+         updates/contrib;
+         updates/non-free;
+       };
+       Architectures
+       {
+         source;
+         all;
+         amd64;
+         alpha;
+         armel;
+         hppa;
+         i386;
+         ia64;
+         mips;
+         mipsel;
+         powerpc;
+         s390;
+         sparc;
+       };
+       Announce "dak@security.debian.org";
+       Version "";
+       Origin "Debian";
+       Label "Debian-Security";
+       Description "Debian testing Security Updates";
+       ValidTime 864000; // 10 days
+       CodeName "squeeze";
+       OverrideCodeName "squeeze";
+       CopyDotDak "/org/security.debian.org/queue/done/";
+  };
 };
 
 SuiteMappings
@@ -187,7 +223,8 @@ SuiteMappings
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
-  "silent-map etch-secure stable";
+  "silent-map etch-secure oldstable";
+  "silent-map lenny-secure stable";
   "silent-map testing-security testing";
 };
 
@@ -367,6 +404,7 @@ Location
       Archive "security";
       Suites 
        {
+         OldStable;
          Stable;
          Testing;
         };