config/debian-security/cron.buildd

@@ -8,7 +8,7 @@ set -u
 
 export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
-DISTS="oldoldstable oldstable stable-security testing-security"
+DISTS="oldoldstable oldstable-security stable-security testing-security"
 
 if [ -e $ftpdir/Archive_Maintenance_In_Progress ]; then
     exit 0
@@ -21,7 +21,7 @@ trigger_wb() {
     local send=
 
     case "${dist}" in
-        oldoldstable|oldstable|stable-security|testing-security)
+        oldoldstable|oldstable-security|stable-security|testing-security)
             send=$(dak admin suite-config get-value "${dist}" codename)
             send=${send%-security}
             ;;

config/debian-security/dak.conf

@@ -20,9 +20,9 @@ Dinstall
    DefaultSuite "stable";
    SuiteSuffix "updates/";
    SuiteSuffixSuites {
-     "oldoldoldstable"; "oldoldstable"; "oldstable";
-     "buildd-oldoldoldstable"; "buildd-oldoldstable"; "buildd-oldstable";
-     "oldoldstable-debug"; "oldstable-debug";
+     "oldoldoldoldstable"; "oldoldoldstable"; "oldoldstable";
+     "buildd-oldoldoldoldstable"; "buildd-oldoldoldstable"; "buildd-oldoldstable";
+     "oldoldoldstable-debug"; "oldoldstable-debug";
    };
    UploadMailRecipients {
      "mail:dak@security.debian.org";
@@ -99,13 +99,13 @@ SuiteMappings
  "silent-map oldstable-security oldstable";
  "silent-map oldoldstable-security oldoldstable";
   "silent-map testing-security testing";
-  "silent-map jessie-security oldoldoldstable";
-  "silent-map stretch-security oldoldstable";
-  "silent-map buster-security oldstable";
-  "silent-map bullseye-security stable-security";
-  "silent-map bullseye stable-security";
-  "silent-map bookworm-security testing-security";
-  "silent-map bookworm testing-security";
+  "silent-map buster-security oldoldstable";
+  "silent-map bullseye-security oldstable-security";
+  "silent-map bullseye oldstable-security";
+  "silent-map bookworm-security stable-security";
+  "silent-map bookworm stable-security";
+  "silent-map trixie-security testing-security";
+  "silent-map trixie testing-security";
 };
 
 Dir
@@ -182,7 +182,8 @@ External-Signature-Requests {
   Default-Suites {
     "testing-security";
     "stable-security";
-    "oldstable";
+    "oldstable-security";
+    "oldoldstable";
   };
   Export "/srv/security-master.debian.org/build-queues/project/external-signatures/requests.json";
   ExportSigningKeys { "AA6C6D7FECC2E7EED05CDB4EAAC8C6B0AF06C355"; };

config/debian/dak.conf

@@ -116,33 +116,31 @@ Process-New
 
 SuiteMappings
 {
- "silent-map jessie-security oldoldoldstable-security";
- "silent-map stretch-security oldoldstable-security";
- "silent-map buster-security oldstable-security";
- "silent-map bullseye-security stable-security";
- "silent-map bookworm-security testing-security";
+ "silent-map buster-security oldoldstable-security";
+ "silent-map bullseye-security oldstable-security";
+ "silent-map bookworm-security stable-security";
+ "silent-map trixie-security testing-security";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
  "propup-version testing unstable";
- "map jessie oldoldoldstable";
- "map jessie-proposed-updates oldoldoldstable-proposed-updates";
- "map jessie-updates oldoldoldstable-proposed-updates";
- "map stretch oldoldstable";
- "map stretch-proposed-updates oldoldstable-proposed-updates";
- "map stretch-updates oldoldstable-proposed-updates";
- "map buster oldstable";
- "map buster-proposed-updates oldstable-proposed-updates";
- "map buster-updates oldstable-proposed-updates";
- "map buster-backports-sloppy oldstable-backports-sloppy";
- "map bullseye stable";
- "map bullseye-proposed-updates proposed-updates";
- "map bullseye-updates proposed-updates";
- "map bullseye-backports-sloppy stable-backports-sloppy";
+ "map buster oldoldstable";
+ "map buster-proposed-updates oldoldstable-proposed-updates";
+ "map buster-updates oldoldstable-proposed-updates";
+ "map buster-backports-sloppy oldoldstable-backports-sloppy";
+ "map bullseye oldstable";
+ "map bullseye-proposed-updates oldstable-proposed-updates";
+ "map bullseye-updates oldstable-proposed-updates";
+ "map bullseye-backports-sloppy oldstable-backports-sloppy";
  "map bookworm testing";
- "map bookworm-proposed-updates testing-proposed-updates";
- "map bookworm-updates testing-proposed-updates";
- "map bookworm-backports testing-backports";
- "map bookworm-backports-sloppy testing-backports-sloppy";
+ "map bookworm-proposed-updates proposed-updates";
+ "map bookworm-updates proposed-updates";
+ "map bookworm-backports stable-backports";
+ "map bookworm-backports-sloppy stable-backports-sloppy";
+ "map trixie testing";
+ "map trixie-proposed-updates testing-proposed-updates";
+ "map trixie-updates testing-proposed-updates";
+ "map trixie-backports testing-backports";
+ "map trixie-backports-sloppy testing-backports-sloppy";
  "map sid unstable";
  "map rc-buggy experimental";
  "map oldoldstable oldoldstable-proposed-updates";
@@ -310,13 +308,15 @@ External-Signature-Requests {
     "testing-proposed-updates";
     "proposed-updates";
     "oldstable-proposed-updates";
-    "bookworm-backports";
+    "testing-backports";
+    "stable-backports";
+    "stable-backports-sloppy";
+    "oldstable-backports";
+    "oldstable-backports-sloppy";
     "bullseye-backports-sloppy";
     "bullseye-backports";
     "buster-backports-sloppy";
     "buster-backports";
-    "stretch-backports-sloppy";
-    "stretch-backports";
   };
   Export "/srv/ftp-master.debian.org/public/incoming.debian.org/web/debian-buildd/project/external-signatures/requests.json";
   ExportSigningKeys { "8B46F1B8C09D0EC19E9C458C6DF948E711DF2F06"; };

config/debian/dinstall.functions

@@ -130,7 +130,7 @@ function cruft() {
 function dominate() {
     log "Removing obsolete source and binary associations"
     dak dominate
-    dak manage-debug-suites unstable-debug experimental-debug stretch-backports-debug buster-backports-debug buster-backports-sloppy-debug bullseye-backports-debug bullseye-backports-sloppy-debug bookworm-backports-debug testing-proposed-updates-debug
+    dak manage-debug-suites unstable-debug experimental-debug stretch-backports-debug buster-backports-debug buster-backports-sloppy-debug bullseye-backports-debug bullseye-backports-sloppy-debug bookworm-backports-debug stable-backports-sloppy testing-backports testing-proposed-updates-debug
 }
 
 function autocruft() {

config/debian/pointrelease

@@ -403,16 +403,18 @@ ${scriptsdir}/sync-release ${suite}-debug
 log "Release file generated, waiting for RMs checking and (hopefully) signing"
 
 # Remove InRelease: Release can be signed by both ftpmaster & stable release keys
-merge-release-signatures() {
-    local archiveroot="${1}"
-    local s="${2}"
-    local oursignature="${3}"
+merge-release-signatures() {(
+    set -e
+    local archiveroot="${1:?}"
+    local s="${2:?}"
+    local oursignature="${3:?}"
     local ourmessage="${4}"
-    local releasefile="${5}"
+    local releasefile="${5:?}"
+    local url="${6:-${release_base}/${releasefile}}"
 
     echo "==== Processing ${s}/${oursignature}..."
 
-    mkdir -p ~/${suitename}_${newrev}/${s}
+    mkdir -p ~/${suitename:?}_${newrev:?}/${s}
 
     # backup ${oursignature} before we modify it...
     # make a .orig copy which we don't overwrite below
@@ -420,7 +422,7 @@ merge-release-signatures() {
     cp --no-clobber ${archiveroot}/zzz-dists/${s}/${oursignature} ~/${suitename}_${newrev}/${s}/${oursignature}.orig
 
     cd ~/${suitename}_${newrev}/${s}
-    while ! ${wget} -O "${releasefile}" "${release_base}/${releasefile}"; do
+    while ! ${wget:?} -O "${releasefile}" "${url}"; do
         sleep 10
     done
 
@@ -435,7 +437,7 @@ merge-release-signatures() {
     gpg --no-default-keyring --keyring /usr/share/keyrings/debian-archive-keyring.gpg --trust-model=always --verify ${oursignature} ${ourmessage}
 
     cp ${oursignature} ${archiveroot}/dists/${s}/${oursignature}
-}
+)}
 
 merge-release-signatures $(get_archiveroot ftp-master) ${suite} Release.gpg Release Release-${newrev}.gpg
 merge-release-signatures $(get_archiveroot debian-debug) ${suite}-debug Release.gpg Release Release-${newrev}-debug.gpg

docs/release.txt

-Notes from the Debian Stretch release
-=====================================
+Notes from the Debian bookworm release
+======================================
+
+Some notes from the Debian bookworm release including some
+corrections. There might still be errors.
 
 configdir=${configdir:-"/srv/ftp-master.debian.org/dak/config/debian"}
 export SCRIPTVARS=${configdir}/vars
 . "${SCRIPTVARS}"
+. "${configdir}/common"
 . "${configdir}/dinstall.functions"
 umask 022
 
@@ -29,7 +33,7 @@ rename-suite() {(
     exit 1
   fi
 
-  mv -- ${oldsuite} ${newsuite}
+  mv -nT -- ${oldsuite} ${newsuite}
 
   sql -1 <<-EOT
 	UPDATE suite
@@ -55,34 +59,33 @@ rename-policy-queue() {(
     echo "E: ${newpath} already exists" >&2
     exit 1
   fi
-  mv -- ${oldpath:?} ${newpath}
+  mv -nT -- ${oldpath:?} ${newpath}
   sql -c "UPDATE policy_queue SET queue_name='${newqueue}', path='${newpath}' WHERE queue_name='${oldqueue}'"
 )}
 
-Notes from the Debian Bullseye release
-======================================
-
-Some notes from the Debian Bullseye release including some
-corrections. There might still be errors.
+export new_stable_version=12
+export new_stable_date='10 June 2023'
+export new_stable_short_date='Sat, 10 Jun 2023'
 
-export new_stable_version=11
-export new_stable_date='14 August 2021'
-export new_stable_short_date='Sat, 14 Aug 2021'
+export new_oldoldoldstable=""
+export new_oldoldstable=buster
+export new_oldstable=bullseye
+export new_stable=bookworm
+export new_testing=trixie
 
-export new_oldoldoldstable=jessie
-export new_oldoldstable=stretch
-export new_oldstable=buster
-export new_stable=bullseye
-export new_testing=bookworm
+export new_stable_components="main contrib non-free-firmware non-free"
+export new_testing_components="main contrib non-free-firmware non-free"
 
-export new_oldoldstable_key=E1CF20DDFFE4B89E802658F1E0B11894F66AEC98
-export new_oldoldstable_security_key=6ED6F5CB5FA6FB2F460AE88EEDA0D2388AE22BA9
-export new_oldstable_key=80D15823B7FD1561F9F7BCDDDC30D7C23CBBABEE
-export new_oldstable_security_key=5E61B217265DA9807A23C5FF4DFAB270CAA96DFA
-export new_stable_key=1F89983E0081FDE018F3CC9673A4F27B8DD47936
-export new_stable_security_key=AC530D520F2F3269F5E98313A48449044AAD5C5D
+export new_oldoldoldstable_key=E1CF20DDFFE4B89E802658F1E0B11894F66AEC98
+export new_oldoldoldstable_security_key=6ED6F5CB5FA6FB2F460AE88EEDA0D2388AE22BA9
+export new_oldoldstable_key=80D15823B7FD1561F9F7BCDDDC30D7C23CBBABEE
+export new_oldoldstable_security_key=5E61B217265DA9807A23C5FF4DFAB270CAA96DFA
+export new_oldstable_key=1F89983E0081FDE018F3CC9673A4F27B8DD47936
+export new_oldstable_security_key=AC530D520F2F3269F5E98313A48449044AAD5C5D
+export new_stable_key=B8B80B5B623EAB6AD8775C45B7C5D7D6350947F8
+export new_stable_security_key=05AB90340C0C5E797F44A8C8254CF3B5AEC0A8F0
 
-export di_version=20210731
+export di_version=20230607
 
 sql_vars=(new_stable_version new_stable_date new_oldoldoldstable new_oldoldstable new_oldstable new_stable new_testing new_oldoldstable_key new_oldoldstable_security_key new_oldstable_key new_oldstable_security_key new_stable_key new_stable_security_key)
 sql_opts=()
@@ -93,10 +96,7 @@ done
 if [[ -n "${new_oldoldoldstable}" ]]; then
   rename-suite {,old}oldoldstable
   rename-suite {,old}oldoldstable-updates
-  # only for stretch and later:
-  if [[ "${new_oldoldoldstable}" != "jessie" ]]; then
-    rename-suite {,old}oldoldstable-debug
-  fi
+  rename-suite {,old}oldoldstable-debug
 fi
 
 # Careful! Some suites might have stable-X symlinks, but not use the
@@ -107,6 +107,7 @@ fi
 
 rename-suite {,old}oldstable
 rename-suite {,old}oldstable-debug
+# buster-updates has suite_name=buster-updates, but release_suite needs to be updated to oldoldstable-updates
 #rename-suite {,old}oldstable-updates
 rename-suite {,old}oldstable-proposed-updates
 rename-suite {,old}oldstable-proposed-updates-debug
@@ -114,26 +115,33 @@ rename-suite buildd-{,old}oldstable-proposed-updates
 rename-suite {,old}oldstable-new
 rename-policy-queue oldstable-new oldoldstable-new /srv/ftp-master.debian.org/queue/o-o-p-u-new
 rename-suite buildd-{,old}oldstable-backports-sloppy
+rename-suite {,old}oldstable-backports-sloppy
+rename-suite {,old}oldstable-backports-sloppy-debug
+# trixie release: might also need to rename more backports suites here!
 
 rename-suite {,old}stable
 rename-suite {,old}stable-debug
+rename-suite {,old}stable-updates
 rename-suite {,oldstable-}proposed-updates
 rename-suite {,oldstable-}proposed-updates-debug
 rename-suite {,old}stable-new
 rename-suite buildd-{,oldstable-}proposed-updates
-rename-policy-queue oldstable-new oldoldstable-new /srv/ftp-master.debian.org/queue/o-o-p-u-new
 rename-policy-queue stable-new oldstable-new /srv/ftp-master.debian.org/queue/o-p-u-new
 rename-suite {,old}stable-backports-sloppy
 rename-suite {,old}stable-backports-sloppy-debug
 rename-suite buildd-{,old}stable-backports-sloppy
+# trixie release: might also need to rename more backports suites here!
 
 rename-suite testing stable
 rename-suite testing-debug stable-debug
 rename-suite testing-proposed-updates proposed-updates
 rename-suite testing-proposed-updates-debug proposed-updates-debug
 rename-suite {testing,stable}-updates
-rename-suite buildd-{testing,stable}-backports-sloppy
+rename-suite {testing,stable}-backports
+rename-suite {testing,stable}-backports-debug
+rename-suite buildd-{testing,stable}-backports
 rename-suite buildd-{testing-,}proposed-updates
+# trixie release: might also need to rename more backports suites here!
 
 UPDATE SUITES:
 
@@ -201,9 +209,13 @@ ln -sTf ${new_testing}-updates testing-updates
 
 ln -sT ${new_stable} Debian${new_stable_version}.0
 
+cd ${base}/archive/debian-debug/dists
+# fix symlinks there too...
+
 # update README files
 cd ${ftpdir}
-sensible-editor README, README.html, dists/README
+sensible-editor README README.html dists/README
+rm -- README~ README.html~ dists/README~
 
 # remove pdiffs for new stable
 cd ${base}/archive/debian-debug
@@ -223,11 +235,12 @@ EOT
 #  - even copy in testing/ might be outdated.
 
 cd /srv/ftp-master.debian.org/public/incoming.debian.org/web/debian-buildd/dists
-rm buildd-${new_stable}-proposed-updates buildd-${new_oldstable}-proposed-updates
-mv buildd-proposed-updates buildd-${new_oldstable}-proposed-updates
-mv buildd-testing-proposed-updates buildd-${new_stable}-proposed-updates
-ln -sT buildd-${new_oldstable}-proposed-updates buildd-oldstable-proposed-updates
-ln -sT buildd-${new_stable}-proposed-updates buildd-proposed-updates
+# This already looked fine during bookworm release.
+#rm buildd-${new_stable}-proposed-updates buildd-${new_oldstable}-proposed-updates
+#mv -nT buildd-proposed-updates buildd-${new_oldstable}-proposed-updates
+#mv -nT buildd-testing-proposed-updates buildd-${new_stable}-proposed-updates
+#ln -sT buildd-${new_oldstable}-proposed-updates buildd-oldstable-proposed-updates
+#ln -sT buildd-${new_stable}-proposed-updates buildd-proposed-updates
 
 D-I CLEANUP:
 cd /srv/ftp-master.debian.org/ftp/dists/${new_stable}/main
@@ -246,21 +259,38 @@ suite=stable
 dak generate-packages-sources2 --force -s ${suite},${suite}-debug
 dak contents generate -f -s ${suite} -a ftp-master
 
-for suite in stable stable-debug oldstable oldstable-debug oldoldstable oldoldstable-debug ${new_oldoldstable}-updates; do
+for suite in stable stable-debug oldstable oldstable-debug ${new_oldstable}-updates oldoldstable oldoldstable-debug ${new_oldoldstable}-updates; do
   dak generate-releases -f -s ${suite}
 done
 
-# rm InRelease for stretch
-rm -- $(realpath "${ftpdir}/dists/stretch/InRelease") $(realpath "${base}/archive/debian-debug/dists/stretch-debug/InRelease")
-rm -- "${ftpdir}/dists/stretch/InRelease" "${base}/archive/debian-debug/dists/stretch-debug/InRelease"
-
 for suite in oldoldstable oldoldstable-debug ${new_oldoldstable}-updates oldstable oldstable-debug stable stable-debug; do
   ${scriptsdir}/sync-release ${suite}
 done
 
+mkdir -p ~/${new_stable}_${new_stable_version}.0
+cp -r ${ftpdir}/zzz-dists ~/${new_stable}_${new_stable_version}.0/zzz-dists-pre-signature-merge
+cp -r ${base}/archive/debian-debug/zzz-dists ~/${new_stable}_${new_stable_version}.0/debug-zzz-dists-pre-signature-merge
+
 # Add signatures from release team
-# mirror push (CD MIRROR ONLY!)
+# Import function `merge-release-signatures` from config/debian/pointrelease
+
+suitename=${new_stable:?}
+newrev=${new_stable_version:?}.0
+release_base=https://release.debian.org/proposed-updates/${newrev%%.*}/${newrev}
+wget="wget --ca-directory=/etc/ssl/ca-debian"
+
+set -x
+# stable
+for suite in oldstable oldoldstable; do
+  merge-release-signatures $(get_archiveroot ftp-master) ${suite} Release.gpg Release Release-${suite}.gpg https://release.debian.org/proposed-updates/${new_stable_version}/${new_stable_version}.0/sigs/Release-${suite}.gpg
+  merge-release-signatures $(get_archiveroot ftp-master) ${suite} InRelease "" InRelease-${suite}.gpg https://release.debian.org/proposed-updates/${new_stable_version}/${new_stable_version}.0/sigs/InRelease-${suite}.gpg
+done
+for suite in stable-debug oldstable-debug oldoldstable-debug; do
+  merge-release-signatures $(get_archiveroot debian-debug) ${suite} Release.gpg Release Release-${suite}.gpg https://release.debian.org/proposed-updates/${new_stable_version}/${new_stable_version}.0/sigs/Release-${suite}.gpg
+  merge-release-signatures $(get_archiveroot debian-debug) ${suite} InRelease "" InRelease-${suite}.gpg https://release.debian.org/proposed-updates/${new_stable_version}/${new_stable_version}.0/sigs/InRelease-${suite}.gpg
+done
 
+# mirror push (CD MIRROR ONLY!)
 (
   export SCRIPTVARS=${configdir}/vars
   . "${SCRIPTVARS}"
@@ -276,7 +306,7 @@ update suite set signingkeys = ARRAY[:'new_oldstable_key', :'new_stable_key'] wh
 
 ${NEW_STABLE}-R0:
 dak admin suite add ${new_stable}-r0 '' description='Extraneous packages/sources required for GPL compliance' origin=Debian label=Debian codename=${new_stable}-r0 accept_source_uploads=false accept_binary_uploads=false archive=ftp-master
-dak admin s-c add ${new_stable}-r0 main contrib non-free
+dak admin s-c add ${new_stable}-r0 ${new_stable_components}
 dak admin s-a add ${new_stable}-r0 $(dak admin s-a list-arch stable)
 
 dak control-suite -l stable | grep '^debian-installer ' | dak control-suite -a ${new_stable}-r0
@@ -294,31 +324,31 @@ insert into policy_queue (queue_name, path, change_perms, suite_id) values ('sta
 update suite set policy_queue_id = (select id from policy_queue where queue_name = 'stable-new') where codename = concat(:'new_stable', '-proposed-updates');
 commit;
 
-dak admin s-c add stable-new main contrib non-free
+dak admin s-c add stable-new ${new_stable_components}
 dak admin s-a add stable-new source all $(dak admin s-a list-arch stable)
 
 NEW TESTING:
 dak admin suite add testing '' origin=Debian label=Debian codename=${new_testing} description='Debian x.y Testing distribution - Not Released' accept_source_uploads=false accept_binary_uploads=false allowcsset=True archive=ftp-master changelog_url='https://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog'
-dak admin s-c add testing main contrib non-free
+dak admin s-c add testing ${new_testing_components}
 dak admin s-a add testing source all $(dak admin s-a list-arch stable)
 
 dak admin suite add testing-debug '' origin=Debian label='Debian debug' codename=${new_testing}-debug description='Debian x.y Testing distribution - Not Released - Debug Information' accept_source_uploads=false accept_binary_uploads=false allowcsset=True archive=debian-debug
-dak admin s-c add testing-debug main contrib non-free
+dak admin s-c add testing-debug ${new_testing_components}
 dak admin s-a add testing-debug source all $(dak admin s-a list-arch stable)
 
 dak admin suite add testing-proposed-updates '' origin=Debian label=Debian codename=${new_testing}-proposed-updates description='Debian x.y Testing distribution - Proposed Updates - Not Released' allowcsset=True archive=ftp-master
-dak admin s-c add testing-proposed-updates main contrib non-free
+dak admin s-c add testing-proposed-updates ${new_testing_components}
 dak admin s-a add testing-proposed-updates source all $(dak admin s-a list-arch stable)
 
 dak admin suite add testing-proposed-updates-debug '' origin=Debian label='Debian debug' codename=${new_testing}-proposed-updates-debug description='Debian x.y Testing - Proposed Updates - Not Released - Debug Information' accept_source_uploads=false accept_binary_uploads=false archive=debian-debug
-dak admin s-c add testing-proposed-updates-debug main contrib non-free
+dak admin s-c add testing-proposed-updates-debug ${new_testing_components}
 dak admin s-a add testing-proposed-updates-debug source all $(dak admin s-a list-arch stable)
 
 dak admin suite add testing-updates '' origin=Debian label=Debian codename=${new_testing}-updates description='Debian x.y Testing distribution Updates - Not Released' accept_source_uploads=false accept_binary_uploads=false allowcsset=True archive=ftp-master
-dak admin s-c add testing-updates main contrib non-free
+dak admin s-c add testing-updates ${new_testing_components}
 dak admin s-a add testing-updates source all $(dak admin s-a list-arch stable)
 
-for c in main contrib non-free; do
+for c in ${new_testing_components}; do
   for t in deb dsc udeb; do
     dak control-overrides -s stable -t ${t} -c ${c} -l | dak control-overrides -s testing -t ${t} -c ${c} --set
   done
@@ -360,8 +390,8 @@ ln -sT buildd-${new_testing}-proposed-updates buildd-testing-proposed-updates
 
 MOVE MOVING AROUND:
 cd /srv/ftp-master.debian.org/queue
-mv oldstable-proposed-updates oldoldstable-proposed-updates
-mv proposed-updates oldstable-proposed-updates
+mv -nT oldstable-proposed-updates oldoldstable-proposed-updates
+mv -nT proposed-updates oldstable-proposed-updates
 mkdir -p p-u-new/COMMENTS proposed-updates
 
 V-C:
@@ -381,6 +411,8 @@ dak admin v-c add unstable MustBeNewerThan testing
 dak admin v-c add experimental MustBeNewerThan testing
 
 # copy d-i to new testing (so same d-i in stable, testing, unstable)
+cd ${ftpdir}/dists
+mkdir -p ${new_testing}/main
 dak copy-installer ${di_version:?}
 
 # backports
@@ -390,19 +422,20 @@ dak admin suite add stable-backports-sloppy-debug '' origin="Debian Backports" l
 dak admin suite add testing-backports '' origin="Debian Backports" label='Debian Backports' codename=${new_testing}-backports description='Debian X.Y - Backports' archive=ftp-master
 dak admin suite add testing-backports-debug '' origin="Debian Backports" label='Debian Backports debug' codename=${new_testing}-backports-debug description='Debian X.Y - Backports - Debug Information' archive=debian-debug
 
-configure-backports-suite() {
+configure-backports-suite() {(
   local suite=${1:?}
   local reference=${2:?}
-  dak admin s-c add ${suite} main contrib non-free
+  local components=${3:?}
+  dak admin s-c add ${suite} ${components}
   dak admin s-a add ${suite} source all $(dak admin s-a list-arch ${reference})
   dak admin suite-config set ${suite} notautomatic=true butautomaticupgrades=true accept_source_uploads=false accept_binary_uploads=false close_bugs=false
-}
+)}
 
 for suite in stable-backports-sloppy stable-backports-sloppy-debug; do
-  configure-backports-suite ${suite} ${new_stable}
+  configure-backports-suite ${suite} ${new_stable} "${new_stable_components}"
 done
 for suite in testing-backports testing-backports-debug; do
-  configure-backports-suite ${suite} ${new_testing}
+  configure-backports-suite ${suite} ${new_testing} "${new_testing_components}"
 done
 
 cd ${ftpdir}/dists
@@ -471,16 +504,16 @@ dak generate-releases -a build-queues
 ########################################################################
 # On security-master:
 
-rename-suite {,old}oldoldstable
+#rename-suite {,old}oldoldstable
 rename-suite {,old}oldstable
-rename-suite {,old}stable
+rename-suite {,old}stable-security
 rename-suite {testing,stable}-security
 rename-suite {,old}oldstable-debug
-rename-suite {,old}stable-debug
+rename-suite {,old}stable-security-debug
 rename-suite {testing,stable}-security-debug stable-debug
 rename-suite buildd-{,old}oldoldstable
 rename-suite buildd-{,old}oldstable
-rename-suite buildd-{,old}stable
+rename-suite buildd-{,old}stable-security
 rename-suite buildd-{testing,stable}-security
 
 begin;
@@ -497,7 +530,7 @@ dak admin suite add testing-security '' origin=Debian label=Debian-Security code
 dak admin suite add testing-security-debug '' origin=Debian label="Debian-Security debug" codename=${new_testing:?}-security-debug description='Debian x.y Testing - Security Updates - Debug Information - Not Released' accept_source_uploads=false accept_binary_uploads=false archive=debian-security-debug
 
 for suite in testing-security testing-security-debug; do
-  dak admin s-c add ${suite} updates/{main,contrib,non-free}
+  dak admin s-c add ${suite} updates/{main,contrib,non-free,non-free-firmware}
   dak admin s-a add ${suite} source all $(dak admin s-a list-arch stable-security)
 done
 

scripts/debian/import_dataset.sh

@@ -54,7 +54,7 @@ case "${IMPORTSUITE}" in
     testing)
         DO_CHANGELOG="true"
         ;;
-    testing-debug|testing-proposed-updates|stretch-updates|buster-updates|bullseye-updates)
+    testing-debug|testing-proposed-updates|buster-updates|bullseye-updates|bookworm-updates|trixie-updates|stable-updates|testing-updates)
         DO_CHANGELOG="false"
         ;;
     *)

scripts/debian/rrd-release-freeze-dates

@@ -5,3 +5,5 @@ VRULE:1552345200#00ff00:buster freeze
 VRULE:1562397149#00ff00:buster release
 VRULE:1615503600#ff0000:bullseye hard freeze
 VRULE:1628927858#ff0000:bullseye release
+VRULE:1678622400#0000ff:bookworm hard freeze
+VRULE:1686391200#0000ff:bookworm release