Fix handling of status returned from skey_haskey. File access errors for the skeykeys file will now cause the module to return with status "authinfo_unavail" instead of "ignore".

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 84 insertions, 22 deletions

diff --git a/sys-auth/pam_skey/ChangeLog b/sys-auth/pam_skey/ChangeLog
index 7f5e5e434dbd..8f6cf3ba0df4 100644
--- a/sys-auth/pam_skey/ChangeLog
+++ b/sys-auth/pam_skey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pam_skey
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_skey/ChangeLog,v 1.22 2012/03/24 17:34:17 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_skey/ChangeLog,v 1.23 2013/08/26 16:32:46 ulm Exp $
+
+*pam_skey-1.1.5-r4 (26 Aug 2013)
+
+  26 Aug 2013; Ulrich Müller <ulm@gentoo.org> +pam_skey-1.1.5-r4.ebuild:
+  Fix handling of status returned from skey_haskey. File access errors for
+  the skeykeys file will now cause the module to return with status
+  "authinfo_unavail" instead of "ignore".
 
   24 Mar 2012; Ulrich Müller <ulm@gentoo.org> -pam_skey-1.1.5-r2.ebuild:
   Remove old.
diff --git a/sys-auth/pam_skey/Manifest b/sys-auth/pam_skey/Manifest
index 5e5b95a86f91..7520c7b7a9fc 100644
--- a/sys-auth/pam_skey/Manifest
+++ b/sys-auth/pam_skey/Manifest
@@ -1,25 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST pam_skey-1.1.5-patches-4.tar.xz 9028 RMD160 1c5e025d6c65ae192038e7ebe842e5e147d8f951 SHA1 a09d3e06e72b40e28927d5c2d571f8940171f92e SHA256 e94b1bf572af21ede0f749107fad8c39c6f48bfb420bdac110a19cc08661f763
-DIST pam_skey-1.1.5.tar.gz 76963 RMD160 40e729277c8c6bd960d1ca8aade52dad9bc8fb2c SHA1 5ed6408ce660acdbe5018a87962bab66f67a30ab SHA256 31f56a85780aa59326c7da891687af3820e997a80805dc47171175481f3762f7
-EBUILD pam_skey-1.1.5-r3.ebuild 1145 RMD160 7df88d390b42f983a603e7add8ee3b8973d31d6f SHA1 733c20944bf2ffd6a109219bfe3b114f4cc51295 SHA256 0373dfa291ed590e7a0954784bcfe712625271e9b26d14d9a20fc8516586d372
-MISC ChangeLog 3098 RMD160 fabb6649b2d82babc5d5c8928189d22057205fa4 SHA1 94c2d5457259aeb2a9fc52962a10a5682750e594 SHA256 b8d2231c604e178c87311ab6c571595ce4f9d77ad2585668f46ef44f52b81e57
-MISC metadata.xml 215 RMD160 0851276a2aff894fddae9709aa8a76866f697690 SHA1 b055937f4a3294e329309cd8d16fa36ae81554c9 SHA256 01372888f3f3906e23fcf018b7c541cafafd831d50c87e1def9598306e514933
+DIST pam_skey-1.1.5-patches-4.tar.xz 9028 SHA256 e94b1bf572af21ede0f749107fad8c39c6f48bfb420bdac110a19cc08661f763 SHA512 71bffbb3b41cbf0bda60433108f04d9f3f9a3821f95d14be2766289b7011afd3134a52a18833914daad77064e0e2950657042b003f4a58c43e04eac7722fe34d WHIRLPOOL c329ea295a7cb8e70ee35a83d329c257f27cce03ed5a26278b397e5706d4ce0bf3334f0957fe6b6ce199a3fc3f0160aa3ca15eee21f3fddaa5ebe96c4e088f59
+DIST pam_skey-1.1.5-patches-5.tar.xz 9160 SHA256 20e7ee7e3af8fc84fd4ddae7b63bb03f48d7ddc184e4469129e9d285db803132 SHA512 4924f1ac6716d086932b33b4a30eb8c1c2e6df7cda060f388abe7951cbbd3cd685184ba74286d07bd4b0caa4bd0c0d7148a04d2a88535cbcb89d3209b8c77073 WHIRLPOOL 925f90340be367b1a29637001a75c6910a272989e4a1f988482cee46aea810d442eb1d99a3f0f9f093dac774efe5016ab41ec34ebcba42dc2514142f8422fe3e
+DIST pam_skey-1.1.5.tar.gz 76963 SHA256 31f56a85780aa59326c7da891687af3820e997a80805dc47171175481f3762f7 SHA512 12817cedf15a3b2287982e4beab5d3b388239cc0a1e141e66e41759ddb2da7fb9dd0df12202dcc8140db0868c8df1a8d19d5859224179e2419ffefd691cb9834 WHIRLPOOL 835da66136cde2a19580c3e75a59cb9eadbbcb76dc542d1c96825438dff5c835d392c2232cae785c2999bc3e65772f06c91dea5fb03b945312a1a3a641647f1e
+EBUILD pam_skey-1.1.5-r3.ebuild 1145 SHA256 0373dfa291ed590e7a0954784bcfe712625271e9b26d14d9a20fc8516586d372 SHA512 8ec7e27799245fc8dbde9b44bc2ce46feb5c533b8e5730ddd99251698762f1a84d3c3b2687bc3ab1c2a64101cdf4b57beedb3ad5349fe0f0193635697eef0700 WHIRLPOOL 4908b046b36eaadcc3a2d50c210d29382e507003ea9d0e9072cf43729255982e974b0b89144a74c51a7489621dde2f821d54e4a714ba54ed4ac599bc460ef449
+EBUILD pam_skey-1.1.5-r4.ebuild 1674 SHA256 9bbd2dc8549568da0014205c3abba8019e47cf006264049f7d5019f68a3f7302 SHA512 eb88ec0d2ca35323a218b7083045dd13f263a1d7a4d500cbfbf96f60e9298d13c311976bc62558461a78594bdeae553379801f2e4f8e93e3945e73060827c4d5 WHIRLPOOL 53132ad71b0f8316440ca71da1635c928ce78ef8d5ce35b8c43d4f80962355dd5a5e1df0e89c4fcb9565ff6599b6ab1dec9e5b2252fc497727caefefa9ac48fe
+MISC ChangeLog 3392 SHA256 7beea3870ee6ea2c12403c1cc7c0184de83be8bdeadc08bcafb82398909bffe8 SHA512 5356b4041d8de19b67a9449c46603f96719f99f06d7b5f7ee97349d53640ae0e330dd9db930d1dd7c9ea06ac498f4a20745814d3ad6ef9b187a9842d78f5e8ae WHIRLPOOL acb053f7c42f3715dc45ec16f349bd9c17178c99e5b7501ed535adc0502169bb4f244b127003fe24b728f3d99ff1a5e7d24b36bd4d89412fc469bdc841a4fcf4
+MISC metadata.xml 215 SHA256 01372888f3f3906e23fcf018b7c541cafafd831d50c87e1def9598306e514933 SHA512 7c37bf72a2db12ab552a73e250b0a718f3008e56a61ee9d74a5a93673d3bfd00a4e5492ec81edf882df84017c8bd7a0f6edb95c0f496fdbe0a68c59cf0807305 WHIRLPOOL 6845ec7c5d8d7c7450dca239f9c92a11aaf746d1003342284e9ad03bbf35687abc64419989d2bb9186a8356bc403e8f8214dbaf6902e36fcaea08f71ef4398a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPbgZXAAoJEDxpGckxwJCBu80QAInJ/9RViQPsIvx/4KXfXjEn
-VWCcuPTLbCmmt7HGzPGZaOvf4+n5rGdTq3d0Odq0WahuyJi6wxCWxNwHbQv8yvkK
-3z/UofSFaxRIgGi6qYiszaE9MnCc7EAuDT5rDJNZGnVOkwvadrXahu7tqUuZGWUQ
-FyWEJ/O5O0Lx6wx33XYhesCVkYWVPfO2z21w4gbPtrwHPsYs9LbwcB36piA7HO+2
-Y/6Us6XTJsaYHQbJ7X6hYXcLnErs4aHN4/QGuU/ImAewrxnKB1YVtrNpmEXTATGd
-hK43XMJhtR786zRU5weDmhTfnI7kuO7HXqTQjquAH8TphyUXfBFzVVE+IwWheE7R
-NeO9dfmwWL7y4TAHWm8y1+EA5IdS7MP3m/U8WigzJupaPsTmETAHSf/xacavBqub
-9EYdcBTNjN1kFGgcYYTYWUV6OZC5OfjaP2mNl0YVdLz5Gg2Dnn2hRH82TjHQ5jB2
-9/jRQ452xBcoMqUS5yEuE9zLUWlcaty2LJdsMx9MshBrBvTOCQ5JxaRqp8u0qJKG
-l/hvSHSdddKpeG7VBeIACR9MmysYJcPcxP0UeA1L4bJhxTxFqEanAnlnYUmt5BET
-dyg3L51GLGhPT7K70D7COoe2XRkRAAQqY+JaQv2B2yFafKgh5HXYD0JDnjWFBW9s
-a/amf9oggZOSrlGzDJJn
-=UYsk
+iQGcBAEBCAAGBQJSG4PGAAoJEJQzkH1pP7W4OiEMAII0ViPIyCzuu3lrHQYrqDYL
+ow0wmdhJxQlJwEBIaFqudrH+VCgybKUDCMGxLKzlsVVE/NBpqmXWtUJ37WIqv6I3
+uELcEw9t8+eCej9lQ7ujN46MFQ5xI8PpsxTFCyebXwj4HeKjEe83tsoUxdh6GKbY
+rP1B/J4+pFjl0MDSz9lIhujje0vIARvVE6tXuI5UZH9zh8gflV4uNPFpL0q9FdHN
+P788y+T1UsfIGlpgYMfv/irjhKTosQacYspOl8iLERSsn2BUaksb7rTcaGYsQDcS
+uiZWgXAr1ffMy4PkTlEVikzT2qMk5tCMCI1cVVsbSHp9TO6yJTiGK1QrRYpV4Cfn
+Ck06CqAfcwCxJchLaxH6xErvg0cLVOZGz2D+sJyi5C0KlIfJ7ykLthYjRzP5ADoA
+P3u/p2kIAgzCBeQxBk5KM2cc3WWJcoS2bs2KFXs6HCOl6dmRHXDcQIqXZix5WhWu
+hU+viY4gB7z2E7f7u1ykWsQucTCC+1JgeN+iqTsPdA==
+=ArFf
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_skey/pam_skey-1.1.5-r4.ebuild b/sys-auth/pam_skey/pam_skey-1.1.5-r4.ebuild
new file mode 100644
index 000000000000..69e5ceceedd1
--- /dev/null
+++ b/sys-auth/pam_skey/pam_skey-1.1.5-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_skey/pam_skey-1.1.5-r4.ebuild,v 1.1 2013/08/26 16:32:46 ulm Exp $
+
+EAPI=5
+
+inherit eutils pam autotools multilib readme.gentoo
+
+DESCRIPTION="PAM interface for the S/Key authentication system"
+HOMEPAGE="http://freshmeat.net/projects/pam_skey/"
+SRC_URI="http://dkorunic.net/tarballs/${P}.tar.gz
+	mirror://gentoo/${P}-patches-5.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/pam-0.78-r3
+	>=sys-auth/skey-1.1.5-r4"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS="README INSTALL"
+DOC_CONTENTS="To use the pam_skey module, you need to configure PAM
+	by adding a line like:
+	\n\nauth [success=done ignore=ignore auth_err=die default=bad] pam_skey.so\n
+	\nto an appropriate place in the /etc/pam.d/system-auth file.
+	Consult the README and INSTALL files in /usr/share/doc/${PF}
+	for detailed instructions.
+	\n\nPlease note that calling this module from unprivileged
+	applications, e.g. screensavers, is not supported.
+	\n\nError checking has become stricter in pam_skey-1.1.5-r4;
+	errors returned from the underlying skey library when accessing
+	the S/Key data base will no longer be ignored.
+	Make sure that your PAM configuration is correct."
+
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch
+	epatch_user
+
+	cd autoconf
+	eautoconf
+	eautoheader
+	mv configure defs.h.in .. || die "mv failed"
+}
+
+src_configure() {
+	econf --libdir="/$(get_libdir)" CFLAGS="${CFLAGS} -fPIC"
+}
+
+pkg_postinst() {
+	case ${REPLACING_VERSIONS} in
+		1.1.[45]|1.1.5-r[123]) FORCE_PRINT_ELOG=1 ;;
+	esac
+	readme.gentoo_print_elog
+}