Version bump.

Package-Manager: portage-2.2.0_alpha1_p7/cvs/Linux x86_64

4 files changed, 125 insertions, 4 deletions

diff --git a/sys-auth/pam_pkcs11/ChangeLog b/sys-auth/pam_pkcs11/ChangeLog
index 2890a7fcd71d..1aadf95fc495 100644
--- a/sys-auth/pam_pkcs11/ChangeLog
+++ b/sys-auth/pam_pkcs11/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pam_pkcs11
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog,v 1.16 2010/06/14 21:59:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog,v 1.17 2010/10/24 11:05:20 arfrever Exp $
+
+*pam_pkcs11-0.6.5 (24 Oct 2010)
+
+  24 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pam_pkcs11-0.6.2.ebuild, +pam_pkcs11-0.6.5.ebuild,
+  +files/pam_pkcs11-0.6.5-pcsclite_detection.patch:
+  Version bump.
 
 *pam_pkcs11-0.6.4 (14 Jun 2010)
 
diff --git a/sys-auth/pam_pkcs11/Manifest b/sys-auth/pam_pkcs11/Manifest
index 7692fc9f608b..675d4950989c 100644
--- a/sys-auth/pam_pkcs11/Manifest
+++ b/sys-auth/pam_pkcs11/Manifest
@@ -1,6 +1,7 @@
-DIST pam_pkcs11-0.6.2.tar.gz 1063118 RMD160 b896a2e854a709cf1c6dd494d76f4d56c6450e8c SHA1 4baa9ee35f3a818e3e1a33ae4bb612edccf17941 SHA256 91691558a8bd9e889cb68f6efa3c0bf5273588252e4c71247f45842819d1576a
+AUX pam_pkcs11-0.6.5-pcsclite_detection.patch 330 RMD160 3f62af01b29966b371608eec8fdda3c0c58017ed SHA1 bb976da87d0167fe8dfadf94b6994a02b780506c SHA256 af5d3242992122e9a57b638b325e3e33dc7472d5848f7545ab92a64c9bee946d
 DIST pam_pkcs11-0.6.4.tar.gz 1072708 RMD160 5e88a932a73cfff4119126432e7a0114b81f9e52 SHA1 9cfd91eedd8849125a578e784404359cdb6a1c02 SHA256 4a9d7b669951dcade219b9907f58b5f8ad0419c0ee72ee1fcc76a93ec3c831a5
-EBUILD pam_pkcs11-0.6.2.ebuild 3062 RMD160 385cfd136d16971e64700aee62477a6e0f25a2f9 SHA1 970140def4f8ab7a6d6ae888baea4ba5d088122b SHA256 d2c2da0ad3c33f1dfe29ebae15530d7a8759a87056907fc19b538b10d0bd9ff7
+DIST pam_pkcs11-0.6.5.tar.gz 1083799 RMD160 c0821c56b22e04278e3a18d81c1883492438a2bc SHA1 5cc98cb76295cc71dd76a6ba13b719c0feb21ff7 SHA256 d6807b58714fc808e3cd2cc41279f5d5ed5b2941ef35341712f94174c0518f6d
 EBUILD pam_pkcs11-0.6.4.ebuild 3065 RMD160 cca6c17fd77ecdcb9467d1edaa1163bebdca1e8d SHA1 c489dc86cf06155eb4b0d15141aff84fee5af863 SHA256 a461aea01292d952fbbc677913668e31ba176acf7fd2f26e6d6c476911829584
-MISC ChangeLog 4025 RMD160 f35e629b885cafe6480fa1b21776e95e3e4b371c SHA1 5ab04398a6a17f99cff8459b06506b3d5d00f2b6 SHA256 a1c82a6ab255e69cefb98b0b42331dc7101e8ad4d94fc42ef50a59c1ee677961
+EBUILD pam_pkcs11-0.6.5.ebuild 3148 RMD160 a083f16adb29f5f928ad03f90c5a9cd36dc36b91 SHA1 23179c82c4cce9c0542733a20778d1155bdbc3b0 SHA256 91dbf290a55cba166c4683ce5a76e12f501a69c7fc7c61e3ea64815ce901fb00
+MISC ChangeLog 4254 RMD160 ebbdb9a6abae91d32514b68552e29cfbd5ea1161 SHA1 f75d8a77b94a119e13d4ce55ffe3057dd7fa9ec0 SHA256 90e1679fceeb23d9883d34ca789a8b41e35f39b34ad532cce9192e3ab49ed531
 MISC metadata.xml 284 RMD160 b0607ad99ae057035b8bbebddff8e0f23c827419 SHA1 26791feb3d20cdd9ebfb2a72df6df2748227bdc6 SHA256 03a9dfc325a823b47959050ee52c9403711c91d692cb5dca857385f7f86c4f2b
diff --git a/sys-auth/pam_pkcs11/files/pam_pkcs11-0.6.5-pcsclite_detection.patch b/sys-auth/pam_pkcs11/files/pam_pkcs11-0.6.5-pcsclite_detection.patch
new file mode 100644
index 000000000000..e10afd511413
--- /dev/null
+++ b/sys-auth/pam_pkcs11/files/pam_pkcs11-0.6.5-pcsclite_detection.patch
@@ -0,0 +1,12 @@
+--- configure.in
++++ configure.in
+@@ -166,8 +166,7 @@
+ 
+ # Check for PCSC-Lite
+ AC_ARG_WITH(pcsclite,
+-  AC_HELP_STRING([--with-pcsclite], [Use pcsc-lite (default=yes)]),
+-  [ with_pcsclite=no ])
++  AC_HELP_STRING([--with-pcsclite], [Use pcsc-lite (default=yes)]))
+ 
+ if test "$with_pcsclite" != "no"; then
+ 	OLD_CFLAGS="$CFLAGS"
diff --git a/sys-auth/pam_pkcs11/pam_pkcs11-0.6.5.ebuild b/sys-auth/pam_pkcs11/pam_pkcs11-0.6.5.ebuild
new file mode 100644
index 000000000000..c963db26f532
--- /dev/null
+++ b/sys-auth/pam_pkcs11/pam_pkcs11-0.6.5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2010 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.5.ebuild,v 1.1 2010/10/24 11:05:20 arfrever Exp $
+
+EAPI="3"
+
+inherit autotools eutils 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.in \
+		etc/pkcs11_eventmgr.conf.example || die "sed failed"
+
+	epatch "${FILESDIR}/${P}-pcsclite_detection.patch"
+	eautoreconf
+}
+
+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.