Merge

2020-08-02 18:56:59 +02:00
5 changed files with 138 additions and 37 deletions
@@ -1,47 +1,22 @@
-calamares-settings-debian (11.0.2-1) unstable; urgency=medium
+calamares-settings-debian (10.0.20-1+deb10u3) buster; urgency=medium

-  * New upstream release
-    (Closes: #934503, #934504, #959541)
-  * Update standards version to 4.5.0
-  * Upgrade to debhelper-compat 13
-  * Declare Rules-Requires-Root: no
-  * Update copyright years
+  * Use xdg-user-dir to specify Desktop directory
+    (Closes: #959541)

- -- Jonathan Carter <jcc@debian.org>  Wed, 15 Jul 2020 18:39:57 +0200
+ -- Jonathan Carter <jcc@debian.org>  Wed, 15 Jul 2020 18:15:49 +0200

-calamares-settings-debian (11.0.1-1) unstable; urgency=medium
+calamares-settings-debian (10.0.20-1+deb10u2) buster; urgency=medium

-  * New upstream release
+  * Fix type in previous entry (s/desk/disk)
+  * Enable displaymanager module, fixing autologin options
+    (Closes: #934503, #934504)

- -- Jonathan Carter <jcc@debian.org>  Wed, 25 Sep 2019 10:36:54 +0000
+ -- Jonathan Carter <jcc@debian.org>  Wed, 15 Jul 2020 17:15:11 +0200

-calamares-settings-debian (10.0.25-2) unstable; urgency=medium
+calamares-settings-debian (10.0.20-1+deb10u1) buster; urgency=medium

-  * Initial source-only upload
-  * Update standards version to 4.4.0
-
- -- Jonathan Carter <jcc@debian.org>  Mon, 05 Aug 2019 21:30:20 +0200
-
-calamares-settings-debian (10.0.25-1) unstable; urgency=medium
-
-  * New upstream release
-    - Refine fix for initramfs permissions, only apply
-      when encryption is enabled
-
- -- Jonathan Carter <jcc@debian.org>  Fri, 05 Jul 2019 17:37:33 +0200
-
-calamares-settings-debian (10.0.24-1) unstable; urgency=medium
-
-  * New upstream release
-    - Fix path in previous CVE bug fix
-
- -- Jonathan Carter <jcc@debian.org>  Wed, 03 Jul 2019 13:29:07 +0000
-
-calamares-settings-debian (10.0.23-1) unstable; urgency=medium
-
-  * New upstream release
-    -  Fixes permissions for initramfs image (CVE-2019-13179)
-       (Closes: #931373)
+  * Fix permissions for initramfs image when full-disk encryption
+    is enabled. (CVE-2019-13179) (Closes: #931373)

 -- Jonathan Carter <jcc@debian.org>  Wed, 03 Jul 2019 13:05:47 +0000

@@ -0,0 +1,49 @@
+Description: Enable display manager module, allowing autologins to work 
+   * Enable displaymanager module, fixing autologin options
+     (Closes: #934503, #934504)
+Author: Jonathan Carter <jcc@debian.org>
+Bug-Debian: https://bugs.debian.org/934503
+Bug-Debian: https://bugs.debian.org/934504
+Last-Update: 2020-07-15
+
+--- /dev/null
+++ calamares-settings-debian-10.0.20/calamares/modules/displaymanager.conf
+@@ -0,0 +1,28 @@
+# Configure one or more display managers (e.g. SDDM)
+# with a "best effort" approach.
+---
+#The DM module attempts to set up all the DMs found in this list, in that precise order.
+#It also sets up autologin, if the feature is enabled in globalstorage.
+#The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here.
+displaymanagers:
+  - slim
+  - sddm
+  - lightdm
+  - gdm
+  - mdm
+  - lxdm
+  - kdm
+
+#Enable the following settings to force a desktop environment in your displaymanager configuration file:
+#defaultDesktopEnvironment:
+#    executable: "startkde"
+#    desktopFile: "plasma"
+
+#If true, try to ensure that the user, group, /var directory etc. for the
+#display manager are set up correctly. This is normally done by the distribution
+#packages, and best left to them. Therefore, it is disabled by default.
+basicSetup: false
+
+#If true, setup autologin for openSUSE. This only makes sense on openSUSE
+#derivatives or other systems where /etc/sysconfig/displaymanager exists.
+sysconfigSetup: false
+--- calamares-settings-debian-10.0.20.orig/calamares/settings.conf
+++ calamares-settings-debian-10.0.20/calamares/settings.conf
+@@ -36,6 +36,7 @@ sequence:
+   - keyboard
+   - localecfg
+   - users
+  - displaymanager
+   - networkcfg
+   - hwclock
+   - services-systemd
@@ -0,0 +1,26 @@
+Description: fix umask for initramfs permissions
+ By default, initramfs is world-readable. This configures a snippet
+ to ensure that the initramfs that will be generated is only accessable
+ by root.
+Author: Jonathan Carter <jcc@debian.org>
+Bug-Debian: https://bugs.debian.org/931373
+Bug: https://github.com/calamares/calamares/issues/1191
+Last-Update: 2019-07-08
+
+--- calamares-settings-debian-10.0.20.orig/scripts/bootloader-config
+++ calamares-settings-debian-10.0.20/scripts/bootloader-config
+@@ -2,6 +2,14 @@
+ 
+ CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+ 
+# Set secure permissions for the initramfs if we're configuring
+# full-disk-encryption. The initramfs is re-generated later in the
+# installation process so we only set the permissions snippet without
+# regenerating the initramfs right now:
+if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then
+    echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions
+fi
+
+ echo "Running bootloader-config..."
+ 
+ if [ -d /sys/firmware/efi/efivars ]; then
@@ -0,0 +1,3 @@
+fix-initramfs-permissions
+enable-displaymanagers-module
+use-xdg-user-dir
@@ -0,0 +1,48 @@
+Description: Use xdg-user-dir to specify Desktop directory
+ Desktop directory was hardcoded to ~/Desktop, but that path
+ will change depending on the user's language.
+ .
+ With this patch we user xdg-user-dir to set the Desktop directory
+ so that it's correct regardless of language.
+Author: Jonathan Carter <jcc@debian.org>
+Bug-Debian: https://bugs.debian.org/959541
+Last-Update: 2020-07-15
+
+--- calamares-settings-debian-10.0.20.orig/add-calamares-desktop-icon
+++ calamares-settings-debian-10.0.20/add-calamares-desktop-icon
+@@ -2,24 +2,26 @@
+ # Creates an "Install Debian" icon on the live session tested with:
+ # Xfce, LXDE, LXqt, Gnome, KDE, Mate, Cinnamon
+ 
+# We query xdg-user-dir because the Desktop directory has different
+# names for different languages
+DESKTOP=$(xdg-user-dir DESKTOP)
+ 
+ # Create ~/Desktop just in case this runs before the xdg folder
+ # creation script.
+-mkdir -p ~/Desktop
+-
+mkdir -p $DESKTOP
+ 
+ # Among the Debian desktop environments, LXDE is the only one
+ # that behaves completely different.
+ if [ -f /usr/bin/lxsession ]; then
+-    echo "[Desktop Entry]" > ~/Desktop/install-debian.desktop
+-    echo "Type=Link" >> ~/Desktop/install-debian.desktop
+-    echo "Name=Install Debian" >> ~/Desktop/install-debian.desktop
+-    echo "Icon=install-debian" >> ~/Desktop/install-debian.desktop
+    echo "[Desktop Entry]" > $DESKTOP/install-debian.desktop
+    echo "Type=Link" >> $DESKTOP/install-debian.desktop
+    echo "Name=Install Debian" >> $DESKTOP/install-debian.desktop
+    echo "Icon=install-debian" >> $DESKTOP/install-debian.desktop
+     echo "URL=/usr/share/applications/install-debian.desktop" \
+-          >> ~/Desktop/install-debian.desktop
+          >> $DESKTOP/install-debian.desktop
+ else
+-    cp /usr/share/applications/install-debian.desktop ~/Desktop
+    cp /usr/share/applications/install-debian.desktop $DESKTOP
+     # Xfce needs this executable otherwise it complains, everything
+     # else doesn't seem to care either way.
+-    chmod +x ~/Desktop/install-debian.desktop
+    chmod +x $DESKTOP/install-debian.desktop
+ fi