commit: 5e996d8c5d2e1f27ad0eceed39173e46039c8a5b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Nov 13 15:29:54 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Nov 13 21:30:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e996d8c
x11-misc/sddm: Drop vulnerable 0.17.0-r4 Bug: https://bugs.gentoo.org/661510 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-misc/sddm/Manifest | 1 - x11-misc/sddm/files/sddm-0.16.0-Xsession.patch | 24 ------- x11-misc/sddm/files/sddm-0.17.0-consolekit.patch | 22 ------ x11-misc/sddm/files/sddm-0.17.0-logind-race.patch | 26 ------- .../files/sddm-0.17.0-switchtogreeter-r1.patch | 54 -------------- x11-misc/sddm/sddm-0.17.0-r4.ebuild | 84 ---------------------- 6 files changed, 211 deletions(-) diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index ddeba3e7838..33ffd8431a8 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1,3 +1,2 @@ DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566 -DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101 DIST sddm-0.18.0.tar.gz 3526688 BLAKE2B 96db3f7b4745b7b5686c3c5e4353c99f175f28c99d329df3bc49cf41788257eaf823c6998b165de90e2150e34470e65ca69731375194072aae7583c8e8dfa811 SHA512 474be3fc159ca31cae409ef5263c47376d41f500d8b495fc7ef896ad0f1a599a5fea9a58d7df2874493dfd9230d0121cdd836ec6171774df2ce1639e8e4c652f diff --git a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch deleted file mode 100644 index f341e1863f7..00000000000 --- a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 -+++ b/data/scripts/Xsession 2017-10-21 15:25:47.668886596 +0200 -@@ -50,6 +50,10 @@ - ;; - esac - -+# Make D-Bus and ConsoleKit start properly, see: -+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit} -+command="$@" -+ - [ -f /etc/xprofile ] && . /etc/xprofile - [ -f $HOME/.xprofile ] && . $HOME/.xprofile - -@@ -94,8 +98,8 @@ - . "$USERXSESSION" - fi - --if [ -z "$@" ]; then -+if [ -z "$command" ]; then - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - else -- exec $@ -+ exec $command - fi diff --git a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch deleted file mode 100644 index ca265d13145..00000000000 --- a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7bd9f322182d840f3cfaee9a49f5cbd5f426aa1b Mon Sep 17 00:00:00 2001 -From: Erik Ridderby <t...@rby.nu> -Date: Sat, 12 May 2018 08:04:26 +0200 -Subject: [PATCH] Fixed typo that prevents ConsoleKit to be detected (#1027) - ---- - src/daemon/LogindDBusTypes.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp -index 79c70312..011bb7f5 100644 ---- a/src/daemon/LogindDBusTypes.cpp -+++ b/src/daemon/LogindDBusTypes.cpp -@@ -63,7 +63,7 @@ LogindPathInternal::LogindPathInternal() - available = true; - serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); - managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); -- managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind -+ managerIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind - seatIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Seat"); - sessionIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Session"); - userIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.User"); diff --git a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch deleted file mode 100644 index a55702061c9..00000000000 --- a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fca8c808b7fa4a947a0c60157f0eb5227b3ccfff Mon Sep 17 00:00:00 2001 -From: Pier Luigi Fiorini <pierluigi.fior...@liri.io> -Date: Mon, 26 Feb 2018 09:03:05 +0100 -Subject: [PATCH] Fix race between sddm and logind - -Make sure sddm is run after logind. -An explicit dependency will make sddm run after logind every time. - -Closes: #978 ---- - services/sddm.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/services/sddm.service.in b/services/sddm.service.in -index df03d92a..9d7618c6 100644 ---- a/services/sddm.service.in -+++ b/services/sddm.service.in -@@ -2,7 +2,7 @@ - Description=Simple Desktop Display Manager - Documentation=man:sddm(1) man:sddm.conf(5) - Conflicts=getty@tty1.service --After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service -+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service - - [Service] - ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch deleted file mode 100644 index 35982bceda2..00000000000 --- a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch +++ /dev/null @@ -1,54 +0,0 @@ -Subject: [PATCH] Fix switchToGreeter not available without logind -From: Alexander Miller <alex.mil...@gmx.de> - -Seats can't be created until SeatManager's signals are -connected to the DisplayManager, or the latter won't see -them and switchToGreeter doesn't work. So split SeatManager -initialization from its constructor and call initialize it -only after all connections have been set up in DaemonApp's -constructor. - -With logind there may have been enough delay before seats -got actually added so things would work, but it's still -cleaner to fix the order. - -Fixes: https://bugs.gentoo.org/644718 -Fixes: https://github.com/sddm/sddm/issues/824 - ---- a/src/daemon/SeatManager.h -+++ b/src/daemon/SeatManager.h -@@ -31,8 +31,9 @@ namespace SDDM { - class SeatManager : public QObject { - Q_OBJECT - public: -- explicit SeatManager(QObject *parent = 0); -+ explicit SeatManager(QObject *parent = 0) : QObject(parent) {} - -+ void initialize(); - void createSeat(const QString &name); - void removeSeat(const QString &name); - void switchToGreeter(const QString &seat); ---- a/src/daemon/SeatManager.cpp -+++ b/src/daemon/SeatManager.cpp -@@ -93,8 +93,7 @@ namespace SDDM { - } - } - -- SeatManager::SeatManager(QObject *parent) : QObject(parent) { -- -+ void SeatManager::initialize() { - if (DaemonApp::instance()->testing() || !Logind::isAvailable()) { - //if we don't have logind/CK2, just create a single seat immediately and don't do any other connections - createSeat(QStringLiteral("seat0")); ---- a/src/daemon/DaemonApp.cpp -+++ b/src/daemon/DaemonApp.cpp -@@ -75,6 +75,9 @@ namespace SDDM { - - // log message - qDebug() << "Starting..."; -+ -+ // initialize seats only after signals are connected -+ m_seatManager->initialize(); - } - - bool DaemonApp::testing() const { diff --git a/x11-misc/sddm/sddm-0.17.0-r4.ebuild b/x11-misc/sddm/sddm-0.17.0-r4.ebuild deleted file mode 100644 index ba166f9c67f..00000000000 --- a/x11-misc/sddm/sddm-0.17.0-r4.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW" -inherit cmake-utils l10n systemd user - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm"; -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"; -KEYWORDS="amd64 ~arm ~arm64 x86" - -LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" -SLOT="0" -IUSE="consolekit elogind +pam systemd test" - -REQUIRED_USE="?? ( elogind systemd )" - -RDEPEND=" - >=dev-qt/qtcore-5.6:5 - >=dev-qt/qtdbus-5.6:5 - >=dev-qt/qtdeclarative-5.6:5 - >=dev-qt/qtgui-5.6:5 - >=dev-qt/qtnetwork-5.6:5 - >=x11-base/xorg-server-1.15.1 - x11-libs/libxcb[xkb] - consolekit? ( >=sys-auth/consolekit-0.9.4 ) - elogind? ( sys-auth/elogind ) - pam? ( sys-libs/pam ) - systemd? ( sys-apps/systemd:= ) - !systemd? ( sys-power/upower )" - -DEPEND="${RDEPEND} - dev-python/docutils - >=dev-qt/linguist-tools-5.6:5 - kde-frameworks/extra-cmake-modules - virtual/pkgconfig - test? ( >=dev-qt/qttest-5.6:5 )" - -PATCHES=( - "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108 - "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210 - "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 - "${FILESDIR}/${P}-consolekit.patch" # bug 647254 - "${FILESDIR}/${P}-logind-race.patch" # bug 656286 - # TODO: pending upstream - "${FILESDIR}/${P}-switchtogreeter-r1.patch" # bugs 644718, 649888, 655912 -) - -src_prepare() { - cmake-utils_src_prepare - - disable_locale() { - sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die - } - l10n_find_plocales_changes "data/translations" "" ".ts" - l10n_for_each_disabled_locale_do disable_locale - - use test || cmake_comment_add_subdirectory test -} - -src_configure() { - local mycmakeargs=( - -DENABLE_PAM=$(usex pam) - -DNO_SYSTEMD=$(usex '!systemd') - -DUSE_ELOGIND=$(usex 'elogind') - -DBUILD_MAN_PAGES=ON - -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || die -} - -pkg_postinst() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video - - systemd_reenable sddm.service -}
