From: Joerg Jaspert Date: Sun, 25 Mar 2012 09:16:04 +0000 (+0200) Subject: remove lenny X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e13fd3c48245d48b0335649d294aacaee666bab5;p=dak.git remove lenny Signed-off-by: Joerg Jaspert --- diff --git a/config/backports/apt.conf b/config/backports/apt.conf index 0b17a106..e9a1e9fd 100644 --- a/config/backports/apt.conf +++ b/config/backports/apt.conf @@ -20,40 +20,6 @@ TreeDefault Contents::Header "/srv/backports-master.debian.org/dak/config/backports/Contents.top"; }; -tree "dists/lenny-backports" -{ - FileList "/srv/backports-master.debian.org/database/dists/lenny-backports_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/backports-master.debian.org/database/dists/lenny-backports_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.lenny-backports.$(SECTION)"; - ExtraOverride "override.lenny-backports.extra.$(SECTION)"; - SrcOverride "override.lenny-backports.$(SECTION).src"; -}; - -tree "dists/lenny-backports-sloppy" -{ - FileList "/srv/backports-master.debian.org/database/dists/lenny-backports-sloppy_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/backports-master.debian.org/database/dists/lenny-backports-sloppy_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.lenny-backports.$(SECTION)"; - ExtraOverride "override.lenny-backports.extra.$(SECTION)"; - SrcOverride "override.lenny-backports.$(SECTION).src"; -}; - -tree "dists/lenny-backports/main" -{ - FileList "/srv/backports-master.debian.org/database/dists/lenny-backports_main_$(SECTION)_binary-$(ARCH).list"; - Sections "debian-installer"; - Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.lenny-backports.main.$(SECTION)"; - SrcOverride "override.lenny-backports.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - Contents "$(DIST)/../Contents-udeb"; -}; - tree "dists/squeeze-backports" { FileList "/srv/backports-master.debian.org/database/dists/squeeze-backports_$(SECTION)_binary-$(ARCH).list"; diff --git a/config/backports/cron.unchecked b/config/backports/cron.unchecked index 46f30e07..423ce77d 100755 --- a/config/backports/cron.unchecked +++ b/config/backports/cron.unchecked @@ -65,9 +65,9 @@ function do_buildd () { dak make-overrides &>/dev/null rm -f override.sid.all3 override.sid.all3.src for i in main contrib non-free main.debian-installer; do - cat override.lenny-backports.$i >> override.sid.all3 + cat override.squeeze-backports.$i >> override.sid.all3 if [ "$i" != "main.debian-installer" ]; then - cat override.lenny-backports.$i.src >> override.sid.all3.src + cat override.squeeze-backports.$i.src >> override.sid.all3.src fi done make_buildd_dir diff --git a/config/backports/dak.conf b/config/backports/dak.conf index 09559953..ec7ff5fd 100644 --- a/config/backports/dak.conf +++ b/config/backports/dak.conf @@ -27,7 +27,7 @@ Dinstall // If defined then mails to close bugs are sent to the bugserver. CloseBugs "false"; OverrideDisparityCheck "false"; - DefaultSuite "lenny-backports"; + DefaultSuite "squeeze-backports"; ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml"; // If set, only send mails to addresses listed there. // format of entries: one entry per line. Either an email address directly, or a regular expression, @@ -74,18 +74,6 @@ Check-Overrides { OverrideSuites { - lenny-backports - { - Process "1"; -// OriginSuite "Unstable"; - }; - - lenny-backports-sloppy - { - Process "1"; -// OriginSuite "Unstable"; - }; - squeeze-backports { Process "1"; @@ -126,7 +114,7 @@ Control-Overrides Options { Component "main"; - Suite "lenny-backports"; + Suite "squeeze-backports"; Type "deb"; }; }; @@ -135,7 +123,7 @@ Rm { Options { - Suite "lenny-backports"; + Suite "squeeze-backports"; }; LogFile "/srv/backports-web.debian.org/underlay/removals.txt"; @@ -163,26 +151,6 @@ Process-New Suite { - lenny-backports - { - Components - { - main; - contrib; - non-free; - }; - }; - - lenny-backports-sloppy - { - Components - { - main; - contrib; - non-free; - }; - }; - squeeze-backports { Components @@ -240,9 +208,6 @@ DB SuiteMappings { - "map lenny lenny-backports"; - "map lenny-bpo lenny-backports"; - "map lenny-bpo-sloppy lenny-backports-sloppy"; "map squeeze squeeze-backports"; "map squeeze-bpo squeeze-backports"; }; @@ -387,20 +352,14 @@ Generate-Releases { MD5Sum { - lenny-backports; - lenny-backports-sloppy; squeeze-backports; }; SHA1 { - lenny-backports; - lenny-backports-sloppy; squeeze-backports; }; SHA256 { - lenny-backports; - lenny-backports-sloppy; squeeze-backports; }; } diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions index 73b801e4..8709e6e1 100644 --- a/config/backports/dinstall.functions +++ b/config/backports/dinstall.functions @@ -154,7 +154,7 @@ function overrides() { # FIXME rm -f override.sid.all3 - for i in main contrib non-free main.debian-installer; do cat override.lenny-backports.$i >> override.sid.all3; done + for i in main contrib non-free main.debian-installer; do cat override.squeeze-backports.$i >> override.sid.all3; done } function mpfm() { diff --git a/config/backports/vars b/config/backports/vars index e6ed91a6..5a1ca15b 100644 --- a/config/backports/vars +++ b/config/backports/vars @@ -34,7 +34,7 @@ exportpublic=$public/export/ ftpgroup=debadmin -copyoverrides="lenny-backports.contrib lenny-backports.contrib.src lenny-backports.main lenny-backports.main.debian-installer lenny-backports.main.src lenny-backports.extra.contrib lenny-backports.extra.main" +copyoverrides="squeeze-backports.contrib squeeze-backports.contrib.src squeeze-backports.main squeeze-backports.main.debian-installer squeeze-backports.main.src squeeze-backports.extra.contrib squeeze-backports.extra.main" # Change this to your hostname uploadhost=localhost @@ -42,7 +42,7 @@ uploaddir=/pub/UploadQueue/ # What components to support components="main contrib non-free" -suites="lenny-backports" +suites="squeeze-backports" override_types="deb dsc udeb" # export TMP=/srv/backports-master.debian.org/tmp diff --git a/config/debian-security/apache.conf b/config/debian-security/apache.conf index d8038cc8..c022c8bd 100644 --- a/config/debian-security/apache.conf +++ b/config/debian-security/apache.conf @@ -15,12 +15,11 @@ #RewriteRule ^/$ http://www.debian.org/security/ # New suite aliases - Alias /buildd-lenny /srv/security-master.debian.org/buildd/lenny/ Alias /buildd-squeeze /srv/security-master.debian.org/buildd/squeeze/ Alias /buildd-wheezy /srv/security-master.debian.org/buildd/wheezy/ # BuildD access list - + order deny,allow deny from all diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf index fcac94d2..aba34097 100644 --- a/config/debian-security/apt.conf +++ b/config/debian-security/apt.conf @@ -15,21 +15,6 @@ Default FileMode 0664; } -tree "dists/oldstable/updates" -{ - FileList "/srv/security-master.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/security-master.debian.org/dak-database/dists/oldstable_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)"; - ExtraOverride "override.lenny.extra.$(SECTION)"; - SrcOverride "override.lenny.$(SECTION).src"; - Contents " "; - Packages::Compress "gzip bzip2"; - Sources::Compress "gzip bzip2"; -}; - - tree "dists/stable/updates" { FileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list"; diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd index 336112fd..9647c635 100644 --- a/config/debian-security/apt.conf.buildd +++ b/config/debian-security/apt.conf.buildd @@ -15,19 +15,6 @@ Default FileMode 0664; } -bindirectory "lenny" -{ - Packages "lenny/Packages"; - Sources "lenny/Sources"; - Contents " "; - - BinOverride "override.lenny.all3"; - SrcOverride "override.lenny.all3.src"; - BinCacheDB "packages-accepted-lenny.db"; - PathPrefix ""; - Packages::Extensions ".deb .udeb"; -}; - bindirectory "squeeze" { Packages "squeeze/Packages"; diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd index 1b60593d..970a2322 100755 --- a/config/debian-security/cron.buildd +++ b/config/debian-security/cron.buildd @@ -40,9 +40,6 @@ if [ ! -z "${dists}" ]; then trap 'kill -TERM $SSH_PID' 0 for d in ${dists}; do case ${d} in - oldstable) - send=lenny - ;; stable) send=squeeze ;; diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily index ba1d11ee..3c34d769 100755 --- a/config/debian-security/cron.daily +++ b/config/debian-security/cron.daily @@ -22,7 +22,6 @@ find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm for suite in $suites; do case $suite in - oldstable) override_suite=lenny;; stable) override_suite=squeeze;; testing) override_suite=wheezy;; *) echo "Unknown suite type ($suite)"; exit 1;; @@ -50,7 +49,7 @@ for suite in $suites; do done # Generate .all3 overides for the buildd support -for dist in lenny squeeze wheezy; do +for dist in squeeze wheezy; 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 aa729c37..c5ad1ca1 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -126,25 +126,6 @@ Suite // Priority determines which suite is used for the Maintainers file // as generated by 'dak make-maintainers' (highest wins). - OldStable - { - Components - { - updates/main; - updates/contrib; - updates/non-free; - }; - Announce "dak@security.debian.org"; - Version ""; - Origin "Debian"; - Label "Debian-Security"; - Description "Debian 5.0 Security Updates"; - ValidTime 864000; // 10 days - CodeName "lenny"; - OverrideCodeName "lenny"; - CopyDotDak "/srv/security-master.debian.org/queue/done/"; - }; - Stable { Components @@ -188,12 +169,8 @@ SuiteMappings { "silent-map stable-security stable"; "silent-map oldstable-security oldstable"; - // JT - FIXME, hackorama - // "silent-map testing-security stable"; "silent-map etch-secure oldstable"; - "silent-map lenny-secure stable"; "silent-map testing-security testing"; - "silent-map lenny-security oldstable"; "silent-map squeeze-security stable"; "silent-map wheezy-security testing"; }; diff --git a/config/debian/apt.conf b/config/debian/apt.conf index 79740965..eff52392 100644 --- a/config/debian/apt.conf +++ b/config/debian/apt.conf @@ -27,18 +27,6 @@ TreeDefault Contents::Header "/srv/ftp-master.debian.org/dak/config/debian/Contents.top"; }; -tree "dists/oldstable-proposed-updates" -{ - FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-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)"; - ExtraOverride "override.lenny.extra.$(SECTION)"; - SrcOverride "override.lenny.$(SECTION).src"; - Contents " "; -}; - tree "dists/proposed-updates" { FileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list"; @@ -100,18 +88,6 @@ tree "dists/unstable" // debian-installer -tree "dists/oldstable-proposed-updates/main" -{ - FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_main_$(SECTION)_binary-$(ARCH).list"; - Sections "debian-installer"; - Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"; - BinOverride "override.lenny.main.$(SECTION)"; - SrcOverride "override.lenny.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - Contents " "; -}; - tree "dists/proposed-updates/main" { FileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list"; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 864ffd34..7c5d57f6 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -237,14 +237,11 @@ Suite SuiteMappings { - "silent-map lenny-security oldstable-security"; "silent-map squeeze-security stable-security"; "silent-map wheezy-security testing-security"; "propup-version oldstable-security stable testing testing-proposed-updates unstable"; "propup-version stable-security testing testing-proposed-updates unstable"; "propup-version testing-security unstable"; - "map lenny oldstable"; - "map lenny-proposed-updates oldstable-proposed-updates"; "map squeeze stable"; "map squeeze-proposed-updates proposed-updates"; "map squeeze-updates proposed-updates"; diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 8a5ec24e..b7679dcf 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -232,7 +232,7 @@ function mkmaintainers() { function copyoverrides() { log 'Copying override files into public view ...' - for ofile in ${overridedir}/override.{lenny,squeeze,wheezy,sid}.{,extra.}{main,contrib,non-free}*; do + for ofile in ${overridedir}/override.{squeeze,wheezy,sid}.{,extra.}{main,contrib,non-free}*; do bname=${ofile##*/} gzip -9cv --rsyncable ${ofile} > ${indices}/${bname}.gz chmod g+w ${indices}/${bname}.gz diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py index e78466fc..9b4526fe 100755 --- a/dak/generate_packages_sources.py +++ b/dak/generate_packages_sources.py @@ -106,45 +106,6 @@ TreeDefault apt_trees={} apt_trees["di"]={} - apt_trees["oldstable"]=""" -tree "dists/oldstable" -{ - FileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "%(arch)s"; - BinOverride "override.lenny.$(SECTION)"; - ExtraOverride "override.lenny.extra.$(SECTION)"; - SrcOverride "override.lenny.$(SECTION).src"; -}; -""" - - apt_trees["di"]["oldstable"]=""" -tree "dists/oldstable/main" -{ - FileList "/srv/ftp-master.debian.org/database/dists/oldstable_main_$(SECTION)_binary-$(ARCH).list"; - Sections "debian-installer"; - Architectures "%(arch)s"; - BinOverride "override.lenny.main.$(SECTION)"; - SrcOverride "override.lenny.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - %(contentsline)s -}; - -tree "dists/oldstable/non-free" -{ - FileList "/srv/ftp-master.debian.org/database/dists/oldstable_non-free_$(SECTION)_binary-$(ARCH).list"; - Sections "debian-installer"; - Architectures "%(arch)s"; - BinOverride "override.lenny.main.$(SECTION)"; - SrcOverride "override.lenny.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - %(contentsline)s -}; -""" - apt_trees["stable"]=""" tree "dists/stable" { @@ -366,33 +327,6 @@ tree "dists/proposed-updates/main" Contents " "; }; """ - apt_trees["oldstable-proposed-updates"]=""" -tree "dists/oldstable-proposed-updates" -{ - FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "%(arch)s"; - BinOverride "override.lenny.$(SECTION)"; - ExtraOverride "override.lenny.extra.$(SECTION)"; - SrcOverride "override.lenny.$(SECTION).src"; - Contents " "; -}; -""" - apt_trees["di"]["oldstable-proposed-updates"]=""" -tree "dists/oldstable-proposed-updates/main" -{ - FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_main_$(SECTION)_binary-$(ARCH).list"; - Sections "debian-installer"; - Architectures "%(arch)s"; - BinOverride "override.lenny.main.$(SECTION)"; - SrcOverride "override.lenny.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - Contents " "; -}; -""" - cnf = Config() try: # Write apt.conf diff --git a/dak/show_deferred.py b/dak/show_deferred.py index 7352f71e..f9f24d6f 100755 --- a/dak/show_deferred.py +++ b/dak/show_deferred.py @@ -24,12 +24,7 @@ import sys, os, re, time import apt_pkg import rrdtool -try: - # starting with squeeze - from debian import deb822 -except: - # up to lenny - from debian_bundle import deb822 +from debian import deb822 from daklib.dbconn import * from daklib import utils diff --git a/tools/gen-emails.pl b/tools/gen-emails.pl index cde1dd3a..50584fb1 100755 --- a/tools/gen-emails.pl +++ b/tools/gen-emails.pl @@ -36,7 +36,7 @@ my $sth = $dbh->prepare( " maintainer WHERE source.id = source_suite.src AND source.changedby = maintainer.id - AND ( suite_name = 'lenny-backports' or suite_name = 'squeeze-backports' ) + AND ( suite_name = 'squeeze-backports' ) GROUP BY source.source,maintainer.name; ");