From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-979617-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 0CD781396DA
for <garchives@archives.gentoo.org>; Sat, 21 Oct 2017 18:34:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 67A7C2BC02B;
Sat, 21 Oct 2017 18:34:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 38C9C2BC02B
for <gentoo-commits@lists.gentoo.org>; Sat, 21 Oct 2017 18:34:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CDB3633BEB4
for <gentoo-commits@lists.gentoo.org>; Sat, 21 Oct 2017 18:34:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F5B2805
for <gentoo-commits@lists.gentoo.org>; Sat, 21 Oct 2017 18:34:12 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1508599242.a81174869edd49d24b65e6d4f48394318b79cb98.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
X-VCS-Directories: kde-plasma/kwallet-pam/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: a81174869edd49d24b65e6d4f48394318b79cb98
X-VCS-Branch: master
Date: Sat, 21 Oct 2017 18:34:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 53fa6c55-3158-49f8-a721-a11e7e798e52
X-Archives-Hash: 7c5e13741b85a38068ae45149700202b
commit: a81174869edd49d24b65e6d4f48394318b79cb98
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 15:20:42 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 15:20:42 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8117486
kde-plasma/kwallet-pam: Simplify pkg_postinst
SDDM needs no manual fiddling these days. Anyone else
can look up the provided KDE Wiki link.
Package-Manager: Portage-2.3.12, Repoman-2.3.3
.../kwallet-pam/kwallet-pam-5.11.49.9999.ebuild | 22 +---------------------
kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild | 22 +---------------------
2 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild
index 7025612609..ac6ac2fa98 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild
@@ -27,27 +27,7 @@ src_configure() {
}
pkg_postinst() {
- check_dm() {
- if [[ -e "${ROOT}${2}" ]] ; then
- if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
- grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
- elog " ${1} - ${2} ...GOOD"
- else
- ewarn " ${1} - ${2} ...BAD"
- fi
- fi
- }
+ kde5_pkg_postinst
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
- elog "List of things to make it work:"
- elog "1. Use standard blowfish encryption instead of GPG"
- elog "2. Use same password for login and kwallet"
- elog "3. A display manager with support for PAM"
- elog "4.a Have the following lines in the display manager's pam.d file:"
- elog " -auth optional pam_kwallet5.so"
- elog " -session optional pam_kwallet5.so auto_start"
- elog "4.b Checking installed DMs..."
- has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
- has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
- elog
elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 7025612609..ac6ac2fa98 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -27,27 +27,7 @@ src_configure() {
}
pkg_postinst() {
- check_dm() {
- if [[ -e "${ROOT}${2}" ]] ; then
- if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
- grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
- elog " ${1} - ${2} ...GOOD"
- else
- ewarn " ${1} - ${2} ...BAD"
- fi
- fi
- }
+ kde5_pkg_postinst
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
- elog "List of things to make it work:"
- elog "1. Use standard blowfish encryption instead of GPG"
- elog "2. Use same password for login and kwallet"
- elog "3. A display manager with support for PAM"
- elog "4.a Have the following lines in the display manager's pam.d file:"
- elog " -auth optional pam_kwallet5.so"
- elog " -session optional pam_kwallet5.so auto_start"
- elog "4.b Checking installed DMs..."
- has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
- has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
- elog
elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
}