Fix security entries in sources.list

CHANGELOG

@@ -1,3 +1,11 @@
+[ 11.0.3 ]
+
+ * Update settings.conf with changes from recent releases
+ * Update sources.list to include updates security path
+   (Debian bug: #969930)
+ * Store host entropy in urandom and systemd location
+   (Debian bug: #941301)
+
 [ 11.0.2 ]
 
  * Use xdg-user-dir to specify Desktop path

calamares/branding/debian/branding.desc

@@ -1,10 +1,14 @@
 ---
 componentName:   debian
 welcomeStyleCalamares: true
+welcomeExpandingLogo: true
+windowExpanding: normal
+windowSize: 800px,520px
+windowPlacement: center
 
 strings:
     productName:         Debian GNU/Linux
-    shortProductName:    Debian testing
+    shortProductName:    Debian
     version:             11 (bullseye)
     shortVersion:        11
     versionedName:       Debian 11 (bullseye)
@@ -12,12 +16,15 @@ strings:
     bootloaderEntryName: Debian
     productUrl:          https://debian.org
     supportUrl:          https://www.debian.org/support
+    knownIssuesUrl:      https://bugs.debian.org
     releaseNotesUrl:     https://www.debian.org/releases/bullseye/releasenotes
+    donateUrl:           https://www.debian.org
 
 images:
     productLogo:         "debian-logo.png"
     productIcon:         "debian-logo.png"
     productWelcome:      "welcome.png"
+    # productWallpaper:  "wallpaper.png"
 
 slideshow:               "show.qml"
 
@@ -25,3 +32,6 @@ style:
    sidebarBackground:    "#2c3133"
    sidebarText:          "#FFFFFF"
    sidebarTextSelect:    "#4d7079"
+   sidebarTextSelect:    "#292F34"
+
+slideshowAPI: 2

calamares/modules/machineid.conf

@@ -6,3 +6,10 @@ dbus: true
 # Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
 # (ignored if dbus is false, or if there is no /etc/machine-id to point to).
 symlink: true
+# Whether to copy entropy from the host
+entropy-copy: true
+# Which files to write (paths in the target)
+entropy-files:
+    - /var/lib/urandom/random-seed
+    - /var/lib/systemd/random-seed
+

calamares/settings.conf

@@ -5,8 +5,41 @@
 # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
 modules-search: [ local, /usr/lib/calamares/modules ]
 
-sequence:
+# If this is set to true, Calamares refers to itself as a "setup program"
+# rather than an "installer". Defaults to the value of dont-chroot, but
+# Calamares will complain if this is not explicitly set.
+oem-setup: false
 
+# If this is set to true, the "Cancel" button will be disabled entirely.
+# The button is also hidden from view.
+#
+# This can be useful if when e.g. Calamares is used as a post-install
+# configuration tool and you require the user to go through all the
+# configuration steps.
+#
+# Default is false, but Calamares will complain if this is not explicitly set.
+#
+# YAML: boolean.
+disable-cancel: false
+
+# If this is set to true, the "Cancel" button will be disabled once
+# you start the 'Installation', meaning there won't be a way to cancel
+# the Installation until it has finished or installation has failed.
+#
+# Default is false, but Calamares will complain if this is not explicitly set.
+#
+# YAML: boolean.
+disable-cancel-during-exec: false
+
+# If this is set to true, then once the end of the sequence has
+# been reached, the quit (done) button is clicked automatically
+# and Calamares will close. Default is false: the user will see
+# that the end of installation has been reached, and that things are ok.
+#
+#
+quit-at-end: false
+
+sequence:
 # Phase 1 - prepare.
 # View modules are shown as UI pages, jobs from job modules
 # are executed immediately in the background.

debian/changelog

@@ -1,3 +1,29 @@
+calamares-settings-debian (11.0.5-2) unstable; urgency=medium
+
+  * Add supplimental information to previous changelog entry
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 26 Jul 2021 10:27:12 +0200
+
+calamares-settings-debian (11.0.5-1) unstable; urgency=medium
+
+  * New upstream release
+    - Corrects the apt sources for security updates (Closes: #991474)
+
+ -- Jonathan Carter <jcc@debian.org>  Sun, 25 Jul 2021 14:10:24 +0200
+
+calamares-settings-debian (11.0.4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 11 Nov 2020 14:54:50 +0200
+
+calamares-settings-debian (11.0.3-1) unstable; urgency=medium
+
+  * New upstream release
+    (Closes: #969930, #941301)
+
+ -- Jonathan Carter <jcc@debian.org>  Sun, 18 Oct 2020 19:48:10 +0200
+
 calamares-settings-debian (11.0.2-1) unstable; urgency=medium
 
   * New upstream release

scripts/sources-final

@@ -14,8 +14,8 @@ deb-src http://deb.debian.org/debian $RELEASE main
 deb http://deb.debian.org/debian $RELEASE-updates main
 deb-src http://deb.debian.org/debian $RELEASE-updates main
 
-deb http://security.debian.org/debian-security/ $RELEASE/updates main
-deb-src http://security.debian.org/debian-security/ $RELEASE/updates main
+deb http://security.debian.org/debian-security/ $RELEASE-security main
+deb-src http://security.debian.org/debian-security/ $RELEASE-security main
 EOF
 
 exit 0