3 files changed, 108 insertions, 15 deletions
diff --git a/sys-auth/pam_pkcs11/ChangeLog b/sys-auth/pam_pkcs11/ChangeLog
index e6c0431a1a23..4b3e49ba6097 100644
--- a/sys-auth/pam_pkcs11/ChangeLog
+++ b/sys-auth/pam_pkcs11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/pam_pkcs11
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog,v 1.14 2009/10/07 13:02:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog,v 1.15 2009/12/19 20:25:23 arfrever Exp $
+
+*pam_pkcs11-0.6.2 (19 Dec 2009)
+
+  19 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +pam_pkcs11-0.6.2.ebuild:
+  Version bump.
 
 *pam_pkcs11-0.6.1-r1 (07 Oct 2009)
 
diff --git a/sys-auth/pam_pkcs11/Manifest b/sys-auth/pam_pkcs11/Manifest
index c30598ea811b..872f2532e062 100644
--- a/sys-auth/pam_pkcs11/Manifest
+++ b/sys-auth/pam_pkcs11/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pam_pkcs11-0.6.1-properinstall.patch 4361 RMD160 697d4344927834dbcbe98ff8cd24c2c820f15afb SHA1 c726424cb5d5721a103afa2c4ff164b2960f1db1 SHA256 11ff655fb0a587a1d13512b33f5478abfe94b47a0f8080e100d34d498e184602
-DIST pam_pkcs11-0.6.0.tar.gz 1062205 RMD160 dce7b637170c07f364553c9c9ed9f82a758af356 SHA1 eef40325afc426e5364f0d9762a8e0aded34a6c2 SHA256 170db26eb9610dde5d3307771ed0e0e14cc0778aaacd3b3d4e71240ccb61cec6
 DIST pam_pkcs11-0.6.1.tar.gz 1053048 RMD160 98058470f25861005a760e4e0b70094f5298884d SHA1 563834079da6be608000b3cb71112bd76e5575a5 SHA256 80dcf66f3698881faf25e946290c84393a9e46d06ace0b03ce1bf67b44135d37
-EBUILD pam_pkcs11-0.6.0-r1.ebuild 1074 RMD160 a5a1d9ca04bdae30b718126f2c73175da96c59b4 SHA1 a83f0304c97030a50c6dbd346a98bbbf366ddbd6 SHA256 61b43aac73d4179b78a43dd90a33898b2868ed68330de6a945bdbdcf3f31c500
+DIST pam_pkcs11-0.6.2.tar.gz 1063118 RMD160 b896a2e854a709cf1c6dd494d76f4d56c6450e8c SHA1 4baa9ee35f3a818e3e1a33ae4bb612edccf17941 SHA256 91691558a8bd9e889cb68f6efa3c0bf5273588252e4c71247f45842819d1576a
 EBUILD pam_pkcs11-0.6.1-r1.ebuild 3105 RMD160 c63adc1101bc9a1f906e2d54ecde2c80b86d97b6 SHA1 8553d05ff0abe06262eb7f0fa0ee7c0235945cf6 SHA256 6e0ffbd83e47fdf3bd8d688d8cfaa71da1b5216d2eb81c92b6c9ac1062670fb5
-EBUILD pam_pkcs11-0.6.1.ebuild 1044 RMD160 93a10f14a4ede3a80301355a00be7e14f4a728dd SHA1 e7fc4fdcc466b8b7c0d74c52b12cc8502283520e SHA256 0835a82324ba5e74ea2a86c83b8f9dcae27ade56899b90effcefcfa7ed6f08ff
-MISC ChangeLog 3648 RMD160 a0dc521cd779b91e9ff3c2d4e44850c2618ada8a SHA1 b80c26d4a58977ca30bd880fcedff69dc405c305 SHA256 210c48f440cb674f6c7c76e12bc2e0d52500d9d5c3db6b9d3e1676dbc2027b38
+EBUILD pam_pkcs11-0.6.2.ebuild 3062 RMD160 385cfd136d16971e64700aee62477a6e0f25a2f9 SHA1 970140def4f8ab7a6d6ae888baea4ba5d088122b SHA256 d2c2da0ad3c33f1dfe29ebae15530d7a8759a87056907fc19b538b10d0bd9ff7
+MISC ChangeLog 3798 RMD160 9e949e5efb3bd22a1f058377a2442c8b9d616ded SHA1 d2d3e227ccbb7b80b7c33e1ab263678de98850bc SHA256 fa00dbc3c1c458b02fac4a5170c56759d55f2f354411bb0e235b1df7535aa6e9
 MISC metadata.xml 284 RMD160 b0607ad99ae057035b8bbebddff8e0f23c827419 SHA1 26791feb3d20cdd9ebfb2a72df6df2748227bdc6 SHA256 03a9dfc325a823b47959050ee52c9403711c91d692cb5dca857385f7f86c4f2b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrMkUgACgkQAiZjviIA2Xiq8gCgjzDgqcbtCpvf7Ss9+vHhVbYJ
-cPQAn0Ztd7w9fZ0dC8XDsqAtd8EfoHGh
-=kqhL
------END PGP SIGNATURE-----
diff --git a/sys-auth/pam_pkcs11/pam_pkcs11-0.6.2.ebuild b/sys-auth/pam_pkcs11/pam_pkcs11-0.6.2.ebuild
new file mode 100644
index 000000000000..11747a65f686
--- /dev/null
+++ b/sys-auth/pam_pkcs11/pam_pkcs11-0.6.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/pam_pkcs11-0.6.2.ebuild,v 1.1 2009/12/19 20:25:23 arfrever Exp $
+
+EAPI="2"
+
+inherit multilib pam
+
+DESCRIPTION="PKCS#11 PAM library"
+HOMEPAGE="http://www.opensc-project.org/pam_pkcs11"
+SRC_URI="http://www.opensc-project.org/files/pam_pkcs11/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="curl ldap pcsc-lite"
+
+RDEPEND="sys-libs/pam
+	dev-libs/openssl
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap )
+	pcsc-lite? ( sys-apps/pcsc-lite )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# Fix the example files to be somewhat decent, and usable as
+	# default configuration
+	sed -i \
+		-e '/try_first_pass/s:false:true:' \
+		-e '/debug =/s:true:false:' \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		etc/pam_pkcs11.conf.example \
+		etc/pkcs11_eventmgr.conf.example || die "sed failed"
+}
+
+src_configure() {
+	econf \
+		$(use_with curl) \
+		$(use_with pcsc-lite pcsclite) \
+		$(use_with ldap) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pamdir="$(getpam_mod_dir)" install || die "emake install failed"
+
+	# These are all dlopened plugins, so .la files are useless.
+	find "${D}" -name '*.la' -delete || die
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+
+	# Move the make_hash_link script somehwere safe, it's _way_ too
+	# generic of a name to use.
+	dodir /usr/share/${PN}
+	mv "${D}"/usr/bin/make_hash_link.sh "${D}"/usr/share/${PN} || die
+
+	# Provide some basic configuration
+	keepdir /etc/pam_pkcs11{,/{cacerts,crl}}
+
+	insinto /etc/pam_pkcs11
+	newins etc/pam_pkcs11.conf.example pam_pkcs11.conf || die
+	newins etc/pkcs11_eventmgr.conf.example pkcs11_eventmgr.conf || die
+}
+
+pkg_config() {
+	local dir
+	for dir in "${ROOT}"/etc/${PN}/{cacerts,crl}; do
+		pushd "${dir}" &> /dev/null
+		ebegin "Creating hash links in '${dir}'"
+		"${ROOT}"/usr/share/${PN}/make_hash_link.sh || die
+		eend $?
+		popd &> /dev/null
+	done
+}
+
+pkg_postinst() {
+	elog "You probably want to configure the /etc/${PN}/${PN}.conf file."
+	elog "with the settings for your pkcs11 provider."
+	elog ""
+	elog "You might also want to set up /etc/${PN}/pkcs11_eventmgr.conf"
+	elog "with the settings for the event manager, and start it up at"
+	elog "user login."
+}
+
+# TODO list!
+#
+# - we need to find a way allow the user to choose whether to start the
+#   event manager at _all_ the logins, and if that's the case, lock all
+#   kind of sessions (terminal _and_ X);
+# - upstream should probably migrate the configuration of the event
+#   manager on a per-user basis, since it makes little sense to be _all_
+#   system-level configuration;
+# - we should probably provide some better config support that ensures
+#   the configuration to be valid, as well as creating the symlinks;
+# - we should probably add support for nss;
+# - we should move the configuration in /etc/security as for the rest
+#   of PAM-related configuration.