Bug#965117: buster-pu: calamares-settings-debian 10.0.20-1+deb10u3
package: release.debian.org
thanks
Dear release team,
Below follows a debdiff betwewn calamares-settings-debian
10.0.20-1+deb10u1 and 10.0.20-1+deb10u3, which fixes #934503, #934504
and #959541.
"""
diff -Nru calamares-settings-debian-10.0.20/debian/changelog
calamares-settings-debian-10.0.20/debian/changelog
--- calamares-settings-debian-10.0.20/debian/changelog 2019-07-03
15:05:47.000000000 +0200
+++ calamares-settings-debian-10.0.20/debian/changelog 2020-07-15
18:15:49.000000000 +0200
@@ -1,6 +1,21 @@
+calamares-settings-debian (10.0.20-1+deb10u3) buster; urgency=medium
+
+ * Use xdg-user-dir to specify Desktop directory
+ (Closes: #959541)
+
+ -- Jonathan Carter <jcc@debian.org> Wed, 15 Jul 2020 18:15:49 +0200
+
+calamares-settings-debian (10.0.20-1+deb10u2) buster; urgency=medium
+
+ * Fix type in previous entry (s/desk/disk)
+ * Enable displaymanager module, fixing autologin options
+ (Closes: #934503, #934504)
+
+ -- Jonathan Carter <jcc@debian.org> Wed, 15 Jul 2020 17:15:11 +0200
+
calamares-settings-debian (10.0.20-1+deb10u1) buster; urgency=medium
- * Fix permissions for initramfs image when full-desk encryption
+ * 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
diff -Nru
calamares-settings-debian-10.0.20/debian/patches/enable-displaymanagers-module
calamares-settings-debian-10.0.20/debian/patches/enable-displaymanagers-module
---
calamares-settings-debian-10.0.20/debian/patches/enable-displaymanagers-module
1970-01-01 02:00:00.000000000 +0200
+++
calamares-settings-debian-10.0.20/debian/patches/enable-displaymanagers-module
2020-07-15 17:40:59.000000000 +0200
@@ -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
diff -Nru calamares-settings-debian-10.0.20/debian/patches/series
calamares-settings-debian-10.0.20/debian/patches/series
--- calamares-settings-debian-10.0.20/debian/patches/series 2019-07-03
15:05:47.000000000 +0200
+++ calamares-settings-debian-10.0.20/debian/patches/series 2020-07-15
18:15:49.000000000 +0200
@@ -1 +1,3 @@
fix-initramfs-permissions
+enable-displaymanagers-module
+use-xdg-user-dir
diff -Nru
calamares-settings-debian-10.0.20/debian/patches/use-xdg-user-dir
calamares-settings-debian-10.0.20/debian/patches/use-xdg-user-dir
--- calamares-settings-debian-10.0.20/debian/patches/use-xdg-user-dir
1970-01-01 02:00:00.000000000 +0200
+++ calamares-settings-debian-10.0.20/debian/patches/use-xdg-user-dir
2020-07-15 18:15:49.000000000 +0200
@@ -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
"""
thanks,
-Jonathan
--
⢀⣴⠾⠻⢶⣦⠀ Jonathan Carter (highvoltage) <jcc>
⣾⠁⢠⠒⠀⣿⡁ https://wiki.debian.org/highvoltage
⢿⡄⠘⠷⠚⠋ https://debian.org | https://jonathancarter.org
⠈⠳⣄⠀⠀⠀⠀ Debian, the universal operating system.
Reply to: