From d15cf12b26395b857b24fba223b108aff1c91b26 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 19 Jul 2024 16:52:55 +0900 Subject: [PATCH] snapshot-cloudflare.debian.org -> snapshot.debian.org snapshot-cloudflare.debian.org has been out of sync with snapshot.debian.org since 20240531T083821Z Fix issue 17 Signed-off-by: Akihiro Suda --- README.md | 28 ++++++++++++++-------------- repro-sources-list.sh | 3 +-- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 23a043e..d52180f 100644 --- a/README.md +++ b/README.md @@ -32,23 +32,23 @@ Examples: ### Environment variables -| Variable | Description | Default value | -|---------------------------|-----------------------------------------------|--------------------------------------------------------------------| -| `SOURCE_DATE_EPOCH` | Timestamp of the snapshot (int64) | Timestamp of `/etc/apt/sources.list`, etc. (See below) | -| `WRITE_SOURCE_DATE_EPOCH` | Write the `SOURCE_DATE_EPOCH` value to a file | `/dev/null` | -| `SNAPSHOT_ARCHIVE_BASE` | Base URL of the snapshot | `http://snapshot-cloudflare.debian.org/archive/`, etc. (See below) | -| `BACKPORTS` | Enable Debian backports | `0` | -| `KEEP_CACHE` | Keep apt cache | `1` | +| Variable | Description | Default value | +|---------------------------|-----------------------------------------------|---------------------------------------------------------| +| `SOURCE_DATE_EPOCH` | Timestamp of the snapshot (int64) | Timestamp of `/etc/apt/sources.list`, etc. (See below) | +| `WRITE_SOURCE_DATE_EPOCH` | Write the `SOURCE_DATE_EPOCH` value to a file | `/dev/null` | +| `SNAPSHOT_ARCHIVE_BASE` | Base URL of the snapshot | `http://snapshot.debian.org/archive/`, etc. (See below) | +| `BACKPORTS` | Enable Debian backports | `0` | +| `KEEP_CACHE` | Keep apt cache | `1` | Distribution-specific default values: -| Distribution | `SOURCE_DATE_EPOCH` | `SNAPSHOT_ARCHIVE_BASE` | -|-------------------|-------------------------------------------------------|--------------------------------------------------| -| Debian (<= 11) | Timestamp of `/etc/apt/sources.list` | `http://snapshot-cloudflare.debian.org/archive/` | -| Debian (>= 12) | Timestamp of `/etc/apt/sources.list.d/debian.sources` | `http://snapshot-cloudflare.debian.org/archive/` | -| Ubuntu (<= 23.10) | Timestamp of `/etc/apt/sources.list` | `http://snapshot.ubuntu.com/` | -| Ubuntu (>= 24.04) | Timestamp of `/etc/apt/sources.list.d/ubuntu.sources` | `http://snapshot.ubuntu.com/` | -| ArchLinux | Timestamp of `/var/log/pacman.log` | `http://archive.archlinux.org/` | +| Distribution | `SOURCE_DATE_EPOCH` | `SNAPSHOT_ARCHIVE_BASE` | +|-------------------|-------------------------------------------------------|---------------------------------------| +| Debian (<= 11) | Timestamp of `/etc/apt/sources.list` | `http://snapshot.debian.org/archive/` | +| Debian (>= 12) | Timestamp of `/etc/apt/sources.list.d/debian.sources` | `http://snapshot.debian.org/archive/` | +| Ubuntu (<= 23.10) | Timestamp of `/etc/apt/sources.list` | `http://snapshot.ubuntu.com/` | +| Ubuntu (>= 24.04) | Timestamp of `/etc/apt/sources.list.d/ubuntu.sources` | `http://snapshot.ubuntu.com/` | +| ArchLinux | Timestamp of `/var/log/pacman.log` | `http://archive.archlinux.org/` | ## Related project diff --git a/repro-sources-list.sh b/repro-sources-list.sh index 3256c36..ea97e47 100755 --- a/repro-sources-list.sh +++ b/repro-sources-list.sh @@ -43,8 +43,7 @@ keep_apt_cache() { case "${ID}" in "debian") - # : "${SNAPSHOT_ARCHIVE_BASE:=http://snapshot.debian.org/archive/}" - : "${SNAPSHOT_ARCHIVE_BASE:=http://snapshot-cloudflare.debian.org/archive/}" + : "${SNAPSHOT_ARCHIVE_BASE:=http://snapshot.debian.org/archive/}" : "${BACKPORTS:=}" if [ -e /etc/apt/sources.list.d/debian.sources ]; then : "${SOURCE_DATE_EPOCH:=$(stat --format=%Y /etc/apt/sources.list.d/debian.sources)}"