wayback

deb.debian.org for /debian-security as it's fastly anyway
grml · Jan 8, 2025 · 4e8ea7f · 4e8ea7f
1 parent f5d0251
commit 4e8ea7f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_BOOKWORM b/config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_BOOKWORM
@@ -15,15 +15,15 @@ Signed-By:
  /usr/share/keyrings/debian-archive-keyring.gpg
 
 Types: deb
-URIs: http://security.debian.org/debian-security
+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
 
 Types: deb-src
-URIs: http://security.debian.org/debian-security
+URIs: http://deb.debian.org/debian-security
 Suites: bookworm-security
 Components: main contrib non-free-firmware non-free
 Enabled: yes

diff --git a/config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_BULLSEYE b/config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_BULLSEYE
@@ -15,15 +15,15 @@ Signed-By:
  /usr/share/keyrings/debian-archive-keyring.gpg
 
 Types: deb
-URIs: http://security.debian.org/debian-security
+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
 
 Types: deb-src
-URIs: http://security.debian.org/debian-security
+URIs: http://deb.debian.org/debian-security
 Suites: bullseye-security
 Components: main contrib non-free
 Enabled: yes

diff --git a/config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_STABLE b/config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_STABLE
@@ -15,15 +15,15 @@ Signed-By:
  /usr/share/keyrings/debian-archive-keyring.gpg
 
 Types: deb
-URIs: http://security.debian.org/debian-security
+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
 
 Types: deb-src
-URIs: http://security.debian.org/debian-security
+URIs: http://deb.debian.org/debian-security
 Suites: stable-security
 Components: main contrib non-free-firmware non-free
 Enabled: yes

diff --git a/config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_TESTING b/config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_TESTING
@@ -15,15 +15,15 @@ Signed-By:
  /usr/share/keyrings/debian-archive-keyring.gpg
 
 Types: deb
-URIs: http://security.debian.org/debian-security/
+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
 
 Types: deb-src
-URIs: http://security.debian.org/debian-security/
+URIs: http://deb.debian.org/debian-security/
 Suites: testing-security
 Components: main contrib non-free-firmware non-free
 Enabled: yes

diff --git a/config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_TRIXIE b/config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_TRIXIE
@@ -15,15 +15,15 @@ Signed-By:
  /usr/share/keyrings/debian-archive-keyring.gpg
 
 Types: deb
-URIs: http://security.debian.org/debian-security
+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
 
 Types: deb-src
-URIs: http://security.debian.org/debian-security
+URIs: http://deb.debian.org/debian-security
 Suites: trixie-security
 Components: main contrib non-free-firmware non-free
 Enabled: yes

diff --git a/config/hooks/updatebase.GRMLBASE b/config/hooks/updatebase.GRMLBASE
@@ -72,11 +72,10 @@ 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/#' \
 
-  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-Unit: no" "${target}/etc/apt/sources.list.d/debian.sources"
 fi
 
 ## END OF FILE #################################################################

diff --git a/grml-live b/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"