Adding upstream version 20210411.upstream/20210411

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

3 files changed, 13 insertions, 12 deletions

diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/scripts/debconf.d/0001-preseed-file
index 4fec6b0..d70e4e1 100755
--- a/share/scripts/debconf.d/0001-preseed-file
+++ b/share/scripts/debconf.d/0001-preseed-file
@@ -15,14 +15,15 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/debconf"
+CONFIG="/etc/${SOFTWARE}/debconf"
 
 DEBCONF_NOWARNINGS="true"
 export DEBCONF_NOWARNINGS
@@ -43,7 +44,7 @@ then
 elif [ "$(ls ${CONFIG}/*/${NAME}.cfg 2>/dev/null | wc -l)" -eq 1 ]
 then
 	# user did not specify a pressed file, but there is 1 (and only 1)
-	# matching in a sub-directory of /etc/${PROJECT}/${PROGRAM}/debconf
+	# matching in a sub-directory of /etc/${SOFTWARE}/debconf
 
 	FILE="$(ls ${CONFIG}/*/${NAME}.cfg)"
 
diff --git a/share/scripts/debconf.d/0002-preseed-debconf b/share/scripts/debconf.d/0002-preseed-debconf
index 9bc9fcf..4bc4da6 100755
--- a/share/scripts/debconf.d/0002-preseed-debconf
+++ b/share/scripts/debconf.d/0002-preseed-debconf
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 set -e
 
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index dda3821..c1c4e79 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 set -e
 
@@ -53,15 +53,15 @@ Distribution ()
 	then
 		case "${MODE}" in
 			debian)
-				db_subst container/distribution CHOICES "Debian GNU/Linux 9 \"stretch\", Debian GNU/Linux 10 \"buster\", Debian GNU/Linux 11 \"bullseye\", Debian GNU/Linux unstable/sid"
-				db_subst container/distribution CHOICES_C "stretch, buster, bullseye, sid"
+				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_set container/distribution bullseye
 				db_fset container/distribution seen false
 				;;
 
 			progress-linux)
-				db_subst container/distribution CHOICES "Progress Linux 5 (engywuck), Progress Linux 5+ (engywuck-backports), Progress Linux 6 (fuchur), Progress Linux 6+ (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)"
 				db_subst container/distribution CHOICES_C "engywuck, engywuck-backports, fuchur, fuchur-backports"
 
 				db_set container/distribution fuchur-backports
@@ -352,7 +352,7 @@ Mirror_security ()
 	then
 		case "${MODE}" in
 			debian)
-				db_set container/mirror-security http://security.debian.org
+				db_set container/mirror-security https://security.debian.org
 				db_fset container/mirror-security seen false
 				;;
 
@@ -373,7 +373,7 @@ Mirror_security ()
 		then
 			case "${MODE}" in
 				debian)
-					MIRROR_SECURITY="http://security.debian.org"
+					MIRROR_SECURITY="https://security.debian.org"
 					;;
 
 				*)
@@ -445,7 +445,7 @@ Parent_mirror_security ()
 	then
 		case "${MODE}" in
 			progress-linux)
-				db_set container/parent-mirror-security http://security.debian.org
+				db_set container/parent-mirror-security https://security.debian.org
 				db_fset container/parent-mirror-security seen false
 
 				db_settitle container/title
@@ -466,7 +466,7 @@ Parent_mirror_security ()
 		then
 			case "${MODE}" in
 				progress-linux)
-					PARENT_MIRROR_SECURITY="http://security.debian.org"
+					PARENT_MIRROR_SECURITY="https://security.debian.org"
 					;;
 
 				*)