diff options
| author | Johannes Huber <johu@gentoo.org> | 2016-04-14 21:55:31 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2016-04-14 21:55:31 +0200 |
| commit | e877002bc0a1c024db39242aa8ff2efe527b545e (patch) | |
| tree | 8db8ad5b78515defe3bb714eaaf3a2362d9fff52 | |
| parent | 2610a9618b7c7c2392da756f8ef7c3113c6f3a90 (diff) | |
| download | kde-e877002bc0a1c024db39242aa8ff2efe527b545e.tar.gz kde-e877002bc0a1c024db39242aa8ff2efe527b545e.tar.bz2 kde-e877002bc0a1c024db39242aa8ff2efe527b545e.zip | |
kde-plasma/kwallet-pam: Sync with tree
Package-Manager: portage-2.2.28
| -rw-r--r-- | kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild | 13 | ||||
| -rw-r--r-- | 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 8b857d92353..ce480aa8bc1 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 8b857d92353..ce480aa8bc1 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" |