| 1 |
commit: a81174869edd49d24b65e6d4f48394318b79cb98 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 21 15:20:42 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 21 15:20:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8117486 |
| 7 |
|
| 8 |
kde-plasma/kwallet-pam: Simplify pkg_postinst |
| 9 |
|
| 10 |
SDDM needs no manual fiddling these days. Anyone else |
| 11 |
can look up the provided KDE Wiki link. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.12, Repoman-2.3.3 |
| 14 |
|
| 15 |
.../kwallet-pam/kwallet-pam-5.11.49.9999.ebuild | 22 +--------------------- |
| 16 |
kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild | 22 +--------------------- |
| 17 |
2 files changed, 2 insertions(+), 42 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
index 7025612609..ac6ac2fa98 100644 |
| 21 |
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild |
| 22 |
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild |
| 23 |
@@ -27,27 +27,7 @@ src_configure() { |
| 24 |
} |
| 25 |
|
| 26 |
pkg_postinst() { |
| 27 |
- check_dm() { |
| 28 |
- if [[ -e "${ROOT}${2}" ]] ; then |
| 29 |
- if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \ |
| 30 |
- grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then |
| 31 |
- elog " ${1} - ${2} ...GOOD" |
| 32 |
- else |
| 33 |
- ewarn " ${1} - ${2} ...BAD" |
| 34 |
- fi |
| 35 |
- fi |
| 36 |
- } |
| 37 |
+ kde5_pkg_postinst |
| 38 |
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5." |
| 39 |
- elog "List of things to make it work:" |
| 40 |
- elog "1. Use standard blowfish encryption instead of GPG" |
| 41 |
- elog "2. Use same password for login and kwallet" |
| 42 |
- elog "3. A display manager with support for PAM" |
| 43 |
- elog "4.a Have the following lines in the display manager's pam.d file:" |
| 44 |
- elog " -auth optional pam_kwallet5.so" |
| 45 |
- elog " -session optional pam_kwallet5.so auto_start" |
| 46 |
- elog "4.b Checking installed DMs..." |
| 47 |
- has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm" |
| 48 |
- has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm" |
| 49 |
- elog |
| 50 |
elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking" |
| 51 |
} |
| 52 |
|
| 53 |
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild |
| 54 |
index 7025612609..ac6ac2fa98 100644 |
| 55 |
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild |
| 56 |
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild |
| 57 |
@@ -27,27 +27,7 @@ src_configure() { |
| 58 |
} |
| 59 |
|
| 60 |
pkg_postinst() { |
| 61 |
- check_dm() { |
| 62 |
- if [[ -e "${ROOT}${2}" ]] ; then |
| 63 |
- if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \ |
| 64 |
- grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then |
| 65 |
- elog " ${1} - ${2} ...GOOD" |
| 66 |
- else |
| 67 |
- ewarn " ${1} - ${2} ...BAD" |
| 68 |
- fi |
| 69 |
- fi |
| 70 |
- } |
| 71 |
+ kde5_pkg_postinst |
| 72 |
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5." |
| 73 |
- elog "List of things to make it work:" |
| 74 |
- elog "1. Use standard blowfish encryption instead of GPG" |
| 75 |
- elog "2. Use same password for login and kwallet" |
| 76 |
- elog "3. A display manager with support for PAM" |
| 77 |
- elog "4.a Have the following lines in the display manager's pam.d file:" |
| 78 |
- elog " -auth optional pam_kwallet5.so" |
| 79 |
- elog " -session optional pam_kwallet5.so auto_start" |
| 80 |
- elog "4.b Checking installed DMs..." |
| 81 |
- has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm" |
| 82 |
- has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm" |
| 83 |
- elog |
| 84 |
elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking" |
| 85 |
} |
Archives