Merge pull request #326 from JedMeister/trixie-apt

Trixie apt

Author: JedMeister

conf/bootstrap_apt

@@ -3,7 +3,7 @@
 # create apt sources
 # environment variables:
 #   - RELEASE <optional>:
-#       - OS distro and codename to use (e.g. 'debian/bookworm')
+#       - OS distro and codename to use (e.g. 'debian/trixie')
 #       - will fallback to host system if not set
 #   - NONFREE <optional>:
 #       - set to enable non-free by default
@@ -24,6 +24,9 @@
 #       - if not the same as guest, apply relevant transition changes
 #   - NO_TURNKEY_APT_REPO <optional>:
 #       - disable TurnKey apt repos - useful during early transition
+#   - NO_PROXY <optional>:
+#       - same as APT_PROXY_OVERRIDE=disable (will override APT_PROXY_OVERRIDE
+#         if both set to different values)
 
 # Note, to install packages from backports:
 # - set 'BACKPORTS=y'; and either:
@@ -60,7 +63,7 @@ case $CODENAME in
         CONTRIB="contrib"
         NON_FREE="non-free"
         ;;&
-    bookworm|trixie)
+    bookworm|trixie|forky)
         SEC_MIRROR="${SEC_MIRROR}debian-security"
         ;;
     # Note - only Ubuntu LTS
@@ -93,11 +96,12 @@ mkdir -p $SOURCES_LIST $PREFS_LIST $CONF_DIR
 deb_ver=$(sed -nE "s|^([0-9]+).*|\1|p" /etc/debian_version)
 [[ -n "$HOST_DEB_VER" ]] || HOST_DEB_VER=$deb_ver
 if [[ "$HOST_DEB_VER" != "$deb_ver" ]]; then
-    echo "# Transition build detected - building v$deb_ver on v$HOST_DEB_VER"
+    echo "# Transition build detected - building Debian v$deb_ver on Debian" \
+         " v$HOST_DEB_VER"
     if [[ $HOST_DEB_VER -ne $((deb_ver - 1)) ]]; then
         fatal "Detected more than one Debian major version difference"
     elif [[ $deb_ver -lt 9 ]]; then
-        fatal "Debian releases older than Stretch no longer supported"
+        fatal "Debian releases older than Buster no longer supported"
     fi
 fi
 
@@ -109,7 +113,7 @@ elif [[ $deb_ver -ge 11 ]] || [[ "$distro" == 'ubuntu' ]]; then
     PROXY_PORT=3128
 fi
 
-if [[ "${APT_PROXY_OVERRIDE,,}" == "disable" ]]; then
+if [[ "${APT_PROXY_OVERRIDE,,}" == "disable" ]] || [[ -n "$NO_PROXY" ]]; then
     PROXY_PORT=
 elif [[ -n $APT_PROXY_OVERRIDE ]]; then
     PROXY_PORT=$APT_PROXY_OVERRIDE
@@ -128,8 +132,10 @@ if [[ -e /usr/local/share/ca-certificates/squid_proxyCA.crt ]]; then
     update-ca-certificates
 elif [[ $deb_ver -le 10 ]]; then
     echo "Buster base (or earlier) detected, skipping importing Squid CA cert."
+elif [[ -z "$PROXY_PORT" ]]; then
+    echo "PROXY_PORT not set - skipping importing Squid CA cert."
 else
-    fatal "Squid CA cert not found."
+    fatal "Squid CA cert not found. (set NO_PROXY=true to skip)"
 fi
 
 # Set default Debian PHP version

keys/tkl-trixie-apt.asc

@@ -0,0 +1 @@
+../overlays/bootstrap_apt/usr/share/keyrings/tkl-trixie-apt.asc

keys/tkl-trixie-images.asc

@@ -0,0 +1,65 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGiVQaEBEADcGWIGAH/VXT6XzazyxZ1sRE7l+5/yoVT7PgMx+kUSrWAgAGIM
+v+5SMeYcGZL9ojh4uGgTKwPoLAJok2qctPqQjxcqxUmVlM4fvKBghwxQSd9qvBlQ
+SZ7vf3iOpy3BwZ4Z3M/i+Lkk+bkjgyOT2iSkUQWTapPi+qiSiddig0hi6cCggMab
+dOMkeMjNDc8cOhSWgMKBGdhD/wT3sKzIEYg0oQqrrPBcw3XEXlKM5EWmJuuCNtPE
+cfqP+J3Z88HzCAwWQDhPuAJplI84KzRDx0oBUjZfLQdrfJRjoycQLRh4w4pht6E5
+kLiVZNMIMbmDybP7S0544MwNF0P/yJChMwx+KOy5P2u/M2imbsMlR3UVgxezH/x6
+hfZxhRfqgL4uAtGT7fdMvJbYp2CQ3aZQ65OOxPJ19dbjkiAOYH9odMgBckU1Q8Mq
+jhhEX5R40/N5i/Y6u0413VSMmA53wCnIuE6MXQP5yv4l09BQrQxeSLKXhnTU6jJZ
+/MP7imVBDij6q33o9I3e52FPOZn7v3UNj/9hiiy7vxwx6r1q3oZkrMXjXZxliECF
+KxKb5EKLhy0WoJU7GWTFm9WQoqUfPl5oH09S6wCK1Gb4JAses/ufbC6V59ttf29C
+X2xglpnjyIeDbP5Qa0x//qZoRbFiLkKyAXeF4BQLKc9wUc2ay8K4+GhwiwARAQAB
+tHpUdXJuS2V5IEdOVS9MaW51eCBUcml4aWUgSW1hZ2VzIChHUEcgc2lnbmluZyBr
+ZXkgZm9yIFR1cm5LZXkgTGludXggVHJpeGllIEltYWdlcykgPHJlbGVhc2UtdHJp
+eGllLWltYWdlc0B0dXJua2V5bGludXgub3JnPokCVAQTAQoAPhYhBMd4TpR89Fy+
+CfiHpz3MbxjZfvhGBQJolUGhAhsDBQklmAYABQsJCAcCBhUKCQgLAgQWAgMBAh4B
+AheAAAoJED3MbxjZfvhGCCEP/2EvO4KKbV2pKUr3ydMWOb9gBcKI5IYfVYHlyGMa
+D0q7hiG7fGMHFzUXIgp3f6NdljawsNb90imReF3C1FKWeWiGUr6hj4Gi/qpJHrYL
+UbnFiDNvIfz8PNnfNI4TCOUJYbVU49vgboqWqRjqROFkA8Jupke8C51u6wVBy26U
+9N6T8qM0sHEo5CGUVY3rkYfnc3WOiUFp7cgJna3UsvnzO6gDYQzP0QjfnoZ0cMTE
+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
+=Drbd
+-----END PGP PUBLIC KEY BLOCK-----

overlays/bootstrap_apt/usr/share/keyrings/tkl-trixie-apt.asc

@@ -0,0 +1,65 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGiVQm4BEAC1e6MU/CKx2iqB+J0CpKHzBEwRJdmnqXJIhWmXl6PfLuU1Tq0p
+Jk42abD6O/V5tKcE8qflDReqN5PoO/wiprUZgtfiwyFK9XQKDkU4hH3Wn493hAcv
+2NOPSlWnBR8ce5J0ggTrALfdG5RLzuMtY26CA6uDxc1dRqhk7bAsarWFXUxeboEP
+fP/OqRKjc/82GrqzH1WIoIxfONWQ7XuMveZ0Y4xG9apyp8Vnm6Ef3NWBJNTvE30C
+BOjAJn35uJTUU3Lu2HOCd/T6DV61b5JSGErst45SMR1Dg7bIurMzU04EplZ+yxqi
+twkaoIRd0ramBHKa8QIHSweBMfanzJ3DDQzL30shaHVkaQw9XsKCtl/093wsoD1N
+o/Hege1wGcCNympzbbomwuflcR4ALu++P4nghzDfeX/xx7vB3fRtHrAoV+o9uCwc
+I0oAM9fciumfyH7BZgIU3/J7FcrZQyf/xV6Rc46oPIxj7BhZ8G8JTXLW2jf+v0wX
+sPBLj56XZJ5A6WuLE1n++C7zSuChkDv6TPubQuTtqnGV/iHZO0rPdBDjDVH+dxwx
+Hv6RRnsDulGx1ea+vKnPSAZsskHfexyHJAL6nBNqPpXlXb4JQRja0foGdftfJGpM
+/hZ/IDgemiA3VNP66Imgao7z3wmJVFUaJY8gr99ET/h60VVIgghgVS2JMQARAQAB
+tIJUdXJuS2V5IEdOVS9MaW51eCBUcml4aWUgYXB0IHJlcG8gKEdQRyBzaWduaW5n
+IGtleSBmb3IgVHVybktleSBMaW51eCBUcml4aWUgYXB0IHJlcG9zaXRvcnkpIDxy
+ZWxlYXNlLXRyaXhpZS1tYWluQHR1cm5rZXlsaW51eC5vcmc+iQJUBBMBCgA+FiEE
+mVJNqTHd6dglXwvtLGaGPsWEhz0FAmiVQm4CGwMFCSWYBgAFCwkIBwIGFQoJCAsC
+BBYCAwECHgECF4AACgkQLGaGPsWEhz16zw/9GbnVY//6TD+Y1v5NM7FJeESiAw1P
+GjDOz+Y3mQVMTVxkTo7tW7g/dwDGLEMBj1kbqSqEYvvluZyz028PFvn3I76YEZPE
+ATYAA4Z9XmazINP6ITnaCFCZLDj3KkwQWHvngCHFbH3y5hksPMEiv0qI+kVisFKQ
+X8OB9WAOtvNK3CycN7NIdSkKoc+w0bAN5uKJAsBJu3sQTdXjeAzqe4KVYzi0Hcn+
+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
+=EjE6
+-----END PGP PUBLIC KEY BLOCK-----