commit: e877002bc0a1c024db39242aa8ff2efe527b545e
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 19:55:31 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 19:55:31 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e877002b
kde-plasma/kwallet-pam: Sync with tree
Package-Manager: portage-2.2.28
kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild | 13 +++++++------
kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild | 13 +++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild
b/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild
index 8b857d9..ce480aa 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild
@@ -34,8 +34,8 @@ src_configure() {
pkg_postinst() {
check_dm() {
if [[ -e "${ROOT}${2}" ]] && \
- [[ -n $(egrep "auth\s+optional\s+pam_kwallet5.so"
"${ROOT}${2}") ]] && \
- [[ -n $(egrep "session\s+optional\s+pam_kwallet5.so"
"${ROOT}${2}") ]]; then
+ 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"
@@ -44,12 +44,13 @@ pkg_postinst() {
elog
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
elog "List of things to make it work:"
- elog "1. Use same password for login and kwallet"
- elog "2. A display manager with support for PAM"
- elog "3.a Have the following lines in the display manager's pam.d file:"
+ 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 "3.b Checking installed DMs..."
+ 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"
has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 8b857d9..ce480aa 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -34,8 +34,8 @@ src_configure() {
pkg_postinst() {
check_dm() {
if [[ -e "${ROOT}${2}" ]] && \
- [[ -n $(egrep "auth\s+optional\s+pam_kwallet5.so"
"${ROOT}${2}") ]] && \
- [[ -n $(egrep "session\s+optional\s+pam_kwallet5.so"
"${ROOT}${2}") ]]; then
+ 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"
@@ -44,12 +44,13 @@ pkg_postinst() {
elog
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
elog "List of things to make it work:"
- elog "1. Use same password for login and kwallet"
- elog "2. A display manager with support for PAM"
- elog "3.a Have the following lines in the display manager's pam.d file:"
+ 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 "3.b Checking installed DMs..."
+ 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"
has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
