Use deb822.sources

* replaced all sources.list's with deb822.sources - sources.list(5) deb822(5)
* grml-archive-keyring.gpg: move to usr/share/keyrings - apt-secure(8)
* patched wayback(snapshot) hook and 33apt-setup to work with .sources
* grml-live: added the wayback date to the configuration output as confirmation

config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_BOOKWORM

@@ -0,0 +1,28 @@
+Types: deb deb-src
+URIs: http://deb.debian.org/debian/
+Suites:
+ bookworm
+# bookworm-updates
+# bookworm-proposed-updates
+# bookworm-backports
+Components:
+ main
+ contrib
+ non-free-firmware
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+
+Types: deb deb-src
+URIs: http://deb.debian.org/debian-security
+Suites: bookworm-security
+Components:
+ main
+ contrib
+ non-free-firmware
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+

config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_BULLSEYE

@@ -0,0 +1,26 @@
+Types: deb deb-src
+URIs: http://deb.debian.org/debian/
+Suites:
+ bullseye
+# bullseye-updates
+# bullseye-proposed-updates
+# bullseye-backports
+Components:
+ main
+ contrib
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+
+Types: deb deb-src
+URIs: http://deb.debian.org/debian-security
+Suites: bullseye-security
+Components:
+ main
+ contrib
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+

config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_STABLE

@@ -0,0 +1,28 @@
+Types: deb deb-src
+URIs: http://deb.debian.org/debian/
+Suites:
+ stable
+# stable-updates
+# stable-proposed-updates
+ stable-backports
+Components:
+ main
+ contrib
+ non-free-firmware
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+
+Types: deb deb-src
+URIs: http://deb.debian.org/debian-security
+Suites: stable-security
+Components:
+ main
+ contrib
+ non-free-firmware
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+

config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_TESTING

@@ -0,0 +1,28 @@
+Types: deb deb-src
+URIs: http://deb.debian.org/debian/
+Suites:
+ testing
+# testing-updates
+# testing-proposed-updates
+# testing-backports
+Components:
+ main
+ contrib
+ non-free-firmware
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+
+Types: deb deb-src
+URIs: http://deb.debian.org/debian-security
+Suites: testing-security
+Components:
+ main
+ contrib
+ non-free-firmware
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+

config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_TRIXIE

@@ -0,0 +1,28 @@
+Types: deb deb-src
+URIs: http://deb.debian.org/debian/
+Suites:
+ trixie
+# trixie-updates
+# trixie-proposed-updates
+# trixie-backports
+Components:
+ main
+ contrib
+ non-free-firmware
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+
+Types: deb deb-src
+URIs: http://deb.debian.org/debian-security
+Suites: trixie-security
+Components:
+ main
+ contrib
+ non-free-firmware
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+

config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_UNSTABLE

@@ -0,0 +1,13 @@
+Types: deb deb-src
+URIs: http://deb.debian.org/debian/
+Suites:
+ unstable
+Components:
+ main
+ contrib
+ non-free-firmware
+ non-free
+Enabled: yes
+Signed-By:
+ /usr/share/keyrings/debian-archive-keyring.gpg
+

config/files/etc/apt/sources.list.d/grml.sources/GRMLBASE

@@ -0,0 +1,9 @@
+Types: deb deb-src
+URIs: http://deb.grml.org/
+Suites:
+ grml-stable
+ grml-testing
+ grml-live
+Components: main
+Enabled: yes
+Signed-By: /usr/share/keyrings/grml-archive-keyring.gpg

config/hooks/updatebase.GRMLBASE

@@ -72,11 +72,11 @@ fcopy -M -i -B -v -r /etc/apt
 if [ -n "${WAYBACK_DATE:-}" ] ; then
   echo "Wayback date '$WAYBACK_DATE' identified, enabling for snapshot.debian.org usage."
 
-  perl -pi -e "s#^(\s+)(deb.* )(.*://deb.debian.org.*?)\s+([a-z-]+)\s+(.*)\$#\$1\$2 [check-valid-until=no] http://snapshot.debian.org/archive/debian/$WAYBACK_DATE/ \$4 \$5#" \
-    "${target}/etc/apt/sources.list.d/debian.list"
+  perl -pi -e 'BEGIN { $d="'"$WAYBACK_DATE"'"; }
+    s#^(URIs:)\s+(.*://deb.debian.org.*?)$#$1 http://snapshot.debian.org/archive/debian/$d/#' \
+    "${target}/etc/apt/sources.list.d/debian.sources"
 
-  perl -pi -e "s#^(\s+)(deb.* )(.*://security.debian.org.*?)\s+([a-z-/]+)\s+(.*)\$#\$1\$2 [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/$WAYBACK_DATE/ \$4 \$5#" \
-    "${target}/etc/apt/sources.list.d/debian.list"
+  sed -i '/^Suites/a Check-Valid-Until: no' "${target}/etc/apt/sources.list.d/debian.sources"
 fi
 
 ## END OF FILE #################################################################

config/scripts/GRMLBASE/33-aptsetup

@@ -15,8 +15,9 @@ target=${target:?}
 if ifclass RELEASE ; then
   set -u
   current_date=$(date +%Y%m%d)
-  perl -pi -e 'BEGIN { $d="'"$current_date"'"; } s#^(\s+)(deb.* )(.*://deb.debian.org.*?)\s+([a-z-]+)\s+(.*)$#$1$2http://snapshot.debian.org/archive/debian/$d/ $4 $5#' \
-    "${target}/etc/apt/sources.list.d/debian.list"
+  perl -pi -e 'BEGIN { $d="'"$current_date"'"; } \
+    s#^(URIs:)\s+(.*://deb.debian.org.*?)$#$1 http://snapshot.debian.org/archive/debian/$d/#' \
+    "${target}/etc/apt/sources.list.d/debian.sources"
 fi
 
 ## END OF FILE #################################################################

grml-live

@@ -508,6 +508,7 @@ echo "  main directory:    $OUTPUT"
 [ -n "$GRML_NAME" ]           && echo "  Grml name:         $GRML_NAME"
 [ -n "$RELEASENAME" ]         && echo "  Release name:      $RELEASENAME"
 [ -n "$DATE" ]                && echo "  Build date:        $DATE"
+[ -n "$WAYBACK_DATE" ]        && echo "  Wayback date:      $WAYBACK_DATE"
 [ -n "$VERSION" ]             && echo "  Grml version:      $VERSION"
 [ -n "$SUITE" ]               && echo "  Debian suite:      $SUITE"
 [ -n "$ARCH" ]                && echo "  Architecture:      $ARCH"