* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2014-05-24 19:23 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2014-05-24 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 0799475d4dfa9eface07e9469792dce835890372
Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 18:41:40 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat May 24 18:55:53 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0799475d
prepare =x11-misc/sddm-0.1.0 for importing into the Gentoo tree
---
x11-misc/sddm/files/sddm-0.1.0-clang.patch | 58 ++++++++++++++++++++++++++
x11-misc/sddm/files/sddm-0.1.0-cmake.patch | 53 +++++++++++++++++++++++
x11-misc/sddm/metadata.xml | 32 +++++++++-----
x11-misc/sddm/sddm-0.1.0.ebuild | 67 +++++++++++++-----------------
x11-misc/sddm/sddm-9999.ebuild | 63 ++++++++++++----------------
5 files changed, 187 insertions(+), 86 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.1.0-clang.patch b/x11-misc/sddm/files/sddm-0.1.0-clang.patch
new file mode 100644
index 0000000..7f0a0e7
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.1.0-clang.patch
@@ -0,0 +1,58 @@
+clang-3.4 and earlier has a bug with intitialization of QStringList with initialization lists
+--- src/daemon/Authenticator.cpp
++++ src/daemon/Authenticator.cpp
+@@ -314,7 +314,7 @@
+ process->setProcessEnvironment(env);
+
+ // start session
+- process->start(Configuration::instance()->sessionCommand(), { command });
++ process->start(Configuration::instance()->sessionCommand(), QStringList(command));
+
+ // connect signal
+ connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished()));
+
+--- src/daemon/DisplayServer.cpp
++++ src/daemon/DisplayServer.cpp
+@@ -60,6 +60,7 @@
+ // log message
+ qDebug() << " DAEMON: Display server starting...";
+
++ QStringList start_parameters;
+ #if !TEST
+ // set process environment
+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+@@ -72,9 +73,11 @@
+ Display *display = qobject_cast<Display *>(parent());
+
+ // start display server
+- process->start(Configuration::instance()->serverPath(), { m_display, "-auth", m_authPath, "-nolisten", "tcp", QString("vt%1").arg(QString::number(display->vtNumber()), 2, '0')});
++ start_parameters << m_display << "-auth" << m_authPath << "-nolisten" << "tcp" << QString("vt%1").arg(QString::number(display->vtNumber()), 2, '0');
++ process->start(Configuration::instance()->serverPath(), start_parameters);
+ #else
+- process->start("/usr/bin/Xephyr", { m_display, "-ac", "-br", "-noreset", "-screen", "800x600"});
++ start_parameters << m_display << "-ac" << "-br" << "-noreset" << "-screen" << "800x600";
++ process->start("/usr/bin/Xephyr", start_parameters);
+ #endif
+ // wait for display server to start
+ if (!process->waitForStarted()) {
+
+--- src/daemon/Greeter.cpp
++++ src/daemon/Greeter.cpp
+@@ -70,12 +70,15 @@
+ env.insert("XCURSOR_THEME", Configuration::instance()->cursorTheme());
+ process->setProcessEnvironment(env);
+
++ QStringList start_parameters;
+ #if !TEST
+ // start greeter
+- process->start(QString("%1/sddm-greeter").arg(BIN_INSTALL_DIR), { "--socket", m_socket, "--theme", m_theme });
++ start_parameters << "--socket" << m_socket << "--theme" << m_theme;
++ process->start(QString("%1/sddm-greeter").arg(BIN_INSTALL_DIR), start_parameters);
+ #else
+ // start greeter
+- process->start(QString("%1/sddm-greeter").arg("."), { "--socket", m_socket, "--theme", m_theme });
++ start_parameters << "--socket" << m_socket << "--theme" << m_theme;
++ process->start(QString("%1/sddm-greeter").arg("."), start_parameters);
+ #endif
+ // wait for greeter to start
+ if (!process->waitForStarted()) {
diff --git a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
new file mode 100644
index 0000000..f0e68ac
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
@@ -0,0 +1,53 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -6,7 +6,7 @@
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-add_definitions(-Wall -march=native -std=c++11)
++add_definitions(-Wall -std=c++11)
+
+ if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE Release)
+@@ -19,7 +19,6 @@
+ else()
+ message(STATUS "Release build")
+ add_definitions(-DNDEBUG)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+ endif()
+
+ # PKG-CONFIG
+@@ -52,26 +51,26 @@
+
+ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+
++if(USE_systemd)
+ # login1
+-pkg_check_modules(LOGIN1 "libsystemd-login")
++pkg_check_modules(LOGIN1 REQUIRED "libsystemd-login")
+
+-if(LOGIN1_FOUND)
+- # do nothing
+ else()
+ set(LOGIN1_FOUND 0)
+ endif()
+
++if(USE_upower)
+ # upower
+-pkg_check_modules(UPOWER "upower-glib")
++pkg_check_modules(UPOWER REQUIRED "upower-glib")
+
+-if(UPOWER_FOUND)
+- # do nothing
+ else()
+ set(UPOWER_FOUND 0)
+ endif()
+
++if(USE_systemd)
+ # systemd
+-pkg_check_modules(SYSTEMD "systemd")
++pkg_check_modules(SYSTEMD REQUIRED "systemd")
++endif()
+
+ if(SYSTEMD_FOUND)
+ execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR)
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index 29819ec..81d4ce5 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -1,11 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>teknocratdefunct@riseup.net</email>
- <name>Harvey Mittens</name>
- </maintainer>
- <longdescription lang="en">
- SDDM is a modern display manager for X11 aiming to be fast, simple and beatiful. It uses modern technologies like QtQuick, which in turn gives the designer the ability to create smooth, animated user interfaces.
- </longdescription>
-</pkgmetadata>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>jauhien@gentoo.org</email>
+ <name>Jauhien Piatlicki</name>
+ </maintainer>
+ <maintainer>
+ <email>teknocratdefunct@riseup.net</email>
+ <name>Harvey Mittens</name>
+ </maintainer>
+ <use>
+ <flag name="upower">Use <pkg>sys-power/upower</pkg> for power management</flag>
+ </use>
+ <longdescription lang="en">
+ SDDM is a modern display manager for X11 aiming to be fast, simple
+ and beatiful. It uses modern technologies like QtQuick, which in
+ turn gives the designer the ability to create smooth, animated
+ user interfaces.
+ </longdescription>
+</pkgmetadata>
diff --git a/x11-misc/sddm/sddm-0.1.0.ebuild b/x11-misc/sddm/sddm-0.1.0.ebuild
index 7257ab5..46d7bcf 100644
--- a/x11-misc/sddm/sddm-0.1.0.ebuild
+++ b/x11-misc/sddm/sddm-0.1.0.ebuild
@@ -7,53 +7,44 @@ inherit cmake-utils toolchain-funcs
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/sddm/sddm.git"
- KEYWORDS=""
-else
- SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
SLOT="0"
-IUSE="+qt4 qt5 +upower"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
- upower? ( || ( sys-power/upower sys-apps/systemd ) )
- sys-auth/pambase
- x11-libs/libxcb[xkb]
- qt4? ( dev-qt/qtdeclarative:4 )
+IUSE="+qt4 qt5 systemd +upower"
+REQUIRED_USE="^^ ( qt4 qt5 )
+ ?? ( upower systemd )"
+
+RDEPEND="sys-libs/pam
+ x11-libs/libxcb[xkb(-)]
+ qt4? ( dev-qt/qtdeclarative:4
+ dev-qt/qtdbus:4 )
qt5? ( dev-qt/qtdeclarative:5
- dev-qt/qtdbus:5 )"
+ dev-qt/qtdbus:5 )
+ systemd? ( sys-apps/systemd:= )
+ upower? ( sys-power/upower:= )"
DEPEND="${RDEPEND}
- >=sys-devel/gcc-4.7.0"
-
-pkg_pretend() {
- [[ $(gcc-version) < 4.7 ]] && \
- die 'The active compiler needs to be gcc 4.7 (or newer)'
-}
-
-src_prepare() {
+ >=sys-devel/gcc-4.7.0
+ virtual/pkgconfig"
- # epatch "${FILESDIR}/sddm-pm-utils-support.patch"
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-clang.patch"
+)
- # respect our cflags
- sed -e 's|-Wall -march=native||' \
- -e 's|-O2||' \
- -i CMakeLists.txt || die 'sed failed'
- # use our location
- sed -e 's|AuthDir=/var/run/xauth|AuthDir=/run/sddm|' \
- -i data/sddm.conf.in || die
- # Replace XSession file with lxdm version
- cp -a "${FILESDIR}"/Xsession data/scripts || die
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ [[ $(gcc-version) < 4.7 ]] && \
+ die 'The active compiler needs to be gcc 4.7 (or newer)'
+ fi
}
src_configure() {
- local mycmakeargs=( $(cmake-utils_use_use qt5 QT5) )
+ local mycmakeargs=(
+ $(cmake-utils_use_use qt5 QT5)
+ $(cmake-utils_use_use systemd)
+ $(cmake-utils_use_use upower)
+ )
cmake-utils_src_configure
}
-
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 224de47..3a20b0f 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -3,58 +3,47 @@
# $Header: $
EAPI=5
-inherit cmake-utils toolchain-funcs
+inherit cmake-utils git-r3 toolchain-funcs
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/sddm/sddm.git"
- KEYWORDS=""
-else
- SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
+EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
SLOT="0"
-IUSE="+qt4 qt5 +upower"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
- upower? ( || ( sys-power/upower sys-apps/systemd ) )
- x11-libs/libxcb[xkb]
- sys-auth/pambase
- qt4? ( dev-qt/qtdeclarative:4 )
+IUSE="+qt4 qt5 systemd +upower"
+REQUIRED_USE="^^ ( qt4 qt5 )
+ ?? ( upower systemd )"
+
+RDEPEND="sys-libs/pam
+ x11-libs/libxcb[xkb(-)]
+ qt4? ( dev-qt/qtdeclarative:4
+ dev-qt/qtdbus:4 )
qt5? ( dev-qt/qtdeclarative:5
- dev-qt/qtdbus:5 )"
+ dev-qt/qtdbus:5 )
+ systemd? ( sys-apps/systemd:= )
+ upower? ( sys-power/upower:= )"
DEPEND="${RDEPEND}
- >=sys-devel/gcc-4.7.0"
-
-pkg_pretend() {
- [[ $(gcc-version) < 4.7 ]] && \
- die 'The active compiler needs to be gcc 4.7 (or newer)'
-}
+ >=sys-devel/gcc-4.7.0
+ virtual/pkgconfig"
src_prepare() {
-
- epatch "${FILESDIR}/sddm-pm-utils-support.patch"
- epatch "${FILESDIR}/pid-support.patch"
-
- # respect our cflags
+ # respect user's cflags
sed -e 's|-Wall -march=native||' \
-e 's|-O2||' \
-i CMakeLists.txt || die 'sed failed'
- # use our location
- sed -e 's|AuthDir=/var/run/xauth|AuthDir=/run/sddm|' \
- -i data/sddm.conf.in
- # Replace XSession file with lxdm version
- cp -a "${FILESDIR}"/Xsession data/scripts
+}
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ [[ $(gcc-version) < 4.7 ]] && \
+ die 'The active compiler needs to be gcc 4.7 (or newer)'
+ fi
}
src_configure() {
- local mycmakeargs=( $(cmake-utils_use_use qt5 QT5) )
+ local mycmakeargs=(
+ $(cmake-utils_use_use qt5 QT5)
+ )
cmake-utils_src_configure
}
-
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2014-05-24 19:52 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2014-05-24 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 6835b13c0e3475b5a73250303fc39098a21c1055
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat May 24 19:52:59 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat May 24 19:52:59 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6835b13c
[x11-misc/sddm] Remove 0.1.0, moved to gx86 by jauhien.
Package-Manager: portage-2.2.10
---
x11-misc/sddm/Manifest | 1 -
x11-misc/sddm/files/sddm-0.1.0-clang.patch | 58 ------------------------------
x11-misc/sddm/files/sddm-0.1.0-cmake.patch | 53 ---------------------------
x11-misc/sddm/metadata.xml | 4 ---
x11-misc/sddm/sddm-0.1.0.ebuild | 50 --------------------------
x11-misc/sddm/sddm-9999.ebuild | 1 +
6 files changed, 1 insertion(+), 166 deletions(-)
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
deleted file mode 100644
index 4882162..0000000
--- a/x11-misc/sddm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sddm-0.1.0.tar.gz 4710358 SHA256 586b87331663d2c389e27fc6cda7cfb83adcd7015aebd1dc683e4adcbe1bfc45 SHA512 b6ea89d9874e5b07f7a00b455cf1362590f0596cf521ebf13d5927b9181c316bbe8fce9d11715f6d1454f905b75681cb681bac4b7f642ffbac29b1b8ca4b6705 WHIRLPOOL d551b0c68a89c70a5255d79905db0676f01585da159819ecace6a394cf32a1c4dc395dc9a145dcfe89d046615cffdc1ef834c8064df3945fe4e647ceb748548a
diff --git a/x11-misc/sddm/files/sddm-0.1.0-clang.patch b/x11-misc/sddm/files/sddm-0.1.0-clang.patch
deleted file mode 100644
index 7f0a0e7..0000000
--- a/x11-misc/sddm/files/sddm-0.1.0-clang.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-clang-3.4 and earlier has a bug with intitialization of QStringList with initialization lists
---- src/daemon/Authenticator.cpp
-+++ src/daemon/Authenticator.cpp
-@@ -314,7 +314,7 @@
- process->setProcessEnvironment(env);
-
- // start session
-- process->start(Configuration::instance()->sessionCommand(), { command });
-+ process->start(Configuration::instance()->sessionCommand(), QStringList(command));
-
- // connect signal
- connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished()));
-
---- src/daemon/DisplayServer.cpp
-+++ src/daemon/DisplayServer.cpp
-@@ -60,6 +60,7 @@
- // log message
- qDebug() << " DAEMON: Display server starting...";
-
-+ QStringList start_parameters;
- #if !TEST
- // set process environment
- QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-@@ -72,9 +73,11 @@
- Display *display = qobject_cast<Display *>(parent());
-
- // start display server
-- process->start(Configuration::instance()->serverPath(), { m_display, "-auth", m_authPath, "-nolisten", "tcp", QString("vt%1").arg(QString::number(display->vtNumber()), 2, '0')});
-+ start_parameters << m_display << "-auth" << m_authPath << "-nolisten" << "tcp" << QString("vt%1").arg(QString::number(display->vtNumber()), 2, '0');
-+ process->start(Configuration::instance()->serverPath(), start_parameters);
- #else
-- process->start("/usr/bin/Xephyr", { m_display, "-ac", "-br", "-noreset", "-screen", "800x600"});
-+ start_parameters << m_display << "-ac" << "-br" << "-noreset" << "-screen" << "800x600";
-+ process->start("/usr/bin/Xephyr", start_parameters);
- #endif
- // wait for display server to start
- if (!process->waitForStarted()) {
-
---- src/daemon/Greeter.cpp
-+++ src/daemon/Greeter.cpp
-@@ -70,12 +70,15 @@
- env.insert("XCURSOR_THEME", Configuration::instance()->cursorTheme());
- process->setProcessEnvironment(env);
-
-+ QStringList start_parameters;
- #if !TEST
- // start greeter
-- process->start(QString("%1/sddm-greeter").arg(BIN_INSTALL_DIR), { "--socket", m_socket, "--theme", m_theme });
-+ start_parameters << "--socket" << m_socket << "--theme" << m_theme;
-+ process->start(QString("%1/sddm-greeter").arg(BIN_INSTALL_DIR), start_parameters);
- #else
- // start greeter
-- process->start(QString("%1/sddm-greeter").arg("."), { "--socket", m_socket, "--theme", m_theme });
-+ start_parameters << "--socket" << m_socket << "--theme" << m_theme;
-+ process->start(QString("%1/sddm-greeter").arg("."), start_parameters);
- #endif
- // wait for greeter to start
- if (!process->waitForStarted()) {
diff --git a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
deleted file mode 100644
index f0e68ac..0000000
--- a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -6,7 +6,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_AUTOMOC ON)
-
--add_definitions(-Wall -march=native -std=c++11)
-+add_definitions(-Wall -std=c++11)
-
- if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE Release)
-@@ -19,7 +19,6 @@
- else()
- message(STATUS "Release build")
- add_definitions(-DNDEBUG)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
- endif()
-
- # PKG-CONFIG
-@@ -52,26 +51,26 @@
-
- add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-
-+if(USE_systemd)
- # login1
--pkg_check_modules(LOGIN1 "libsystemd-login")
-+pkg_check_modules(LOGIN1 REQUIRED "libsystemd-login")
-
--if(LOGIN1_FOUND)
-- # do nothing
- else()
- set(LOGIN1_FOUND 0)
- endif()
-
-+if(USE_upower)
- # upower
--pkg_check_modules(UPOWER "upower-glib")
-+pkg_check_modules(UPOWER REQUIRED "upower-glib")
-
--if(UPOWER_FOUND)
-- # do nothing
- else()
- set(UPOWER_FOUND 0)
- endif()
-
-+if(USE_systemd)
- # systemd
--pkg_check_modules(SYSTEMD "systemd")
-+pkg_check_modules(SYSTEMD REQUIRED "systemd")
-+endif()
-
- if(SYSTEMD_FOUND)
- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR)
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index 81d4ce5..d2d2be4 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -5,10 +5,6 @@
<email>jauhien@gentoo.org</email>
<name>Jauhien Piatlicki</name>
</maintainer>
- <maintainer>
- <email>teknocratdefunct@riseup.net</email>
- <name>Harvey Mittens</name>
- </maintainer>
<use>
<flag name="upower">Use <pkg>sys-power/upower</pkg> for power management</flag>
</use>
diff --git a/x11-misc/sddm/sddm-0.1.0.ebuild b/x11-misc/sddm/sddm-0.1.0.ebuild
deleted file mode 100644
index 46d7bcf..0000000
--- a/x11-misc/sddm/sddm-0.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
-SLOT="0"
-IUSE="+qt4 qt5 systemd +upower"
-REQUIRED_USE="^^ ( qt4 qt5 )
- ?? ( upower systemd )"
-
-RDEPEND="sys-libs/pam
- x11-libs/libxcb[xkb(-)]
- qt4? ( dev-qt/qtdeclarative:4
- dev-qt/qtdbus:4 )
- qt5? ( dev-qt/qtdeclarative:5
- dev-qt/qtdbus:5 )
- systemd? ( sys-apps/systemd:= )
- upower? ( sys-power/upower:= )"
-DEPEND="${RDEPEND}
- >=sys-devel/gcc-4.7.0
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-clang.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-version) < 4.7 ]] && \
- die 'The active compiler needs to be gcc 4.7 (or newer)'
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_use qt5 QT5)
- $(cmake-utils_use_use systemd)
- $(cmake-utils_use_use upower)
- )
- cmake-utils_src_configure
-}
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 3a20b0f..21df8f3 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -8,6 +8,7 @@ inherit cmake-utils git-r3 toolchain-funcs
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm"
EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
+KEYWORDS=""
LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
SLOT="0"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2014-06-04 13:41 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2014-06-04 13:41 UTC (permalink / raw
To: gentoo-commits
commit: 9d5fba9a8ff1a3a5a4d964776348d906d9291cdd
Author: Mika Kobayashi <wjn <AT> inter7 <DOT> jp>
AuthorDate: Mon Jun 2 22:05:32 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 2 22:09:45 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9d5fba9a
[x11-misc/sddm] added the patch for consolekit (equally official gentoo repository)
---
x11-misc/sddm/files/sddm-9999-consolekit.patch | 19 +++++++++++++++++++
x11-misc/sddm/sddm-9999.ebuild | 4 +++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/x11-misc/sddm/files/sddm-9999-consolekit.patch b/x11-misc/sddm/files/sddm-9999-consolekit.patch
new file mode 100644
index 0000000..a5ac62a
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-9999-consolekit.patch
@@ -0,0 +1,19 @@
+--- data/scripts/Xsession
++++ data/scripts/Xsession
+@@ -74,13 +74,13 @@
+ exec xterm -geometry 80x24-0-0
+ ;;
+ custom)
+- exec $HOME/.xsession
++ exec ck-launch-session $HOME/.xsession
+ ;;
+ default)
+- exec /usr/bin/startkde
++ exec ck-launch-session /usr/bin/startkde
+ ;;
+ *)
+- eval exec "$session"
++ eval ck-launch-session "$session"
+ ;;
+ esac
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 89850bc..b5bf554 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=""
LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
SLOT="0"
-IUSE="+qt4 qt5 systemd +upower"
+IUSE="consolekit +qt4 qt5 systemd +upower"
REQUIRED_USE="^^ ( qt4 qt5 )
?? ( upower systemd )"
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
+ use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
+
# respect user's cflags
sed -e 's|-Wall -march=native||' \
-e 's|-O2||' \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2014-10-19 1:30 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2014-10-19 1:30 UTC (permalink / raw
To: gentoo-commits
commit: 3543e0ac77a51f975e1c6175f2a64d2eacacd404
Author: Jauhien Piatlicki <jpiatlicki <AT> zertisa <DOT> com>
AuthorDate: Sat Oct 18 18:12:53 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Oct 18 18:12:53 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3543e0ac
[x11-misc/sddm] sync with tree: fix bug 524072 and temporary fix bug 523630
---
x11-misc/sddm/files/sddm-9999-upower.patch | 12 ++++++++++++
x11-misc/sddm/sddm-9999.ebuild | 2 ++
2 files changed, 14 insertions(+)
diff --git a/x11-misc/sddm/files/sddm-9999-upower.patch b/x11-misc/sddm/files/sddm-9999-upower.patch
new file mode 100644
index 0000000..8c0f34c
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-9999-upower.patch
@@ -0,0 +1,12 @@
+diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp sddm-0.9.0/src/daemon/PowerManager.cpp
+--- sddm-0.9.0.orig/src/daemon/PowerManager.cpp 2014-10-01 18:40:37.402683578 +0200
++++ sddm-0.9.0/src/daemon/PowerManager.cpp 2014-10-01 18:40:43.502618164 +0200
+@@ -197,7 +197,7 @@
+ m_backends << new Login1Backend();
+
+ // check if upower interface exists
+- if (interface->isServiceRegistered(UPOWER_SERVICE))
++// if (interface->isServiceRegistered(UPOWER_SERVICE))
+ m_backends << new UPowerBackend();
+ }
+
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 548297a..48ba4c8 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -16,6 +16,7 @@ IUSE="consolekit systemd +upower"
REQUIRED_USE="?? ( upower systemd )"
RDEPEND="sys-libs/pam
+ >=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb(-)]
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -37,6 +38,7 @@ pkg_pretend() {
src_prepare() {
use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
+ use upower && epatch "${FILESDIR}/${P}-upower.patch"
# respect user's cflags
sed -e 's|-Wall -march=native||' \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2018-11-13 17:52 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2018-11-13 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 63dc5de0f0108967ade6a8339b917f19c5e1e882
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 17:36:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 17:38:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=63dc5de0
x11-misc/sddm: Sync with 0.18.0 from Gentoo ebuild repository
Add USE elogind support
Use l10n and systemd eclass
Raise to Qt 5.9.4 minimum
Switch to https
Update maintainers
Closes: https://bugs.gentoo.org/671076
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
....patch => sddm-0.12.0-respect-user-flags.patch} | 0
x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch | 20 ++++
x11-misc/sddm/files/sddm-0.18.0-Xsession.patch | 24 +++++
x11-misc/sddm/files/sddm-9999-consolekit.patch | 11 ---
x11-misc/sddm/metadata.xml | 14 ++-
x11-misc/sddm/sddm-9999.ebuild | 104 +++++++++++++--------
6 files changed, 116 insertions(+), 57 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-9999-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
similarity index 100%
rename from x11-misc/sddm/files/sddm-9999-respect-user-flags.patch
rename to x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
new file mode 100644
index 00000000..bbe2a272
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
@@ -0,0 +1,20 @@
+SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
+has the same interface names as logind.
+
+This patch forces sddm to use legacy behaviour when consolekit2 is detected.
+
+Bug: https://bugs.gentoo.org/633920
+Bug: https://github.com/sddm/sddm/issues/903
+Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
+
+--- a/src/daemon/LogindDBusTypes.cpp
++++ b/src/daemon/LogindDBusTypes.cpp
+@@ -60,7 +60,7 @@
+
+ if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
+ qDebug() << "Console kit interface found";
+- available = true;
++ available = false;
+ serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
+ managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
+ managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind
diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
new file mode 100644
index 00000000..41c813a0
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
@@ -0,0 +1,24 @@
+--- 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-9999-consolekit.patch b/x11-misc/sddm/files/sddm-9999-consolekit.patch
deleted file mode 100644
index 692ee174..00000000
--- a/x11-misc/sddm/files/sddm-9999-consolekit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/data/scripts/Xsession b/data/scripts/Xsession
-index 0c923a8..eae4f28 100755
---- a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -91,5 +91,5 @@ fi
- if [ -z "$@" ]; then
- exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
- else
-- exec $@
-+ exec ck-launch-session $@
- fi
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index 292acc2a..43cf40aa 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>jauhien@gentoo.org</email>
- <name>Jauhien Piatlicki</name>
- </maintainer>
<maintainer type="project">
<email>lxqt@gentoo.org</email>
<name>LXQt</name>
</maintainer>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
- <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support)</flag>
+ <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit (no native support)</flag>
+ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
</use>
<longdescription lang="en">
SDDM is a modern display manager for X11 aiming to be fast, simple
@@ -18,4 +19,7 @@
turn gives the designer the ability to create smooth, animated
user interfaces.
</longdescription>
+ <upstream>
+ <remote-id type="github">sddm/sddm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 62e892d9..ab2baac2 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -1,79 +1,101 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit cmake-utils git-r3 user
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
+fi
+
+PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu ie is 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"
-EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
-KEYWORDS=""
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
-IUSE="consolekit +pam systemd"
+IUSE="consolekit elogind +pam systemd test"
-RDEPEND=">=dev-qt/qtcore-5.6:5
- >=dev-qt/qtdbus-5.6:5
- >=dev-qt/qtgui-5.6:5
- >=dev-qt/qtdeclarative-5.6:5
- >=dev-qt/qtnetwork-5.6:5
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+ >=dev-qt/qtcore-5.9.4:5
+ >=dev-qt/qtdbus-5.9.4:5
+ >=dev-qt/qtdeclarative-5.9.4:5
+ >=dev-qt/qtgui-5.9.4:5
+ >=dev-qt/qtnetwork-5.9.4:5
>=x11-base/xorg-server-1.15.1
- x11-libs/libxcb[xkb(-)]
+ 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 sys-power/upower-pm-utils ) )"
+ !systemd? ( sys-power/upower )"
DEPEND="${RDEPEND}
dev-python/docutils
- >=dev-qt/linguist-tools-5.6:5
- >=dev-qt/qttest-5.6:5
+ >=dev-qt/linguist-tools-5.9.4:5
kde-frameworks/extra-cmake-modules
- virtual/pkgconfig"
+ virtual/pkgconfig
+ test? ( >=dev-qt/qttest-5.9.4:5 )"
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
- if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
- die 'The active compiler needs to be gcc 4.7 (or newer)'
- fi
- fi
-}
+PATCHES=(
+ "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
+ "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
+ # TODO: fix properly
+ "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+)
src_prepare() {
- # fix for flags handling and bug 563108
- eapply "${FILESDIR}/${P}-respect-user-flags.patch"
- use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch"
-
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
+
+ if ! use test; then
+ sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
+ cmake_comment_add_subdirectory test
+ fi
}
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
+
+ # Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
+ local confd="/usr/lib/sddm/sddm.conf.d"
+ dodir ${confd}
+ "${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
+ || die "Failed to create 00default.conf"
+ sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
+ -i "${D}/${confd}"/00default.conf || die
+}
+
pkg_postinst() {
+ elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
+ elog "Use it to override specific options. SDDM defaults are now"
+ elog "found in: /usr/lib/sddm/sddm.conf.d/00default.conf"
+
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
- if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
- local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
- if [[ -z ${line} ]]; then
- ewarn
- ewarn "Erroneous /etc/pam.d/system-login settings detected!"
- ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
- ewarn
- ewarn "session optional pam_ck_connector.so nox11"
- ewarn
- ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
- ewarn
- fi
- fi
+ systemd_reenable sddm.service
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2019-10-26 17:23 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2019-10-26 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 1702c34efe03cd2511d01260f45e5e8e1b46fc99
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 17:22:44 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 17:22:44 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1702c34e
x11-misc/sddm: EAPI-7 bump, sync with Gentoo ebuild repo
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...m-0.18.1-honor-PAM-supplemental-groups-v2.patch | 182 +++++++++++++++++++++
...18.1-revert-honor-PAM-supplemental-groups.patch | 87 ++++++++++
x11-misc/sddm/sddm-9999.ebuild | 29 ++--
3 files changed, 288 insertions(+), 10 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch b/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
new file mode 100644
index 00000000..f4ce7ae7
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
@@ -0,0 +1,182 @@
+From 75e6e00d9e1ecf25e3a9c8332530a1e40d737cdb Mon Sep 17 00:00:00 2001
+From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de>
+Date: Thu, 9 May 2019 03:06:48 +0200
+Subject: [PATCH] Honor PAM's supplemental groups (v2) (#834, #1159)
+
+This moves the supplemental group initialization step from
+UserSession.cpp to the Backend system, so that the Pam Backend can
+inject additional supplemental groups via modules like pam_group.so.
+
+pam_setcred(3) assumes that it operates on an already initialized
+supplemental group list. However, PamBackend calls
+pam_setcred(PAM_ESTABLISH_CRED) earlier, at the start
+PamBackend::openSession, so a pam_setcred(PAM_REINITIALIZE_CRED) call
+must be issued to repeat the injection of PAM's supplemental groups.
+---
+ src/helper/Backend.cpp | 5 +++++
+ src/helper/Backend.h | 3 +++
+ src/helper/HelperApp.cpp | 4 ++++
+ src/helper/HelperApp.h | 1 +
+ src/helper/UserSession.cpp | 13 ++++++++-----
+ src/helper/backend/PamBackend.cpp | 18 ++++++++++++++++++
+ src/helper/backend/PamBackend.h | 2 ++
+ 7 files changed, 41 insertions(+), 5 deletions(-)
+
+diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp
+index d6bb4d0a..35ae2bdf 100644
+--- a/src/helper/Backend.cpp
++++ b/src/helper/Backend.cpp
+@@ -29,6 +29,7 @@
+ #include <QtCore/QProcessEnvironment>
+
+ #include <pwd.h>
++#include <grp.h>
+
+ namespace SDDM {
+ Backend::Backend(HelperApp* parent)
+@@ -79,4 +80,8 @@ namespace SDDM {
+ bool Backend::closeSession() {
+ return true;
+ }
++
++ bool Backend::setupSupplementalGroups(struct passwd *pw) {
++ return !initgroups(pw->pw_name, pw->pw_gid);
++ }
+ }
+diff --git a/src/helper/Backend.h b/src/helper/Backend.h
+index b790e001..3caf1592 100644
+--- a/src/helper/Backend.h
++++ b/src/helper/Backend.h
+@@ -22,6 +22,7 @@
+ #define BACKEND_H
+
+ #include <QtCore/QObject>
++#include <pwd.h>
+
+ namespace SDDM {
+ class HelperApp;
+@@ -38,6 +39,8 @@ namespace SDDM {
+ void setAutologin(bool on = true);
+ void setGreeter(bool on = true);
+
++ virtual bool setupSupplementalGroups(struct passwd *pw);
++
+ public slots:
+ virtual bool start(const QString &user = QString()) = 0;
+ virtual bool authenticate() = 0;
+diff --git a/src/helper/HelperApp.cpp b/src/helper/HelperApp.cpp
+index cad93bd8..d0891d75 100644
+--- a/src/helper/HelperApp.cpp
++++ b/src/helper/HelperApp.cpp
+@@ -253,6 +253,10 @@ namespace SDDM {
+ return m_session;
+ }
+
++ Backend *HelperApp::backend() {
++ return m_backend;
++ }
++
+ const QString& HelperApp::user() const {
+ return m_user;
+ }
+diff --git a/src/helper/HelperApp.h b/src/helper/HelperApp.h
+index 3742df12..cb5959a7 100644
+--- a/src/helper/HelperApp.h
++++ b/src/helper/HelperApp.h
+@@ -39,6 +39,7 @@ namespace SDDM {
+ virtual ~HelperApp();
+
+ UserSession *session();
++ Backend *backend();
+ const QString &user() const;
+ const QString &cookie() const;
+
+diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
+index f71fd358..62fd4d70 100644
+--- a/src/helper/UserSession.cpp
++++ b/src/helper/UserSession.cpp
+@@ -19,6 +19,7 @@
+ *
+ */
+
++#include "Backend.h"
+ #include "Configuration.h"
+ #include "UserSession.h"
+ #include "HelperApp.h"
+@@ -129,7 +130,8 @@ namespace SDDM {
+ #endif
+
+ // switch user
+- const QByteArray username = qobject_cast<HelperApp*>(parent())->user().toLocal8Bit();
++ HelperApp* app = qobject_cast<HelperApp*>(parent());
++ const QByteArray username = app->user().toLocal8Bit();
+ struct passwd pw;
+ struct passwd *rpw;
+ long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+@@ -146,12 +148,13 @@ namespace SDDM {
+ qCritical() << "getpwnam_r(" << username << ") failed with error: " << strerror(err);
+ exit(Auth::HELPER_OTHER_ERROR);
+ }
+- if (setgid(pw.pw_gid) != 0) {
+- qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
++
++ if (!app->backend()->setupSupplementalGroups(&pw)) {
++ qCritical() << "failed to set up supplemental groups for user: " << username;
+ exit(Auth::HELPER_OTHER_ERROR);
+ }
+- if (initgroups(pw.pw_name, pw.pw_gid) != 0) {
+- qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username;
++ if (setgid(pw.pw_gid) != 0) {
++ qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
+ exit(Auth::HELPER_OTHER_ERROR);
+ }
+ if (setuid(pw.pw_uid) != 0) {
+diff --git a/src/helper/backend/PamBackend.cpp b/src/helper/backend/PamBackend.cpp
+index f86d77d6..cccfa258 100644
+--- a/src/helper/backend/PamBackend.cpp
++++ b/src/helper/backend/PamBackend.cpp
+@@ -289,6 +289,24 @@ namespace SDDM {
+ return QString::fromLocal8Bit((const char*) m_pam->getItem(PAM_USER));
+ }
+
++ bool PamBackend::setupSupplementalGroups(struct passwd *pw) {
++ if (!Backend::setupSupplementalGroups(pw))
++ return false;
++
++ // pam_setcred(3) may inject additional groups into the user's
++ // list of supplemental groups, and assumes that the user's
++ // supplemental groups have already been initialized before
++ // its invocation. Since pam_setcred was already called at the
++ // start of openSession, we need to repeat this step here as
++ // the user's groups have only just now been initialized.
++
++ if (!m_pam->setCred(PAM_REINITIALIZE_CRED)) {
++ m_app->error(m_pam->errorString(), Auth::ERROR_AUTHENTICATION);
++ return false;
++ }
++ return true;
++ }
++
+ int PamBackend::converse(int n, const struct pam_message **msg, struct pam_response **resp) {
+ qDebug() << "[PAM] Conversation with" << n << "messages";
+
+diff --git a/src/helper/backend/PamBackend.h b/src/helper/backend/PamBackend.h
+index 4c8b4b35..5b079099 100644
+--- a/src/helper/backend/PamBackend.h
++++ b/src/helper/backend/PamBackend.h
+@@ -28,6 +28,7 @@
+ #include <QtCore/QObject>
+
+ #include <security/pam_appl.h>
++#include <pwd.h>
+
+ namespace SDDM {
+ class PamHandle;
+@@ -61,6 +62,7 @@ namespace SDDM {
+ explicit PamBackend(HelperApp *parent);
+ virtual ~PamBackend();
+ int converse(int n, const struct pam_message **msg, struct pam_response **resp);
++ virtual bool setupSupplementalGroups(struct passwd *pw);
+
+ public slots:
+ virtual bool start(const QString &user = QString());
diff --git a/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch b/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch
new file mode 100644
index 00000000..f14ff767
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch
@@ -0,0 +1,87 @@
+From d3953e88a94ec25a87d3c5136517b3d1009cb1fd Mon Sep 17 00:00:00 2001
+From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de>
+Date: Wed, 8 May 2019 18:58:53 +0200
+Subject: [PATCH] Revert "Honor PAM's ambient supplemental groups. (#834)"
+
+This reverts commit 1bc813d08b8130e458a6550ec47fb2bfbe6de080, which
+misuses PAM and leads to pulling in all of root's supplemental groups
+during session initialization instead of only adding PAM's extra
+groups. The problem was masked due to the root user not having any
+supplemental groups in some common contexts, like running sddm from a
+systemd unit.
+---
+ src/helper/UserSession.cpp | 57 --------------------------------------
+ 1 file changed, 57 deletions(-)
+
+diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
+index b3aec356..f71fd358 100644
+--- a/src/helper/UserSession.cpp
++++ b/src/helper/UserSession.cpp
+@@ -150,67 +150,10 @@ namespace SDDM {
+ qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
+ exit(Auth::HELPER_OTHER_ERROR);
+ }
+-
+-#ifdef USE_PAM
+-
+- // fetch ambient groups from PAM's environment;
+- // these are set by modules such as pam_groups.so
+- int n_pam_groups = getgroups(0, NULL);
+- gid_t *pam_groups = NULL;
+- if (n_pam_groups > 0) {
+- pam_groups = new gid_t[n_pam_groups];
+- if ((n_pam_groups = getgroups(n_pam_groups, pam_groups)) == -1) {
+- qCritical() << "getgroups() failed to fetch supplemental"
+- << "PAM groups for user:" << username;
+- exit(Auth::HELPER_OTHER_ERROR);
+- }
+- } else {
+- n_pam_groups = 0;
+- }
+-
+- // fetch session's user's groups
+- int n_user_groups = 0;
+- gid_t *user_groups = NULL;
+- if (-1 == getgrouplist(username.constData(), pw.pw_gid,
+- NULL, &n_user_groups)) {
+- user_groups = new gid_t[n_user_groups];
+- if ((n_user_groups = getgrouplist(username.constData(),
+- pw.pw_gid, user_groups,
+- &n_user_groups)) == -1 ) {
+- qCritical() << "getgrouplist(" << username << ", " << pw.pw_gid
+- << ") failed";
+- exit(Auth::HELPER_OTHER_ERROR);
+- }
+- }
+-
+- // set groups to concatenation of PAM's ambient
+- // groups and the session's user's groups
+- int n_groups = n_pam_groups + n_user_groups;
+- if (n_groups > 0) {
+- gid_t *groups = new gid_t[n_groups];
+- memcpy(groups, pam_groups, (n_pam_groups * sizeof(gid_t)));
+- memcpy((groups + n_pam_groups), user_groups,
+- (n_user_groups * sizeof(gid_t)));
+-
+- // setgroups(2) handles duplicate groups
+- if (setgroups(n_groups, groups) != 0) {
+- qCritical() << "setgroups() failed for user: " << username;
+- exit (Auth::HELPER_OTHER_ERROR);
+- }
+- delete[] groups;
+- }
+- delete[] pam_groups;
+- delete[] user_groups;
+-
+-#else
+-
+ if (initgroups(pw.pw_name, pw.pw_gid) != 0) {
+ qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username;
+ exit(Auth::HELPER_OTHER_ERROR);
+ }
+-
+-#endif /* USE_PAM */
+-
+ if (setuid(pw.pw_uid) != 0) {
+ qCritical() << "setuid(" << pw.pw_uid << ") failed for user: " << username;
+ exit(Auth::HELPER_OTHER_ERROR);
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index ab2baac2..64e6785b 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
else
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu ie is 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"
@@ -23,6 +23,12 @@ IUSE="consolekit elogind +pam systemd test"
REQUIRED_USE="?? ( elogind systemd )"
+BDEPEND="
+ dev-python/docutils
+ >=dev-qt/linguist-tools-5.9.4:5
+ kde-frameworks/extra-cmake-modules:5
+ virtual/pkgconfig
+"
RDEPEND="
>=dev-qt/qtcore-5.9.4:5
>=dev-qt/qtdbus-5.9.4:5
@@ -35,18 +41,18 @@ RDEPEND="
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
systemd? ( sys-apps/systemd:= )
- !systemd? ( sys-power/upower )"
-
+ !systemd? ( sys-power/upower )
+"
DEPEND="${RDEPEND}
- dev-python/docutils
- >=dev-qt/linguist-tools-5.9.4:5
- kde-frameworks/extra-cmake-modules
- virtual/pkgconfig
- test? ( >=dev-qt/qttest-5.9.4:5 )"
+ test? ( >=dev-qt/qttest-5.9.4:5 )
+"
PATCHES=(
"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
"${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
+ # fix for groups: https://github.com/sddm/sddm/issues/1159
+ "${FILESDIR}/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch"
+ "${FILESDIR}/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch"
# TODO: fix properly
"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
)
@@ -85,7 +91,10 @@ src_install() {
dodir ${confd}
"${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
|| die "Failed to create 00default.conf"
+
sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
+ -e "/^ReuseSession/s/false/true/" \
+ -e "/^EnableHiDPI/s/false/true/" \
-i "${D}/${confd}"/00default.conf || die
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2021-01-01 18:58 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2021-01-01 18:58 UTC (permalink / raw
To: gentoo-commits
commit: 255c77d9f60c74e05cdda384da3b3c06bf62b9a6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 18:51:25 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 18:51:25 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=255c77d9
x11-misc/sddm: Update patches
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...t-user-flags.patch => sddm-0.18.1-respect-user-flags.patch} | 9 ++++-----
.../{sddm-0.18.0-Xsession.patch => sddm-0.19.0-Xsession.patch} | 8 ++++----
x11-misc/sddm/sddm-9999.ebuild | 10 ++++++----
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
similarity index 69%
rename from x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
rename to x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
index fc450169..6801fa79 100644
--- a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
+++ b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
@@ -1,9 +1,8 @@
-diff -u CMakeLists.txt CMakeLists.txt
---- a/CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200
-+++ b/CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200
-@@ -35,22 +35,6 @@
+--- a/CMakeLists.txt 2020-10-12 13:03:39.000000000 +0200
++++ b/CMakeLists.txt 2020-10-12 23:40:04.480687143 +0200
+@@ -41,22 +41,6 @@
# Definitions
- add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII)
+ add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_FOREACH)
-# Default build type
-if(NOT CMAKE_BUILD_TYPE)
diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
similarity index 62%
rename from x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
rename to x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
index 41c813a0..e1e3c152 100644
--- a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
+++ b/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
@@ -1,11 +1,11 @@
---- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200
-+++ b/data/scripts/Xsession 2017-10-21 15:25:47.668886596 +0200
+--- a/data/scripts/Xsession
++++ b/data/scripts/Xsession
@@ -50,6 +50,10 @@
;;
esac
-+# Make D-Bus and ConsoleKit start properly, see:
-+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
++# Make D-Bus start properly, see:
++# /etc/X11/xinit/xinitrc.d/80-dbus
+command="$@"
+
[ -f /etc/xprofile ] && . /etc/xprofile
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index e5d3a7ec..30319842 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -49,11 +49,13 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
- "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
+ # Pending upstream
# fix for groups: https://github.com/sddm/sddm/issues/1159
- "${FILESDIR}/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch"
- "${FILESDIR}/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch"
+ "${FILESDIR}"/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch
+ "${FILESDIR}"/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch
+ # Downstream patches
+ "${FILESDIR}"/${PN}-0.18.1-respect-user-flags.patch # bug 563108
+ "${FILESDIR}"/${PN}-0.19.0-Xsession.patch # bug 611210
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2022-07-10 14:51 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2022-07-10 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 105ba0f819e429f86c8b0ca1456ae704ffb4d527
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 14:51:11 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 14:51:11 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=105ba0f8
x11-misc/sddm: Sync Gentoo ebuild repo changes, drop broken patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-misc/sddm/files/pam-1.4-substack.patch | 31 ++++
...m-0.18.1-honor-PAM-supplemental-groups-v2.patch | 182 ---------------------
...18.1-revert-honor-PAM-supplemental-groups.patch | 87 ----------
x11-misc/sddm/sddm-9999.ebuild | 88 +++++-----
4 files changed, 82 insertions(+), 306 deletions(-)
diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch b/x11-misc/sddm/files/pam-1.4-substack.patch
new file mode 100644
index 00000000..b0467b26
--- /dev/null
+++ b/x11-misc/sddm/files/pam-1.4-substack.patch
@@ -0,0 +1,31 @@
+--- sddm-0.18.1/services/sddm-autologin.pam.bak 2020-06-19 22:27:57.305580696 +0200
++++ sddm-0.18.1/services/sddm-autologin.pam 2020-06-19 22:30:50.513583973 +0200
+@@ -1,6 +1,5 @@
+ #%PAM-1.0
+ auth required pam_env.so
+-auth required pam_tally.so file=/var/log/faillog onerr=succeed
+ auth required pam_shells.so
+ auth required pam_nologin.so
+ auth required pam_permit.so
+--- sddm-0.18.1/services/sddm.pam.bak 2020-06-19 22:27:26.721580117 +0200
++++ sddm-0.18.1/services/sddm.pam 2020-06-19 22:27:48.729580533 +0200
+@@ -1,15 +1,15 @@
+ #%PAM-1.0
+
+-auth include system-login
++auth substack system-login
+ -auth optional pam_gnome_keyring.so
+ -auth optional pam_kwallet5.so
+
+-account include system-login
++account substack system-login
+
+-password include system-login
++password substack system-login
+ -password optional pam_gnome_keyring.so use_authtok
+
+ session optional pam_keyinit.so force revoke
+-session include system-login
++session substack system-login
+ -session optional pam_gnome_keyring.so auto_start
+ -session optional pam_kwallet5.so auto_start
\ No newline at end of file
diff --git a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch b/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
deleted file mode 100644
index f4ce7ae7..00000000
--- a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 75e6e00d9e1ecf25e3a9c8332530a1e40d737cdb Mon Sep 17 00:00:00 2001
-From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de>
-Date: Thu, 9 May 2019 03:06:48 +0200
-Subject: [PATCH] Honor PAM's supplemental groups (v2) (#834, #1159)
-
-This moves the supplemental group initialization step from
-UserSession.cpp to the Backend system, so that the Pam Backend can
-inject additional supplemental groups via modules like pam_group.so.
-
-pam_setcred(3) assumes that it operates on an already initialized
-supplemental group list. However, PamBackend calls
-pam_setcred(PAM_ESTABLISH_CRED) earlier, at the start
-PamBackend::openSession, so a pam_setcred(PAM_REINITIALIZE_CRED) call
-must be issued to repeat the injection of PAM's supplemental groups.
----
- src/helper/Backend.cpp | 5 +++++
- src/helper/Backend.h | 3 +++
- src/helper/HelperApp.cpp | 4 ++++
- src/helper/HelperApp.h | 1 +
- src/helper/UserSession.cpp | 13 ++++++++-----
- src/helper/backend/PamBackend.cpp | 18 ++++++++++++++++++
- src/helper/backend/PamBackend.h | 2 ++
- 7 files changed, 41 insertions(+), 5 deletions(-)
-
-diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp
-index d6bb4d0a..35ae2bdf 100644
---- a/src/helper/Backend.cpp
-+++ b/src/helper/Backend.cpp
-@@ -29,6 +29,7 @@
- #include <QtCore/QProcessEnvironment>
-
- #include <pwd.h>
-+#include <grp.h>
-
- namespace SDDM {
- Backend::Backend(HelperApp* parent)
-@@ -79,4 +80,8 @@ namespace SDDM {
- bool Backend::closeSession() {
- return true;
- }
-+
-+ bool Backend::setupSupplementalGroups(struct passwd *pw) {
-+ return !initgroups(pw->pw_name, pw->pw_gid);
-+ }
- }
-diff --git a/src/helper/Backend.h b/src/helper/Backend.h
-index b790e001..3caf1592 100644
---- a/src/helper/Backend.h
-+++ b/src/helper/Backend.h
-@@ -22,6 +22,7 @@
- #define BACKEND_H
-
- #include <QtCore/QObject>
-+#include <pwd.h>
-
- namespace SDDM {
- class HelperApp;
-@@ -38,6 +39,8 @@ namespace SDDM {
- void setAutologin(bool on = true);
- void setGreeter(bool on = true);
-
-+ virtual bool setupSupplementalGroups(struct passwd *pw);
-+
- public slots:
- virtual bool start(const QString &user = QString()) = 0;
- virtual bool authenticate() = 0;
-diff --git a/src/helper/HelperApp.cpp b/src/helper/HelperApp.cpp
-index cad93bd8..d0891d75 100644
---- a/src/helper/HelperApp.cpp
-+++ b/src/helper/HelperApp.cpp
-@@ -253,6 +253,10 @@ namespace SDDM {
- return m_session;
- }
-
-+ Backend *HelperApp::backend() {
-+ return m_backend;
-+ }
-+
- const QString& HelperApp::user() const {
- return m_user;
- }
-diff --git a/src/helper/HelperApp.h b/src/helper/HelperApp.h
-index 3742df12..cb5959a7 100644
---- a/src/helper/HelperApp.h
-+++ b/src/helper/HelperApp.h
-@@ -39,6 +39,7 @@ namespace SDDM {
- virtual ~HelperApp();
-
- UserSession *session();
-+ Backend *backend();
- const QString &user() const;
- const QString &cookie() const;
-
-diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
-index f71fd358..62fd4d70 100644
---- a/src/helper/UserSession.cpp
-+++ b/src/helper/UserSession.cpp
-@@ -19,6 +19,7 @@
- *
- */
-
-+#include "Backend.h"
- #include "Configuration.h"
- #include "UserSession.h"
- #include "HelperApp.h"
-@@ -129,7 +130,8 @@ namespace SDDM {
- #endif
-
- // switch user
-- const QByteArray username = qobject_cast<HelperApp*>(parent())->user().toLocal8Bit();
-+ HelperApp* app = qobject_cast<HelperApp*>(parent());
-+ const QByteArray username = app->user().toLocal8Bit();
- struct passwd pw;
- struct passwd *rpw;
- long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
-@@ -146,12 +148,13 @@ namespace SDDM {
- qCritical() << "getpwnam_r(" << username << ") failed with error: " << strerror(err);
- exit(Auth::HELPER_OTHER_ERROR);
- }
-- if (setgid(pw.pw_gid) != 0) {
-- qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
-+
-+ if (!app->backend()->setupSupplementalGroups(&pw)) {
-+ qCritical() << "failed to set up supplemental groups for user: " << username;
- exit(Auth::HELPER_OTHER_ERROR);
- }
-- if (initgroups(pw.pw_name, pw.pw_gid) != 0) {
-- qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username;
-+ if (setgid(pw.pw_gid) != 0) {
-+ qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
- exit(Auth::HELPER_OTHER_ERROR);
- }
- if (setuid(pw.pw_uid) != 0) {
-diff --git a/src/helper/backend/PamBackend.cpp b/src/helper/backend/PamBackend.cpp
-index f86d77d6..cccfa258 100644
---- a/src/helper/backend/PamBackend.cpp
-+++ b/src/helper/backend/PamBackend.cpp
-@@ -289,6 +289,24 @@ namespace SDDM {
- return QString::fromLocal8Bit((const char*) m_pam->getItem(PAM_USER));
- }
-
-+ bool PamBackend::setupSupplementalGroups(struct passwd *pw) {
-+ if (!Backend::setupSupplementalGroups(pw))
-+ return false;
-+
-+ // pam_setcred(3) may inject additional groups into the user's
-+ // list of supplemental groups, and assumes that the user's
-+ // supplemental groups have already been initialized before
-+ // its invocation. Since pam_setcred was already called at the
-+ // start of openSession, we need to repeat this step here as
-+ // the user's groups have only just now been initialized.
-+
-+ if (!m_pam->setCred(PAM_REINITIALIZE_CRED)) {
-+ m_app->error(m_pam->errorString(), Auth::ERROR_AUTHENTICATION);
-+ return false;
-+ }
-+ return true;
-+ }
-+
- int PamBackend::converse(int n, const struct pam_message **msg, struct pam_response **resp) {
- qDebug() << "[PAM] Conversation with" << n << "messages";
-
-diff --git a/src/helper/backend/PamBackend.h b/src/helper/backend/PamBackend.h
-index 4c8b4b35..5b079099 100644
---- a/src/helper/backend/PamBackend.h
-+++ b/src/helper/backend/PamBackend.h
-@@ -28,6 +28,7 @@
- #include <QtCore/QObject>
-
- #include <security/pam_appl.h>
-+#include <pwd.h>
-
- namespace SDDM {
- class PamHandle;
-@@ -61,6 +62,7 @@ namespace SDDM {
- explicit PamBackend(HelperApp *parent);
- virtual ~PamBackend();
- int converse(int n, const struct pam_message **msg, struct pam_response **resp);
-+ virtual bool setupSupplementalGroups(struct passwd *pw);
-
- public slots:
- virtual bool start(const QString &user = QString());
diff --git a/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch b/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch
deleted file mode 100644
index f14ff767..00000000
--- a/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From d3953e88a94ec25a87d3c5136517b3d1009cb1fd Mon Sep 17 00:00:00 2001
-From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de>
-Date: Wed, 8 May 2019 18:58:53 +0200
-Subject: [PATCH] Revert "Honor PAM's ambient supplemental groups. (#834)"
-
-This reverts commit 1bc813d08b8130e458a6550ec47fb2bfbe6de080, which
-misuses PAM and leads to pulling in all of root's supplemental groups
-during session initialization instead of only adding PAM's extra
-groups. The problem was masked due to the root user not having any
-supplemental groups in some common contexts, like running sddm from a
-systemd unit.
----
- src/helper/UserSession.cpp | 57 --------------------------------------
- 1 file changed, 57 deletions(-)
-
-diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
-index b3aec356..f71fd358 100644
---- a/src/helper/UserSession.cpp
-+++ b/src/helper/UserSession.cpp
-@@ -150,67 +150,10 @@ namespace SDDM {
- qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
- exit(Auth::HELPER_OTHER_ERROR);
- }
--
--#ifdef USE_PAM
--
-- // fetch ambient groups from PAM's environment;
-- // these are set by modules such as pam_groups.so
-- int n_pam_groups = getgroups(0, NULL);
-- gid_t *pam_groups = NULL;
-- if (n_pam_groups > 0) {
-- pam_groups = new gid_t[n_pam_groups];
-- if ((n_pam_groups = getgroups(n_pam_groups, pam_groups)) == -1) {
-- qCritical() << "getgroups() failed to fetch supplemental"
-- << "PAM groups for user:" << username;
-- exit(Auth::HELPER_OTHER_ERROR);
-- }
-- } else {
-- n_pam_groups = 0;
-- }
--
-- // fetch session's user's groups
-- int n_user_groups = 0;
-- gid_t *user_groups = NULL;
-- if (-1 == getgrouplist(username.constData(), pw.pw_gid,
-- NULL, &n_user_groups)) {
-- user_groups = new gid_t[n_user_groups];
-- if ((n_user_groups = getgrouplist(username.constData(),
-- pw.pw_gid, user_groups,
-- &n_user_groups)) == -1 ) {
-- qCritical() << "getgrouplist(" << username << ", " << pw.pw_gid
-- << ") failed";
-- exit(Auth::HELPER_OTHER_ERROR);
-- }
-- }
--
-- // set groups to concatenation of PAM's ambient
-- // groups and the session's user's groups
-- int n_groups = n_pam_groups + n_user_groups;
-- if (n_groups > 0) {
-- gid_t *groups = new gid_t[n_groups];
-- memcpy(groups, pam_groups, (n_pam_groups * sizeof(gid_t)));
-- memcpy((groups + n_pam_groups), user_groups,
-- (n_user_groups * sizeof(gid_t)));
--
-- // setgroups(2) handles duplicate groups
-- if (setgroups(n_groups, groups) != 0) {
-- qCritical() << "setgroups() failed for user: " << username;
-- exit (Auth::HELPER_OTHER_ERROR);
-- }
-- delete[] groups;
-- }
-- delete[] pam_groups;
-- delete[] user_groups;
--
--#else
--
- if (initgroups(pw.pw_name, pw.pw_gid) != 0) {
- qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username;
- exit(Auth::HELPER_OTHER_ERROR);
- }
--
--#endif /* USE_PAM */
--
- if (setuid(pw.pw_uid) != 0) {
- qCritical() << "setuid(" << pw.pw_uid << ") failed for user: " << username;
- exit(Auth::HELPER_OTHER_ERROR);
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index f9b3950f..fd6d2f6b 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -1,72 +1,71 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
else
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
-PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu ie is 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 plocale systemd user
+inherit cmake linux-info systemd tmpfiles
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm"
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
-IUSE="elogind +pam systemd test"
+IUSE="+elogind +pam systemd test"
REQUIRED_USE="?? ( elogind systemd )"
-
RESTRICT="!test? ( test )"
-BDEPEND="
- dev-python/docutils
- >=dev-qt/linguist-tools-5.9.4:5
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig
-"
-RDEPEND="
- >=dev-qt/qtcore-5.9.4:5
- >=dev-qt/qtdbus-5.9.4:5
- >=dev-qt/qtdeclarative-5.9.4:5
- >=dev-qt/qtgui-5.9.4:5
- >=dev-qt/qtnetwork-5.9.4:5
- >=x11-base/xorg-server-1.15.1
+COMMON_DEPEND="
+ acct-group/sddm
+ acct-user/sddm
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ x11-base/xorg-server
x11-libs/libxcb[xkb]
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
+ !pam? ( virtual/libcrypt:= )
systemd? ( sys-apps/systemd:= )
!systemd? ( sys-power/upower )
"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qttest-5.9.4:5 )
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !systemd? ( gui-libs/display-manager-init )
+"
+BDEPEND="
+ dev-python/docutils
+ dev-qt/linguist-tools:5
+ kde-frameworks/extra-cmake-modules:5
+ virtual/pkgconfig
"
PATCHES=(
- # Pending upstream
- # fix for groups: https://github.com/sddm/sddm/issues/1159
- "${FILESDIR}"/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch
- "${FILESDIR}"/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch
# Downstream patches
- "${FILESDIR}"/${PN}-0.18.1-respect-user-flags.patch # bug 563108
- "${FILESDIR}"/${PN}-0.19.0-Xsession.patch # bug 611210
+ "${FILESDIR}/${PN}-0.18.1-respect-user-flags.patch" # bug 563108
+ "${FILESDIR}/${PN}-0.19.0-Xsession.patch" # bug 611210
)
+pkg_setup() {
+ local CONFIG_CHECK="~DRM"
+ use kernel_linux && linux-info_pkg_setup
+}
+
src_prepare() {
cmake_src_prepare
- disable_locale() {
- sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
- }
- plocale_find_changes "data/translations" "" ".ts"
- plocale_for_each_disabled_locale disable_locale
-
if ! use test; then
sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
cmake_comment_add_subdirectory test
@@ -87,6 +86,8 @@ src_configure() {
src_install() {
cmake_src_install
+ newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
# Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
local confd="/usr/lib/sddm/sddm.conf.d"
dodir ${confd}
@@ -100,12 +101,25 @@ src_install() {
}
pkg_postinst() {
+ tmpfiles_process "${PN}.conf"
+
elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
elog "Use it to override specific options. SDDM defaults are now"
elog "found in: /usr/lib/sddm/sddm.conf.d/00default.conf"
-
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+ elog
+ elog "NOTE: If SDDM startup appears to hang then entropy pool is too low."
+ elog "This can be fixed by configuring one of the following:"
+ elog " - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
+ elog " - # emerge sys-apps/haveged && rc-update add haveged boot"
+ elog " - # emerge sys-apps/rng-tools && rc-update add rngd boot"
+ elog
+ elog "For more information on how to configure SDDM, please visit the wiki:"
+ elog " https://wiki.gentoo.org/wiki/SDDM"
+ if has_version x11-drivers/nvidia-drivers; then
+ elog
+ elog " Nvidia GPU owners in particular should pay attention"
+ elog " to the troubleshooting section."
+ fi
systemd_reenable sddm.service
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2024-02-27 12:14 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2024-02-27 12:14 UTC (permalink / raw
To: gentoo-commits
commit: 34fbc14bc2423dcf9783f97657723b080a3e2520
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 12:12:54 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 12:13:46 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=34fbc14b
x11-misc/sddm: Rename patches after 0.21.0 release, update SRC_URI
See also: https://github.com/gentoo/qt/pull/273
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../{sddm-9999-Xsession.patch => sddm-0.21.0-Xsession.patch} | 0
...ian-check.patch => sddm-0.21.0-disable-etc-debian-check.patch} | 0
...dule.patch => sddm-0.21.0-no-default-pam_systemd-module.patch} | 0
x11-misc/sddm/sddm-9999.ebuild | 8 ++++----
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-9999-Xsession.patch b/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch
similarity index 100%
rename from x11-misc/sddm/files/sddm-9999-Xsession.patch
rename to x11-misc/sddm/files/sddm-0.21.0-Xsession.patch
diff --git a/x11-misc/sddm/files/sddm-9999-disable-etc-debian-check.patch b/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
similarity index 100%
rename from x11-misc/sddm/files/sddm-9999-disable-etc-debian-check.patch
rename to x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
diff --git a/x11-misc/sddm/files/sddm-9999-no-default-pam_systemd-module.patch b/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
similarity index 100%
rename from x11-misc/sddm/files/sddm-9999-no-default-pam_systemd-module.patch
rename to x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 177c1c2e..9c8c10c4 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
@@ -67,10 +67,10 @@ BDEPEND="
PATCHES=(
# Downstream patches
"${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch"
- "${FILESDIR}/${P}-Xsession.patch" # bug 611210
+ "${FILESDIR}/${PN}-0.21.0-Xsession.patch" # bug 611210
"${FILESDIR}/${PN}-0.20.0-sddm.pam-use-substack.patch" # bug 728550
- "${FILESDIR}/${P}-disable-etc-debian-check.patch"
- "${FILESDIR}/${P}-no-default-pam_systemd-module.patch" # bug 669980
+ "${FILESDIR}/${PN}-0.21.0-disable-etc-debian-check.patch"
+ "${FILESDIR}/${PN}-0.21.0-no-default-pam_systemd-module.patch" # bug 669980
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2024-03-07 18:28 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2024-03-07 18:28 UTC (permalink / raw
To: gentoo-commits
commit: 6f421347e559d5801240a74a255ae5b901462684
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 18:09:33 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 18:18:02 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6f421347
x11-misc/sddm: Ship our own pam files
Closes: https://github.com/gentoo/qt/pull/278
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-misc/sddm/Manifest | 1 +
.../files/sddm-0.20.0-sddm.pam-use-substack.patch | 37 ------------------
.../sddm-0.21.0-disable-etc-debian-check.patch | 26 -------------
...sddm-0.21.0-no-default-pam_systemd-module.patch | 44 ----------------------
x11-misc/sddm/sddm-9999.ebuild | 21 +++++++++--
5 files changed, 18 insertions(+), 111 deletions(-)
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
new file mode 100644
index 00000000..92b91be4
--- /dev/null
+++ b/x11-misc/sddm/Manifest
@@ -0,0 +1 @@
+DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144 SHA512 6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2
diff --git a/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch b/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch
deleted file mode 100644
index 6267adc7..00000000
--- a/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9cbeb07664f4bd4273c2b62a522a864f6d4f27ae Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 4 Feb 2023 13:31:36 +0100
-Subject: [PATCH] sddm.pam: Change to substack for system-login
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- services/sddm.pam | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/services/sddm.pam b/services/sddm.pam
-index df11003..0a073f4 100644
---- a/services/sddm.pam
-+++ b/services/sddm.pam
-@@ -1,15 +1,15 @@
- #%PAM-1.0
-
--auth include system-login
-+auth substack system-login
- -auth optional pam_gnome_keyring.so
- -auth optional pam_kwallet5.so
-
--account include system-login
-+account substack system-login
-
--password include system-login
-+password substack system-login
- -password optional pam_gnome_keyring.so use_authtok
-
- session optional pam_keyinit.so force revoke
--session include system-login
-+session substack system-login
- -session optional pam_gnome_keyring.so auto_start
- -session optional pam_kwallet5.so auto_start
---
-2.39.1
-
diff --git a/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch b/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
deleted file mode 100644
index b0a13259..00000000
--- a/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cef0ad9776d9349e85020b529d20dcc88113015a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 13 Oct 2020 01:04:44 +0200
-Subject: [PATCH 4/5] Disable /etc/debian_version check
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- services/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index 5158e87..441e46a 100644
---- a/services/CMakeLists.txt
-+++ b/services/CMakeLists.txt
-@@ -20,7 +20,7 @@ endif()
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in" "${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
-
- if(INSTALL_PAM_CONFIGURATION)
-- if(EXISTS "/etc/debian_version")
-+ if(0)
- install(FILES debian.sddm-autologin.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-autologin)
- install(FILES debian.sddm-greeter.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-greeter)
- install(FILES debian.sddm.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm)
---
-2.43.0
-
diff --git a/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch b/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
deleted file mode 100644
index 4a213d85..00000000
--- a/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6f618b6862d625796c13677ff265bae21b44e029 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 13 Oct 2020 01:10:00 +0200
-Subject: [PATCH 5/5] Don't add pam_systemd.so to pam.d/sddm-greeter in case of
- NO_SYSTEMD
-
----
- services/CMakeLists.txt | 7 +++++--
- services/sddm-greeter.pam.in | 2 +-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index 441e46a..8e70fb1 100644
---- a/services/CMakeLists.txt
-+++ b/services/CMakeLists.txt
-@@ -12,10 +12,13 @@ if(DEFINED SYSTEMD_TMPFILES_DIR)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sddm-tmpfiles.conf" DESTINATION "${SYSTEMD_TMPFILES_DIR}" RENAME sddm.conf)
- endif()
-
-+set(LOGIND_PAM_MODULE "session optional")
- if(USE_ELOGIND)
-- set(LOGIND_PAM_MODULE "pam_elogind.so")
-+ set(LOGIND_PAM_MODULE "${LOGIND_PAM_MODULE} pam_elogind.so")
-+elseif(NOT NO_SYSTEMD)
-+ set(LOGIND_PAM_MODULE "${LOGIND_PAM_MODULE} pam_systemd.so")
- else()
-- set(LOGIND_PAM_MODULE "pam_systemd.so")
-+ set(LOGIND_PAM_MODULE "")
- endif()
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in" "${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
-
-diff --git a/services/sddm-greeter.pam.in b/services/sddm-greeter.pam.in
-index d41792d..35dcfd5 100644
---- a/services/sddm-greeter.pam.in
-+++ b/services/sddm-greeter.pam.in
-@@ -14,4 +14,4 @@ password required pam_deny.so
-
- # Setup session
- session required pam_unix.so
--session optional @LOGIND_PAM_MODULE@
-+@LOGIND_PAM_MODULE@
---
-2.43.0
-
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 9c8c10c4..7f2ae187 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+PAM_TAR="${PN}-0.21.0-pam"
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -12,10 +13,11 @@ else
fi
QTMIN=6.6.2
-inherit cmake linux-info systemd tmpfiles
+inherit cmake linux-info pam systemd tmpfiles
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz"
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
@@ -68,9 +70,6 @@ PATCHES=(
# Downstream patches
"${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch"
"${FILESDIR}/${PN}-0.21.0-Xsession.patch" # bug 611210
- "${FILESDIR}/${PN}-0.20.0-sddm.pam-use-substack.patch" # bug 728550
- "${FILESDIR}/${PN}-0.21.0-disable-etc-debian-check.patch"
- "${FILESDIR}/${PN}-0.21.0-no-default-pam_systemd-module.patch" # bug 669980
)
pkg_setup() {
@@ -78,6 +77,11 @@ pkg_setup() {
use kernel_linux && linux-info_pkg_setup
}
+src_unpack() {
+ [[ ${PV} == *9999* ]] && git-r3_src_unpack
+ default
+}
+
src_prepare() {
touch 01gentoo.conf || die
@@ -93,6 +97,11 @@ EOF
sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
cmake_comment_add_subdirectory test
fi
+
+ if use systemd; then
+ sed -e "/pam_elogind.so/s/elogind/systemd/" \
+ -i "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam || die
+ fi
}
src_configure() {
@@ -119,6 +128,10 @@ src_install() {
insinto /etc/logrotate.d
newins "${FILESDIR}/sddm.logrotate" sddm
fi
+
+ newpamd "${WORKDIR}"/${PAM_TAR}/${PN}.pam ${PN}
+ newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-autologin.pam ${PN}-autologin
+ newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam ${PN}-greeter
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
@ 2025-03-21 21:03 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2025-03-21 21:03 UTC (permalink / raw
To: gentoo-commits
commit: 2f851e7c01f5d86b050d0d2edbd9e985574220ae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 21 21:01:25 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 21:02:35 2025 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2f851e7c
x11-misc/sddm: treeclean umaintained live ebuild
... also mostly worthless for the super slow moving git master.
Closes: https://bugs.gentoo.org/951663 (pkgremoved)
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-misc/sddm/Manifest | 1 -
.../files/sddm-0.20.0-respect-user-flags.patch | 25 ----
x11-misc/sddm/files/sddm-0.21.0-Xsession.patch | 41 ------
x11-misc/sddm/files/sddm.logrotate | 5 -
x11-misc/sddm/metadata.xml | 21 ---
x11-misc/sddm/sddm-9999.ebuild | 151 ---------------------
6 files changed, 244 deletions(-)
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
deleted file mode 100644
index 92b91be4..00000000
--- a/x11-misc/sddm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144 SHA512 6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2
diff --git a/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
deleted file mode 100644
index 7f5bc400..00000000
--- a/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f03f4c977b8038559c4f26e0e10cec4a3167c00c Mon Sep 17 00:00:00 2001
-From: Lorenzo Porta <vindex17@outlook.it>
-Date: Wed, 23 Sep 2015 23:34:38 2015 +0100
-Subject: Respect user flags
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b883a5e..77cd263 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,7 @@ if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug)
- message(STATUS "Debug build")
- add_definitions(-DDEBUG)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
--else()
-+elseif(CMAKE_BUILD_TYPE MATCHES Release)
- message(STATUS "Release build")
- add_definitions(-DNDEBUG)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
---
-2.43.0
-
diff --git a/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch
deleted file mode 100644
index 0388ee89..00000000
--- a/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From dac9752495d1467d11e30450989194177677f30a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 21 Oct 2017 14:44:59 2017 +0200
-Subject: [PATCH 2/5] Xsession
-
-Thanks-to: Joakim Tjernlund <joakim.tjernlund@infinera.com>
-Bug: https://bugs.gentoo.org/611210
-
----
- data/scripts/Xsession | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/data/scripts/Xsession b/data/scripts/Xsession
-index a971d40..2d84a5a 100755
---- a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -39,6 +39,10 @@ case $SHELL in
- ;;
- esac
-
-+# Make D-Bus start properly, see:
-+# /etc/X11/xinit/xinitrc.d/80-dbus
-+command="$@"
-+
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f /usr/local/etc/xprofile ] && . /usr/local/etc/xprofile
- [ -f $HOME/.xprofile ] && . $HOME/.xprofile
-@@ -87,8 +91,8 @@ if [ -f "$USERXSESSION" ]; then
- . "$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
---
-2.43.0
-
diff --git a/x11-misc/sddm/files/sddm.logrotate b/x11-misc/sddm/files/sddm.logrotate
deleted file mode 100644
index ba6199c4..00000000
--- a/x11-misc/sddm/files/sddm.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/sddm.log {
- missingok
- notifempty
- copytruncate
-}
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
deleted file mode 100644
index 86353a72..00000000
--- a/x11-misc/sddm/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>lxqt@gentoo.org</email>
- <name>LXQt</name>
- </maintainer>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <longdescription lang="en">
- SDDM is a modern display manager aiming to be fast, simple
- and beautiful. It uses modern technologies like QtQuick, which
- gives the designer the ability to create smooth, animated UIs.
- </longdescription>
- <upstream>
- <remote-id type="github">sddm/sddm</remote-id>
- <remote-id type="cpe">cpe:/a:sddm_project:sddm</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
deleted file mode 100644
index 68772651..00000000
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PAM_TAR="${PN}-0.21.0-pam"
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-QTMIN=6.7.1
-inherit cmake linux-info optfeature pam systemd tmpfiles
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="+elogind systemd test +X"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- acct-group/sddm
- acct-user/sddm
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network]
- >=dev-qt/qtdeclarative-${QTMIN}:6
- sys-libs/pam
- x11-libs/libXau
- x11-libs/libxcb:=
- elogind? (
- sys-auth/elogind[pam]
- sys-power/upower
- )
- systemd? ( sys-apps/systemd:=[pam] )
-"
-DEPEND="${COMMON_DEPEND}
- test? ( >=dev-qt/qtbase-${QTMIN}:6 )
-"
-RDEPEND="${COMMON_DEPEND}
- X? ( x11-base/xorg-server )
- !systemd? ( gui-libs/display-manager-init )
-"
-BDEPEND="
- dev-python/docutils
- >=dev-build/cmake-3.25.0
- >=dev-qt/qttools-${QTMIN}[linguist]
- kde-frameworks/extra-cmake-modules:0
- virtual/pkgconfig
-"
-
-PATCHES=(
- # Downstream patches
- "${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch"
- "${FILESDIR}/${PN}-0.21.0-Xsession.patch" # bug 611210
-)
-
-pkg_setup() {
- local CONFIG_CHECK="~DRM"
- use kernel_linux && linux-info_pkg_setup
-}
-
-src_unpack() {
- [[ ${PV} == *9999* ]] && git-r3_src_unpack
- default
-}
-
-src_prepare() {
- touch 01gentoo.conf || die
-
-cat <<-EOF >> 01gentoo.conf
-[General]
-# Remove qtvirtualkeyboard as InputMethod default
-InputMethod=
-EOF
-
- cmake_src_prepare
-
- if ! use test; then
- sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
- cmake_comment_add_subdirectory test
- fi
-
- if use systemd; then
- sed -e "/pam_elogind.so/s/elogind/systemd/" \
- -i "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_MAN_PAGES=ON
- -DBUILD_WITH_QT6=ON
- -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
- -DRUNTIME_DIR=/run/sddm
- -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
- -DNO_SYSTEMD=$(usex !systemd)
- -DUSE_ELOGIND=$(usex elogind)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- insinto /etc/sddm.conf.d/
- doins "${S}"/01gentoo.conf
-
- # with systemd logs are sent to journald, so no point to bother in that case
- if ! use systemd; then
- insinto /etc/logrotate.d
- newins "${FILESDIR}/sddm.logrotate" sddm
- fi
-
- newpamd "${WORKDIR}"/${PAM_TAR}/${PN}.pam ${PN}
- newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-autologin.pam ${PN}-autologin
- newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam ${PN}-greeter
-}
-
-pkg_postinst() {
- tmpfiles_process "${PN}.conf"
-
- elog "NOTE: If SDDM startup appears to hang then entropy pool is too low."
- elog "This can be fixed by configuring one of the following:"
- elog " - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
- elog " - # emerge sys-apps/haveged && rc-update add haveged boot"
- elog " - # emerge sys-apps/rng-tools && rc-update add rngd boot"
- elog
- elog "SDDM example config can be shown with:"
- elog " ${EROOT}/usr/bin/sddm --example-config"
- elog "Use ${EROOT}/etc/sddm.conf.d/ directory to override specific options."
- elog
- elog "For more information on how to configure SDDM, please visit the wiki:"
- elog " https://wiki.gentoo.org/wiki/SDDM"
- if has_version x11-drivers/nvidia-drivers; then
- elog
- elog " Nvidia GPU owners in particular should pay attention"
- elog " to the troubleshooting section."
- fi
-
- optfeature "Weston DisplayServer support (EXPERIMENTAL)" "dev-libs/weston[kiosk]"
- optfeature "KWin DisplayServer support (EXPERIMENTAL)" "kde-plasma/kwin"
-
- systemd_reenable sddm.service
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2025-03-21 21:03 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-13 17:52 [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-03-21 21:03 Andreas Sturmlechner
2024-03-07 18:28 Andreas Sturmlechner
2024-02-27 12:14 Andreas Sturmlechner
2022-07-10 14:51 Andreas Sturmlechner
2021-01-01 18:58 Andreas Sturmlechner
2019-10-26 17:23 Andreas Sturmlechner
2014-10-19 1:30 Davide Pesavento
2014-06-04 13:41 Davide Pesavento
2014-05-24 19:52 Davide Pesavento
2014-05-24 19:23 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox