Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: debian-qt-...@lists.debian.org
Please unblock package sddm [ Reason ] SDDM currently has a bug where users having fish as their default shell don’t get proper sourcing of the standard /etc/profile and $HOME/.profile files. [ Impact ] Users with fish as their default shell get an incorrect environment setup. [ Tests ] - Manually tested the impact on environment variables of the versions before and after patch for a user with fish shell as default. - Used for a week with my usual user having bash as default shell and checked that I didn’t notice any impact. [ Risks ] The changes are in fish-specific branches of the code, and the commit is backported from upstream so I consider the risk to be very low. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing [ Other info ] <3 <3 <3 unblock sddm/0.19.0-3
diff -Nru sddm-0.19.0/debian/changelog sddm-0.19.0/debian/changelog --- sddm-0.19.0/debian/changelog 2020-11-09 20:38:45.000000000 +0100 +++ sddm-0.19.0/debian/changelog 2021-03-17 22:41:58.000000000 +0100 @@ -1,3 +1,10 @@ +sddm (0.19.0-3) unstable; urgency=medium + + * Cherry-pick upstream commit to re-add sourcing of /etc/profile and + $HOME/.profile for users with fish as their default shell. + + -- Aurélien COUDERC <couc...@debian.org> Wed, 17 Mar 2021 22:41:58 +0100 + sddm (0.19.0-2) unstable; urgency=medium [ Norbert Preining ] diff -Nru sddm-0.19.0/debian/patches/series sddm-0.19.0/debian/patches/series --- sddm-0.19.0/debian/patches/series 2020-11-09 20:38:45.000000000 +0100 +++ sddm-0.19.0/debian/patches/series 2021-03-17 22:39:38.000000000 +0100 @@ -5,3 +5,4 @@ 05_add_debian_themes.diff 06_nvidia_prime_setup.diff upstream-2f034906d-use-only-basename-of-session.patch +upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff diff -Nru sddm-0.19.0/debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff sddm-0.19.0/debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff --- sddm-0.19.0/debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff 1970-01-01 01:00:00.000000000 +0100 +++ sddm-0.19.0/debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff 2021-03-17 22:39:38.000000000 +0100 @@ -0,0 +1,31 @@ +Origin: https://github.com/sddm/sddm/commit/cf65e99eb8abfe2ee1ef7e2f7dc43862e83bf0ab +From: soredake +Date: Tue, 9 Mar 2021 07:28:11 +0000 +Subject: Add fish /etc/profile and $HOME/.profile sourcing +--- +diff --git a/data/scripts/Xsession b/data/scripts/Xsession +index 54498101..d0c2605f 100755 +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession +@@ -39,6 +39,8 @@ case $SHELL in + rm -f $xsess_tmp + ;; + */fish) ++ [ -f /etc/profile ] && . /etc/profile ++ [ -f $HOME/.profile ] && . $HOME/.profile + xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX` + $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp" + . $xsess_tmp +diff --git a/data/scripts/wayland-session b/data/scripts/wayland-session +index 1f905543..552a39f5 100755 +--- a/data/scripts/wayland-session ++++ b/data/scripts/wayland-session +@@ -43,6 +43,8 @@ case $SHELL in + rm -f $wlsess_tmp + ;; + */fish) ++ [ -f /etc/profile ] && . /etc/profile ++ [ -f $HOME/.profile ] && . $HOME/.profile + xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX` + $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp" + . $xsess_tmp diff -Nru sddm-0.19.0/debian/wayland-session sddm-0.19.0/debian/wayland-session --- sddm-0.19.0/debian/wayland-session 2020-11-09 20:38:45.000000000 +0100 +++ sddm-0.19.0/debian/wayland-session 2021-03-17 22:41:25.000000000 +0100 @@ -36,9 +36,8 @@ rm -f $wlsess_tmp ;; */fish) - # Fish is not a POSIX 1003.1 compatible shell - # https://github.com/fish-shell/fish-shell/issues/3665 - # [ -f /etc/profile ] && . /etc/profile + [ -f /etc/profile ] && . /etc/profile + [ -f $HOME/.profile ] && . $HOME/.profile xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX` $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp" . $xsess_tmp diff -Nru sddm-0.19.0/debian/Xsession sddm-0.19.0/debian/Xsession --- sddm-0.19.0/debian/Xsession 2020-11-09 20:38:45.000000000 +0100 +++ sddm-0.19.0/debian/Xsession 2021-03-17 22:39:38.000000000 +0100 @@ -38,9 +38,8 @@ rm -f $xsess_tmp ;; */fish) - # Fish is not a POSIX 1003.1 compatible shell - # https://github.com/fish-shell/fish-shell/issues/3665 - # [ -f /etc/profile ] && . /etc/profile + [ -f /etc/profile ] && . /etc/profile + [ -f $HOME/.profile ] && . $HOME/.profile xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX` $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp" . $xsess_tmp