[pkg-lxc-devel] Bug#1073194: bookworm-pu: package lxc-templates/3.0.4.48.g4765da8-1+deb12u1

[Pierre-Elliott Bécue]

Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org at packages.debian.org
Usertags: pu
X-Debbugs-Cc: lxc-templates at packages.debian.org
Control: affects -1 + src:lxc-templates

[ Reason ]
Two bugs within the lxc-debian template were spotted. Each one prevents
using a custom mirror when generating a debian-based container with the
lxc-debian template.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1073130
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1073131

[ Impact ]
These to bugs will force users to edit manually the lxc-debian
code.

[ Tests ]
shellcheck has been a good friend.

[ Risks ]
Trivial fixes

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

The changes are adding a missing coma in a getopt call and replacing a
DEBIAN_MIRROR variable by a MIRROR variable.
-------------- next part --------------
diff -Nru lxc-templates-3.0.4.48.g4765da8/debian/changelog lxc-templates-3.0.4.48.g4765da8/debian/changelog
--- lxc-templates-3.0.4.48.g4765da8/debian/changelog	2022-05-24 00:36:10.000000000 +0200
+++ lxc-templates-3.0.4.48.g4765da8/debian/changelog	2024-06-14 11:50:35.000000000 +0200
@@ -1,3 +1,11 @@
+lxc-templates (3.0.4.48.g4765da8-1+deb12u1) bookworm; urgency=medium
+
+  * d/p/0004-Fix-debian-mirror-issues-in-lxc-debian.in.patch:
+    Fixes two issues with the mirror argument in lxc-debian
+    (Closes: #1073130, #1073131)
+
+ -- Pierre-Elliott B?cue <peb at debian.org>  Fri, 14 Jun 2024 11:50:35 +0200
+
 lxc-templates (3.0.4.48.g4765da8-1) unstable; urgency=medium
 
   * New upstream version 3.0.4.48.g4765da8
diff -Nru lxc-templates-3.0.4.48.g4765da8/debian/patches/0004-Fix-debian-mirror-issues-in-lxc-debian.in.patch lxc-templates-3.0.4.48.g4765da8/debian/patches/0004-Fix-debian-mirror-issues-in-lxc-debian.in.patch
--- lxc-templates-3.0.4.48.g4765da8/debian/patches/0004-Fix-debian-mirror-issues-in-lxc-debian.in.patch	1970-01-01 01:00:00.000000000 +0100
+++ lxc-templates-3.0.4.48.g4765da8/debian/patches/0004-Fix-debian-mirror-issues-in-lxc-debian.in.patch	2024-06-14 11:50:22.000000000 +0200
@@ -0,0 +1,41 @@
+From: =?utf-8?q?Pierre-Elliott_B=C3=A9cue?= <peb at debian.org>
+Date: Thu, 13 Jun 2024 11:47:29 +0200
+Subject: Fix debian mirror issues in lxc-debian.in
+
+Forwarded: not-needed
+
+lxc-debian has a DEBIAN_MIRROR static variable pointing to an online
+mirror. The whole template uses a MIRROR variable that is defined by a
+--mirror option when the template is called in and defaults to
+DEBIAN_MIRROR otherwise. Sadly, two lines were not updates and still
+rely on DEBIAN_MIRROR. This prevents the template from working on
+non-internet-connected environments. This has been fixed upstream
+
+Also a typo in the getopt line makex the --mirror option non-usable,
+this is fixed.
+---
+ templates/lxc-debian.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
+index a1292ff..7501a5a 100644
+--- a/templates/lxc-debian.in
++++ b/templates/lxc-debian.in
+@@ -754,7 +754,7 @@ EOF
+     return 0
+ }
+ 
+-options=$(getopt -o hp:n:a:r:cI:FS: -l arch:,auth-key:,clean,help,enable-non-free,mirror:keyring:,name:,packages:,path:,release:,rootfs:,security-mirror:,interpreter-path:,flush-cache -- "$@")
++options=$(getopt -o hp:n:a:r:cI:FS: -l arch:,auth-key:,clean,help,enable-non-free,mirror:,keyring:,name:,packages:,path:,release:,rootfs:,security-mirror:,interpreter-path:,flush-cache -- "$@")
+ if [ $? -ne 0 ]; then
+         usage "$(basename "$0")"
+         exit 1
+@@ -825,7 +825,7 @@ if [ "$arch" = "x86_64" ]; then
+ fi
+ 
+ 
+-testing_release_file=${DEBIAN_MIRROR}/dists/testing/main/binary-${arch}/Release
++testing_release_file=${MIRROR}/dists/testing/main/binary-${arch}/Release
+ if ! wget -q -O /dev/null "${testing_release_file}"; then
+   echo "${arch} does not look like a release architecture, trying debian ports"
+   # non-release architecture; assume debian-ports architecture
diff -Nru lxc-templates-3.0.4.48.g4765da8/debian/patches/series lxc-templates-3.0.4.48.g4765da8/debian/patches/series
--- lxc-templates-3.0.4.48.g4765da8/debian/patches/series	2022-05-24 00:36:10.000000000 +0200
+++ lxc-templates-3.0.4.48.g4765da8/debian/patches/series	2024-06-14 11:50:22.000000000 +0200
@@ -1,3 +1,4 @@
 0002-Add-references-to-mmdebstrap-and-some-documentation-.patch
 0003-Handle-properly-the-future-security-repositories.patch
 0004-Fixes-path-variable-in-some-templates.patch
+0004-Fix-debian-mirror-issues-in-lxc-debian.in.patch