Merging upstream version 20221223.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

10 files changed, 79 insertions, 42 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ba5972a..8dd6e3d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,16 @@
+2022-12-23	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20221023.
+
+	[ Daniel Baumann ]
+	* Tightening version matches for OS detection in container info command.
+	* Adding release support for Debian 12 (bookworm).
+	* Updating distribution defaults for bookworm in container build scripts.
+	* Updating references in manpages for bookworm.
+	* Updating examples for bookworm.
+	* Adding support for non-free-firmware archive-area in debconf build script.
+	* Updating arm64 description in debconf build script.
+
 2022-10-23	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20221023.
diff --git a/VERSION.txt b/VERSION.txt
index e09d253..7a58b9c 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20221023
+20221223
diff --git a/libexec/container/info b/libexec/container/info
index 0888cc8..b713e7a 100755
--- a/libexec/container/info
+++ b/libexec/container/info
@@ -143,31 +143,31 @@ esac
 VERSION_BASH="$(chroot ${MACHINES}/${NAME} apt-cache policy bash | awk '/Installed: / { print $2 }')"
 
 case "${VERSION_BASH}" in
-	4.1*)
+	4.1-*|4.1.[0-9]*)
 		OS="Debian 6 (squeeze)"
 		;;
 
-	4.2*)
+	4.2-*|4.2.[0-9]*)
 		OS="Debian 7 (wheezy)"
 		;;
 
-	4.3*)
+	4.3-*|4.3.[0-9]*)
 		OS="Debian 8 (jessie)"
 		;;
 
-	4.4*)
+	4.4-*|4.4.[0-9]*)
 		OS="Debian 9 (stretch)"
 		;;
 
-	5.0*)
+	5.0-*|5.0.[0-9]*)
 		OS="Debian 10 (buster)"
 		;;
 
-	5.1*)
+	5.1-*|5.1.[0-9]*)
 		OS="Debian 11 (bullseye)"
 		;;
 
-	5.2*)
+	5.2-*|5.2.[0-9]*)
 		OS="Debian 12 (bookworm)"
 		;;
 
diff --git a/share/build-scripts/debconf.d/0003-debconf b/share/build-scripts/debconf.d/0003-debconf
index c5b5778..e12e25e 100755
--- a/share/build-scripts/debconf.d/0003-debconf
+++ b/share/build-scripts/debconf.d/0003-debconf
@@ -86,18 +86,18 @@ Distribution ()
 	then
 		case "${MODE}" in
 			debian)
-				db_subst container/distribution CHOICES "Debian GNU/Linux 10 \"buster\", Debian GNU/Linux 11 \"bullseye\", Debian GNU/Linux testing/bookworm, Debian GNU/Linux unstable/sid"
-				db_subst container/distribution CHOICES_C "buster, bullseye, bookworm, sid"
+				db_subst container/distribution CHOICES "Debian GNU/Linux 10 \"buster\", Debian GNU/Linux 11 \"bullseye\", Debian GNU/Linux 12 \"bookworm\", Debian GNU/Linux testing, Debian GNU/Linux unstable/sid"
+				db_subst container/distribution CHOICES_C "buster, bullseye, bookworm, testing, sid"
 
-				db_set container/distribution bullseye
+				db_set container/distribution bookworm
 				db_fset container/distribution seen false
 				;;
 
 			progress-linux)
-				db_subst container/distribution CHOICES "Progress Linux 5 (engywuck), Progress Linux 5.99 (engywuck-backports), Progress Linux 6 (fuchur), Progress Linux 6.99 (fuchur-backports)"
-				db_subst container/distribution CHOICES_C "engywuck, engywuck-backports, fuchur, fuchur-backports"
+				db_subst container/distribution CHOICES "Progress Linux 5 (engywuck), Progress Linux 5.99 (engywuck-backports), Progress Linux 6 (fuchur), Progress Linux 6.99 (fuchur-backports), Progress Linux 7 (graograman), Progress Linux 7.99 (graograman-backports)"
+				db_subst container/distribution CHOICES_C "engywuck, engywuck-backports, fuchur, fuchur-backports, graograman, graograman-backports"
 
-				db_set container/distribution fuchur-backports
+				db_set container/distribution graograman-backports
 				db_fset container/distribution seen false
 				;;
 		esac
@@ -131,6 +131,10 @@ Parent_distribution ()
 					fuchur*)
 						PARENT_DISTRIBUTION="bullseye"
 						;;
+
+					graograman*)
+						PARENT_DISTRIBUTION="bookworm"
+						;;
 				esac
 				;;
 
@@ -155,7 +159,7 @@ Architecture ()
 
 		arm64)
 			DEFAULT="arm64"
-			CHOICES="Automatic, RaspberryPi 3 (arm64)"
+			CHOICES="Automatic, RaspberryPi 3 and newer (arm64)"
 			CHOICES_C="auto, arm64"
 			;;
 
@@ -518,18 +522,28 @@ Archive_areas ()
 	db_get container/archive-areas
 	ARCHIVE_AREAS="${RET}"
 
+	case "${PARENT_DISTRIBUTION}" in
+		bookworm|testing|sid)
+			ARCHIVE_AREAS_ALL="main, contrib, non-free, non-free-firmware"
+			;;
+
+		*)
+			ARCHIVE_AREAS_ALL="main, contrib, non-free"
+			;;
+	esac
+
 	if [ -z "${ARCHIVE_AREAS}" ]
 	then
 		case "${MODE}" in
 			progress-linux)
-				db_subst container/archive-areas CHOICES "main, contrib, non-free"
+				db_subst container/archive-areas CHOICES "${ARCHIVE_AREAS_ALL}"
 
-				db_set container/archive-areas "main, contrib, non-free"
+				db_set container/archive-areas "${ARCHIVE_AREAS_ALL}"
 				db_fset container/archive-areas seen false
 				;;
 
 			*)
-				db_subst container/archive-areas CHOICES "main, contrib, non-free"
+				db_subst container/archive-areas CHOICES "${ARCHIVE_AREAS_ALL}"
 
 				db_set container/archive-areas "main"
 				db_fset container/archive-areas seen false
@@ -551,7 +565,7 @@ Archive_areas ()
 					;;
 
 				progress-linux)
-					ARCHIVE_AREAS="main, contrib, non-free"
+					ARCHIVE_AREAS="${ARCHIVE_AREAS_ALL}"
 					;;
 			esac
 		fi
@@ -568,13 +582,23 @@ Parent_archive_areas ()
 	db_get container/parent-archive-areas
 	PARENT_ARCHIVE_AREAS="${RET}" # multiselect (w/o empty)
 
+	case "${PARENT_DISTRIBUTION}" in
+		bookworm|testing|sid)
+			PARENT_ARCHIVE_AREAS_ALL="main, contrib, non-free, non-free-firmware"
+			;;
+
+		*)
+			PARENT_ARCHIVE_AREAS_ALL="main, contrib, non-free"
+			;;
+	esac
+
 	if [ -z "${PARENT_ARCHIVE_AREAS}" ]
 	then
 		case "${MODE}" in
 			progress-linux)
-				db_subst container/parent-archive-areas CHOICES "main, contrib, non-free"
+				db_subst container/parent-archive-areas CHOICES "${PARENT_ARCHIVE_AREAS_ALL}"
 
-				db_set container/parent-archive-areas "main, contrib, non-free"
+				db_set container/parent-archive-areas "${PARENT_ARCHIVE_AREAS_ALL}"
 				db_fset container/parent-archive-areas seen false
 
 				db_settitle container/title
@@ -597,7 +621,7 @@ Parent_archive_areas ()
 		then
 			case "${MODE}" in
 				progress-linux)
-					PARENT_ARCHIVE_AREAS="main, contrib, non-free"
+					PARENT_ARCHIVE_AREAS="${PARENT_ARCHIVE_AREAS_ALL}"
 					;;
 
 				*)
diff --git a/share/build-scripts/debootstrap b/share/build-scripts/debootstrap
index 567ee6b..5ab5db2 100755
--- a/share/build-scripts/debootstrap
+++ b/share/build-scripts/debootstrap
@@ -153,7 +153,7 @@ then
 fi
 
 ARCHITECTURE="${ARCHITECTURE:-$(dpkg --print-architecture)}"
-DISTRIBUTION="${DISTRIBUTION:-bullseye}"
+DISTRIBUTION="${DISTRIBUTION:-bookworm}"
 MIRROR="${MIRROR:-https://deb.debian.org/debian}"
 PASSWORD="${PASSWORD:-$(dd if=/dev/urandom bs=12 count=1 2> /dev/null | base64)}"
 
diff --git a/share/doc/examples/bullseye.cfg b/share/doc/examples/bookworm.cfg
index 4582c9f..1f878f4 100644
--- a/share/doc/examples/bullseye.cfg
+++ b/share/doc/examples/bookworm.cfg
@@ -1,4 +1,4 @@
-# example for automated Debian 11 (bullseye) based container building
+# example for automated Debian 12 (bookworm) based container building
 # using: sudo container build -s debian
 
 debconf debconf/priority select critical
@@ -9,12 +9,12 @@ compute-tools container/mode select debian
 #compute-tools container/preseed-files string 
 #compute-tools container/include-preseed-files string 
 
-compute-tools container/distribution select bullseye
+compute-tools container/distribution select bookworm
 #compute-tools container/parent-distribution select 
 
 compute-tools container/architecture select auto
 
-compute-tools container/archives multiselect bullseye-security, bullseye-updates
+compute-tools container/archives multiselect bookworm-security, bookworm-updates
 #compute-tools container/parent-archives multiselect 
 
 compute-tools container/mirror string https://deb.debian.org/debian
diff --git a/share/doc/examples/container-images.sh b/share/doc/examples/container-images.sh
index 27c05fc..b711048 100755
--- a/share/doc/examples/container-images.sh
+++ b/share/doc/examples/container-images.sh
@@ -24,7 +24,7 @@
 set -e
 
 ARCHITECTURES="amd64 i386"
-DISTRIBUTIONS="stretch buster bullseye sid"
+DISTRIBUTIONS="buster bullseye bookworm sid"
 MIRROR="https://deb.debian.org/debian"
 INCLUDE="dbus"
 
diff --git a/share/doc/examples/fuchur-backports.cfg b/share/doc/examples/graograman-backports.cfg
index c02e776..d1d2640 100644
--- a/share/doc/examples/fuchur-backports.cfg
+++ b/share/doc/examples/graograman-backports.cfg
@@ -1,4 +1,4 @@
-# example for automated Progress Linux 6.99 (fuchur-backports) container building
+# example for automated Progress Linux 7.99 (graograman-backports) container building
 # using: sudo container build -s progress-linux
 
 debconf debconf/priority select critical
@@ -9,12 +9,12 @@ compute-tools container/mode select progress-linux
 #compute-tools container/preseed-files string 
 #compute-tools container/include-preseed-files string 
 
-compute-tools container/distribution select fuchur-backports
+compute-tools container/distribution select graograman-backports
 #compute-tools container/parent-distribution select 
 
 compute-tools container/architecture select auto
 
-compute-tools container/archives multiselect fuchur-security, fuchur-updates, fuchur-extras, fuchur-backports, fuchur-backports-extras
+compute-tools container/archives multiselect graograman-security, graograman-updates, graograman-extras, graograman-backports, graograman-backports-extras
 #compute-tools container/parent-archives multiselect 
 
 compute-tools container/mirror string https://deb.progress-linux.org/packages
@@ -23,8 +23,8 @@ compute-tools container/mirror-security string https://deb.progress-linux.org/pa
 compute-tools container/parent-mirror string https://deb.debian.org/debian
 compute-tools container/parent-mirror-security string https://security.debian.org
 
-compute-tools container/archive-areas multiselect main, contrib, non-free
-compute-tools container/parent-archive-areas multiselect main, contrib, non-free
+compute-tools container/archive-areas multiselect main, contrib, non-free, non-free-firmware
+compute-tools container/parent-archive-areas multiselect main, contrib, non-free, non-free-firmware
 
 compute-tools container/packages string knot-resolver openssh-server
 
diff --git a/share/man/container-build-debootstrap.1.rst b/share/man/container-build-debootstrap.1.rst
index 1f0584b..10538c5 100644
--- a/share/man/container-build-debootstrap.1.rst
+++ b/share/man/container-build-debootstrap.1.rst
@@ -61,7 +61,7 @@ The following script options are available:
   Specify the Debian architecture, defaults to the host systems architecture.
 
 -d, --distribution='DISTRIBUTION':
-  Specify the Debian distribution, defaults to 'bullseye'.
+  Specify the Debian distribution, defaults to 'bookworm'.
 
 -m, --mirror='MIRROR':
   Specify the Debian mirror, defaults to 'https://deb.debian.org/debian'.
@@ -72,15 +72,15 @@ The following script options are available:
 Examples
 ========
 
-Build a Debian 11 (bullseye) based container with same architecture as the host
+Build a Debian 12 (bookworm) based container with same architecture as the host
 system using debootstrap:
 
-  sudo container build -s debootstrap -n bullseye.example.net
+  sudo container build -s debootstrap -n bookworm.example.net
 
-Build a Debian 11 (bullseye) based container with different architecture as the
+Build a Debian 12 (bookworm) based container with different architecture as the
 host system using mmdebstrap:
 
-  sudo container build -s mmdebstrap -n bullseye-i386.example.net -- -a i386
+  sudo container build -s mmdebstrap -n bookworm-i386.example.net -- -a i386
 
 See also
 ========
diff --git a/share/man/container-get-curl.1.rst b/share/man/container-get-curl.1.rst
index e94260b..01ae592 100644
--- a/share/man/container-get-curl.1.rst
+++ b/share/man/container-get-curl.1.rst
@@ -82,22 +82,22 @@ The following script options are available:
 
 --system='SYSTEM':
   Specify the system image name to download, defaults to
-  debian-bullseye-current_${ARCHITECTURE}.system.tar.${COMPRESSION} (where
+  debian-bookworm-current_${ARCHITECTURE}.system.tar.${COMPRESSION} (where
   ${ARCHITECTURE} is the host systems architecture and ${COMPRESSION} either
   lz, xz, or gz depending on compressor availability on the host system).
 
 Examples
 ========
 
-Download a Debian 11 (bullseye) based container with same architecture as the host
+Download a Debian 12 (bookworm) based container with same architecture as the host
 system:
 
-  sudo container get -s curl -n bullseye.example.net
+  sudo container get -s curl -n bookworm.example.net
 
-Download a Debian 11 (bullseye) based container with different architecture as the
+Download a Debian 12 (bookworm) based container with different architecture as the
 host system:
 
-  sudo container get -s curl -n bullseye-i386.example.net -- --system debian-bullseye-current_i386.system.tar.xz
+  sudo container get -s curl -n bookworm-i386.example.net -- --system debian-bookworm-current_i386.system.tar.xz
 
 Files
 =====