From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 29DB3138C9D for ; Mon, 1 Jun 2015 18:18:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EE6FE08A4; Mon, 1 Jun 2015 18:18:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9BE3E08A4 for ; Mon, 1 Jun 2015 18:18:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92913340DF8 for ; Mon, 1 Jun 2015 18:18:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D71B9EA for ; Mon, 1 Jun 2015 18:18:45 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1433182689.14b79a7d4e149c0ed23a4480fa4e4ededafbe126.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/files/kde-np.pam kde-plasma/plasma-workspace/files/kde.pam kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ kde-plasma/plasma-workspace/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 14b79a7d4e149c0ed23a4480fa4e4ededafbe126 X-VCS-Branch: master Date: Mon, 1 Jun 2015 18:18:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 55ce9efa-dfa5-4029-b862-6c8a885dc9e9 X-Archives-Hash: d81ea2a557ad1f10d7acf9f65e6e7cdc commit: 14b79a7d4e149c0ed23a4480fa4e4ededafbe126 Author: Michael Palimaka gentoo org> AuthorDate: Mon Jun 1 18:18:09 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Jun 1 18:18:09 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=14b79a7d [kde-plasma/plasma-workspace] Import PAM files from kde-base/kdebase-pam. These files are currently only used by kcheckpass for unlocking the screen. Package-Manager: portage-2.2.20 kde-plasma/plasma-workspace/files/kde-np.pam | 10 ++++++++++ kde-plasma/plasma-workspace/files/kde.pam | 11 +++++++++++ .../plasma-workspace/plasma-workspace-5.3.49.9999.ebuild | 6 ++++-- kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 6 ++++-- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/kde-plasma/plasma-workspace/files/kde-np.pam b/kde-plasma/plasma-workspace/files/kde-np.pam new file mode 100644 index 0000000..f5499e6 --- /dev/null +++ b/kde-plasma/plasma-workspace/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/plasma-workspace/files/kde.pam b/kde-plasma/plasma-workspace/files/kde.pam new file mode 100644 index 0000000..24d19de --- /dev/null +++ b/kde-plasma/plasma-workspace/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/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild index c05b182..a7d7177 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild @@ -8,7 +8,7 @@ KDE_HANDBOOK="true" KDE_PUNT_BOGUS_DEPS="true" KDE_TEST="true" VIRTUALX_REQUIRED="test" -inherit kde5 multilib +inherit kde5 multilib pam DESCRIPTION="KDE Plasma workspace" KEYWORDS="" @@ -102,7 +102,6 @@ RDEPEND="${COMMON_DEPEND} dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] - kde-base/kdebase-pam x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop @@ -158,6 +157,9 @@ src_configure() { src_install() { kde5_src_install + newpamd "${FILESDIR}/kde.pam" kde + newpamd "${FILESDIR}/kde-np.pam" kde-np + # startup and shutdown scripts insinto /etc/plasma/startup doins "${FILESDIR}/agent-startup.sh" diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 329e224..6c2b55a 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -8,7 +8,7 @@ KDE_HANDBOOK="true" KDE_PUNT_BOGUS_DEPS="true" KDE_TEST="true" VIRTUALX_REQUIRED="test" -inherit kde5 multilib +inherit kde5 multilib pam DESCRIPTION="KDE Plasma workspace" KEYWORDS="" @@ -101,7 +101,6 @@ RDEPEND="${COMMON_DEPEND} dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] - kde-base/kdebase-pam x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop @@ -157,6 +156,9 @@ src_configure() { src_install() { kde5_src_install + newpamd "${FILESDIR}/kde.pam" kde + newpamd "${FILESDIR}/kde-np.pam" kde-np + # startup and shutdown scripts insinto /etc/plasma/startup doins "${FILESDIR}/agent-startup.sh"