commit: ba383e5f6a02e57c395d8f349521c28a3b6de356 Author: Elias Probst <mail <AT> eliasprobst <DOT> eu> AuthorDate: Mon Nov 9 09:08:37 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Mon Nov 16 17:38:06 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ba383e5f
kde-plasma/kscreenlocker: Add live ebuild Package-Manager: portage-2.2.23 kde-plasma/kscreenlocker/files/kde-np.pam | 10 +++ kde-plasma/kscreenlocker/files/kde.pam | 11 +++ .../kscreenlocker-5.4.90-no-SUID-no-GUID.patch | 16 +++++ kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 79 ++++++++++++++++++++++ kde-plasma/kscreenlocker/metadata.xml | 7 ++ kde-plasma/kwin/kwin-9999.ebuild | 1 + .../plasma-workspace/plasma-workspace-9999.ebuild | 5 ++ 7 files changed, 129 insertions(+) diff --git a/kde-plasma/kscreenlocker/files/kde-np.pam b/kde-plasma/kscreenlocker/files/kde-np.pam new file mode 100644 index 0000000..f5499e6 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde-np.pam @@ -0,0 +1,10 @@ +#%PAM-1.0 + +auth required pam_nologin.so +auth required pam_permit.so + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde.pam b/kde-plasma/kscreenlocker/files/kde.pam new file mode 100644 index 0000000..24d19de --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde.pam @@ -0,0 +1,11 @@ +#%PAM-1.0 + +auth required pam_nologin.so + +auth include system-local-login + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch new file mode 100644 index 0000000..dc26f5f --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch @@ -0,0 +1,16 @@ +diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt +index a63fa1403e897e70989dc2e1ba7eed4bc69cbb51..12d1bfb3c690eca1acf344045a92eb942669da83 100644 +--- a/kcheckpass/CMakeLists.txt ++++ b/kcheckpass/CMakeLists.txt +@@ -22,10 +22,6 @@ endif () + + set_property(TARGET kcheckpass APPEND_STRING PROPERTY COMPILE_FLAGS " -U_REENTRANT") + target_link_libraries(kcheckpass ${UNIXAUTH_LIBRARIES} ${SOCKET_LIBRARIES}) +-install(TARGETS kcheckpass DESTINATION ${KDE_INSTALL_LIBEXECDIR}) +-install(CODE " +- set(KCP_PATH \"\$ENV{DESTDIR}${KDE_INSTALL_LIBEXECDIR}/kcheckpass\") +- execute_process(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\") +-") ++install(TARGETS kcheckpass DESTINATION ${LIBEXEC_INSTALL_DIR}) + + #EXTRA_DIST = README diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild new file mode 100644 index 0000000..e5bb9c9 --- /dev/null +++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 pam + +DESCRIPTION="Library and components for secure lock screen architecture" +KEYWORDS="" +IUSE="pam" + +COMMON_DEPEND=" + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kidletime) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kpackage) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep plasma) + $(add_plasma_dep kwayland) + dev-libs/wayland + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5[widgets] + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libXi + x11-libs/libxcb + x11-libs/xcb-util-keysyms + pam? ( virtual/pam ) +" +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND} + !<kde-base/kcheckpass-4.11.22-r1:4 + !kde-base/kdebase-pam:4 + !<kde-plasma/plasma-workspace-5.4.50 +" + +PATCHES=( "${FILESDIR}/${PN}-5.4.90-no-SUID-no-GUID.patch" ) + +src_prepare() { + kde5_src_prepare + + use test || sed -i \ + -e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package pam) + ) + kde5_src_configure +} + +src_install() { + kde5_src_install + + newpamd "${FILESDIR}/kde.pam" kde + newpamd "${FILESDIR}/kde-np.pam" kde-np + + if ! use pam; then + chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die + chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die + fi +} diff --git a/kde-plasma/kscreenlocker/metadata.xml b/kde-plasma/kscreenlocker/metadata.xml new file mode 100644 index 0000000..22390bf --- /dev/null +++ b/kde-plasma/kscreenlocker/metadata.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>kde</herd> + <use> + </use> +</pkgmetadata> diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild index af57433..04302d9 100644 --- a/kde-plasma/kwin/kwin-9999.ebuild +++ b/kde-plasma/kwin/kwin-9999.ebuild @@ -38,6 +38,7 @@ COMMON_DEPEND=" $(add_frameworks_dep kxmlgui) $(add_frameworks_dep plasma) $(add_plasma_dep kdecoration) + $(add_plasma_dep kscreenlocker) $(add_plasma_dep kwayland) >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 46c1d61..719bfde 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -15,6 +15,11 @@ KEYWORDS="" IUSE="dbus +drkonqi +geolocation gps prison qalculate" COMMON_DEPEND=" + $(add_plasma_dep kscreenlocker) + $(add_plasma_dep kwayland) + $(add_plasma_dep kwin) + $(add_plasma_dep libkscreen) + $(add_plasma_dep libksysguard) $(add_frameworks_dep baloo) $(add_frameworks_dep kactivities) $(add_frameworks_dep kauth)