[neon/3rdparty/sddm/Neon/release-lts] debian: Merge tag 'debian/0.19.0-2' into Neon/release-lts

Tue Mar 9 12:45:42 GMT 2021

Git commit 47e06a4a7119fd0451dcf8025e889216661d1ccd by Harald Sitter.
Committed on 09/03/2021 at 12:45.
Pushed by sitter into branch 'Neon/release-lts'.

Merge tag 'debian/0.19.0-2' into Neon/release-lts

sddm Debian release 0.19.0-2

keep dh12 compat for now, we don't have v13 in neon

M  +40   -0    debian/changelog
M  +9    -6    debian/control
R  +11   -4    debian/patches/02_kubuntu_use_breeze.diff
M  +1    -0    debian/patches/series
M  +2    -0    debian/rules
M  +3    -1    debian/sddm.postinst

https://invent.kde.org/neon/3rdparty/sddm/commit/47e06a4a7119fd0451dcf8025e889216661d1ccd

diff --cc debian/changelog
index e061946,bdb98ea..fec418a

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,43 +1,55 @@@
+ sddm (0.19.0-2) unstable; urgency=medium
+ 
+   [ Norbert Preining ]
+   * Disable 07_fix-desktop-session-env-var.diff imported from Ubuntu
+     (Closes: #973907)
+   * Add upstream's d/p/upstream-2f034906d-use-only-basename-of-session to
+     use only the basename of the session file as session name.
+ 
+  -- Norbert Preining <norbert at preining.info>  Tue, 10 Nov 2020 04:38:45 +0900
+ 
+ sddm (0.19.0-1) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * New upstream release (0.19.0):
+     - Fix X not having access control on startup (fixes CVE-2020-28049)
+   * Fix lintian warning command-with-path-in-maintainer-script in postrm.
+   * Sync patches with Kubuntu.
+   * Switch to UTF-8 encoding for Swedish po translation.
+   * Review copyright information.
+   * Build with hardening=+all build hardening flag.
+   * Mark watch file as version=4, no change required.
+   * Don’t install LICENSE files from source, their contents is already in
+     d/copyright.
+   * Install upstream README files to /usr/share/doc.
+   * Disable lintian warning for Maya theme’s font license, the source gives a
+     plausible source and license that are redistribuable.
+   * Bump Standards-Version to 4.5.0:
+     - Add Rules-Requires-Root: no
+   * Switch from the debhelper build dependency to debhelper-compat
+     - remove debian/compat
+     - bump compatibility level to 13
+ 
+   [ Norbert Preining ]
+   * Bump build-depends according to CMakeLists.
+   * Add Aurélien and myself to uploaders.
+   * Change maintainer to Debian Qt/KDE ...
+   * Don't do recursive change of ownership of /var/lib/sddm in d/sddm.postinst
+ 
+  -- Norbert Preining <norbert at preining.info>  Sat, 07 Nov 2020 09:28:39 +0900
+ 
 +sddm (0.19.0-0neon) focal; urgency=medium
 +
 +  * New release
 +
 + -- Harald Sitter <sitter at kde.org>  Wed, 03 Mar 2021 10:51:03 +0100
 +
 +sddm (0.18.1-2neon) focal; urgency=medium
 +
 +  * Revert upstream_set-re-use-session-option-by-default.diff
 +
 + -- Rik Mills <rikmills at kde.org>  Tue, 25 Feb 2020 15:44:32 +0000
 +
  sddm (0.18.1-1) unstable; urgency=medium
  
    * Team upload.
diff --cc debian/control
index 9f90352,d5deffa..22a85bb
--- a/debian/control
+++ b/debian/control
@@@ -1,11 -1,13 +1,13 @@@
  Source: sddm
  Section: kde
  Priority: optional
- Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Michał Zając <quintasan at kubuntu.org>,
             Maximiliano Curia <maxy at debian.org>,
+            Aurélien COUDERC <coucouf at debian.org>,
+            Norbert Preining <norbert at preining.info>,
  Build-Depends: cmake (>= 2.8.8),
-                debhelper (>= 11),
 -               debhelper-compat (= 13),
++               debhelper-compat (= 12),
                 extra-cmake-modules (>= 1.4.0~),
                 libpam0g-dev,
                 libsystemd-dev [linux-any],
diff --cc debian/patches/series
index 1f73b1d,6166035..a9569ca
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,7 +1,5 @@@
  01_sddm_systemctl.diff
 -02_use_debian_theme.diff
 -03_vt7-minimum-vt.diff
 -04_set_default_path.diff
 +02_kubuntu_use_breeze.diff
  05_add_debian_themes.diff
  06_nvidia_prime_setup.diff
+ upstream-2f034906d-use-only-basename-of-session.patch
diff --cc debian/sddm.postinst
index f1eb6d6,694e669..8e5eb1a
--- a/debian/sddm.postinst
+++ b/debian/sddm.postinst
@@@ -27,31 -27,10 +27,33 @@@ if [ ! -e /var/lib/sddm ]; the
      mkdir -p /var/lib/sddm
  fi
  
 +# Neon addition.
 +# Do not auto-start pulseaudio. It's not necessary for out sddm and unnecesarily
 +# causes a bit extra load slowing down startup.
 +if [ -d /var/lib/sddm ] && [ ! -d /var/lib/sddm/.config/systemd/user/ ]; then
 +    runuser -u sddm -- mkdir -p /var/lib/sddm/.config/systemd/user/
 +    runuser -u sddm -- ln -s /dev/null /var/lib/sddm/.config/systemd/user/pulseaudio.service
 +fi
 +
 +if [ ! -e /var/lib/sddm/state.conf ]; then
 +    # Default to X11!
 +    # https://github.com/sddm/sddm/issues/1358
 +    # We hardcode plasma since if it should not be installed for whatever
 +    # reason sddm will pick another session on its own anyway.
 +    # Existing installations will have a state.conf already and consequently
 +    # not get this block executed at all.
 +    cat << CONF > /var/lib/sddm/state.conf
 +[Last]
 +Session=/usr/share/xsessions/plasma.desktop
 +CONF
 +    chown sddm:sddm /var/lib/sddm/state.conf
 +    chmod 0644 /var/lib/sddm/state.conf
 +fi
 +
  if [ -d /var/lib/sddm ]; then
-     chown -R sddm:sddm /var/lib/sddm
+     # There has been a -R in version prior to 0.19
+     # but this opens up symlink attacks. Remove it.
+     chown sddm:sddm /var/lib/sddm
      chmod 0750 /var/lib/sddm
  fi
  
