From: Ansgar Burchardt Date: Sat, 3 Aug 2013 01:34:23 +0000 (+0200) Subject: config/debian-security/*: remove deprecated settings X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=4a751c46595ea5e7a4f60dd80eac63738c11bc7e config/debian-security/*: remove deprecated settings Remove some deprecated settings from the security archive configuration. --- diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf deleted file mode 100644 index aba34097..00000000 --- a/config/debian-security/apt.conf +++ /dev/null @@ -1,44 +0,0 @@ -APT::FTPArchive::Contents off; - -Dir -{ - ArchiveDir "/srv/security-master.debian.org/ftp/"; - OverrideDir "/srv/security-master.debian.org/override/"; - CacheDir "/srv/security-master.debian.org/dak-database/"; -}; - -Default -{ - Packages::Compress "gzip bzip2"; - Sources::Compress "gzip bzip2"; - DeLinkLimit 0; - FileMode 0664; -} - -tree "dists/stable/updates" -{ - FileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "amd64 armel i386 ia64 kfreebsd-i386 kfreebsd-amd64 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"; -}; - -tree "dists/testing/updates" -{ - FileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "amd64 armel i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.wheezy.$(SECTION)"; - ExtraOverride "override.wheezy.extra.$(SECTION)"; - SrcOverride "override.wheezy.$(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 deleted file mode 100644 index 9647c635..00000000 --- a/config/debian-security/apt.conf.buildd +++ /dev/null @@ -1,42 +0,0 @@ -APT::FTPArchive::Contents off; - -Dir -{ - ArchiveDir "/srv/security-master.debian.org/buildd/"; - OverrideDir "/srv/security-master.debian.org/override/"; - CacheDir "/srv/security-master.debian.org/dak-database/"; -}; - -Default -{ - Packages::Compress ". gzip bzip2"; - Sources::Compress ". gzip bzip2"; - DeLinkLimit 0; - FileMode 0664; -} - -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"; -}; - -bindirectory "wheezy" -{ - Packages "wheezy/Packages"; - Sources "wheezy/Sources"; - Contents " "; - - BinOverride "override.wheezy.all3"; - SrcOverride "override.wheezy.all3.src"; - BinCacheDB "packages-accepted-squeeze.db"; - PathPrefix ""; - Packages::Extensions ".deb .udeb"; -}; diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index b1f8c4b8..363d8c79 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -124,50 +124,6 @@ Security-Install }; }; -Suite -{ - // Priority determines which suite is used for the Maintainers file - // as generated by 'dak make-maintainers' (highest wins). - - Stable - { - Components - { - updates/main; - updates/contrib; - updates/non-free; - }; - Announce "dak@security.debian.org"; - Version ""; - Origin "Debian"; - Label "Debian-Security"; - Description "Debian 6.0 Security Updates"; - ValidTime 864000; // 10 days - CodeName "squeeze"; - OverrideCodeName "squeeze"; - CopyDotDak "/srv/security-master.debian.org/queue/done/"; - }; - - Testing - { - Components - { - updates/main; - updates/contrib; - updates/non-free; - }; - Announce "dak@security.debian.org"; - Version ""; - Origin "Debian"; - Label "Debian-Security"; - Description "Debian testing Security Updates"; - ValidTime 864000; // 10 days - CodeName "wheezy"; - OverrideCodeName "wheezy"; - CopyDotDak "/srv/security-master.debian.org/queue/done/"; - }; -}; - SuiteMappings { "silent-map stable-security stable"; @@ -202,14 +158,6 @@ Dir Queue { - Byhand "/srv/security-master.debian.org/queue/byhand/"; - New "/srv/security-master.debian.org/queue/new/"; - Unchecked "/srv/security-master.debian.org/queue/unchecked/"; - Newstage "/srv/security-master.debian.org/queue/newstage/"; - - ProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme - OldProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme - Embargoed "/srv/security-master.debian.org/queue/embargoed/"; Unembargoed "/srv/security-master.debian.org/queue/unembargoed/"; Disembargo "/srv/security-master.debian.org/queue/unchecked-disembargo/"; @@ -227,40 +175,6 @@ DB Unicode "false" }; -Architectures -{ - - source "Source"; - all "Architecture Independent"; - alpha "DEC Alpha"; - hppa "HP PA RISC"; - arm "ARM"; - armel "ARM EABI"; - i386 "Intel ia32"; - ia64 "Intel ia64"; - mips "MIPS (Big Endian)"; - mipsel "MIPS (Little Endian)"; - powerpc "PowerPC"; - s390 "IBM S/390"; - sparc "Sun SPARC/UltraSPARC"; - amd64 "AMD x86_64 (AMD64)"; - kfreebsd-i386 "GNU/kFreeBSD i386"; - kfreebsd-amd64 "GNU/kFreeBSD amd64"; - -}; - -Archive -{ - - security - { - OriginServer "security.debian.org"; - PrimaryMirror "security.debian.org"; - Description "Security Updates for the Debian project"; - }; - -}; - ComponentMappings { "main updates/main"; @@ -271,72 +185,6 @@ ComponentMappings "non-US/non-free updates/non-free"; }; -Section -{ - admin; - cli-mono; - comm; - database; - debian-installer; - debug; - devel; - doc; - editors; - embedded; - electronics; - fonts; - games; - gnome; - graphics; - gnu-r; - gnustep; - hamradio; - haskell; - httpd; - interpreters; - java; - kde; - kernel; - libdevel; - libs; - lisp; - localization; - mail; - math; - misc; - net; - news; - ocaml; - oldlibs; - otherosfs; - perl; - php; - python; - ruby; - science; - shells; - sound; - tex; - text; - utils; - web; - vcs; - video; - x11; - xfce; - zope; -}; - -Priority -{ - required 1; - important 2; - standard 3; - optional 4; - extra 5; - source 0; // i.e. unused -}; - Urgency { Default "low"; @@ -349,25 +197,3 @@ Urgency critical; }; }; - -Generate-Releases -{ - MD5Sum - { - oldstable; - stable; - testing; - }; - SHA1 - { - oldstable; - stable; - testing; - }; - SHA256 - { - oldstable; - stable; - testing; - }; -}