[gentoo-commits] gentoo-x86 commit in sys-auth/pam_pkcs11: metadata.xml ChangeLog pam_pkcs11-0.6.5-r1.ebuild pam_pkcs11-0.6.5.ebuild pam_pkcs11-0.6.4.ebuild

[Diego Petteno (flameeyes)]

flameeyes    10/10/30 16:22:53

  Modified:             metadata.xml ChangeLog
  Added:                pam_pkcs11-0.6.5-r1.ebuild
  Removed:              pam_pkcs11-0.6.5.ebuild pam_pkcs11-0.6.4.ebuild
  Log:
  Revision bump to fix config file; also add OpenSC to the dependencies (since it's always used), add an nss USE flag to use nss as upstream allows (but make sure to have a compatible curl if requested). Update metadata to add pam to the list of maintainers and to update the documentation of pcsc-lite USE flag (now enabled by default).
  
  (Portage version: 2.2.0_alpha2/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  sys-auth/pam_pkcs11/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_pkcs11/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_pkcs11/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_pkcs11/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	16 Aug 2008 03:45:51 -0000	1.2
+++ metadata.xml	30 Oct 2010 16:22:53 -0000	1.3
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
-<use>
-	<flag name='pcsc-lite'>build with <pkg>sys-apps/pcsc-lite</pkg> instead of
-		<pkg>dev-libs/openct</pkg></flag>
-</use>
+  <herd>crypto</herd>
+  <herd>pam</herd>
+  <use>
+    <flag name='pcsc-lite'>
+      Build the card_eventmanager binary used to detect card removal and lock the sessions. This
+      needs <pkg>sys-apps/pcsc-lite</pkg>.
+    </flag>
+    <flag name='nss'>
+      Use Mozilla NSS (<pkg>dev-libs/nss</pkg>) as provider for PKCS#11 access, rather than using
+      OpenSSL with a custom implementation of the PKC#11 protocol.
+    </flag>
+  </use>
 </pkgmetadata>



1.18                 sys-auth/pam_pkcs11/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	24 Oct 2010 11:05:20 -0000	1.17
+++ ChangeLog	30 Oct 2010 16:22:53 -0000	1.18
@@ -1,6 +1,17 @@
 # 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.17 2010/10/24 11:05:20 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog,v 1.18 2010/10/30 16:22:53 flameeyes Exp $
+
+*pam_pkcs11-0.6.5-r1 (30 Oct 2010)
+
+  30 Oct 2010; Diego E. Pettenò <flameeyes@g.o>
+  -pam_pkcs11-0.6.4.ebuild, -pam_pkcs11-0.6.5.ebuild,
+  +pam_pkcs11-0.6.5-r1.ebuild, metadata.xml:
+  Revision bump to fix config file; also add OpenSC to the dependencies
+  (since it's always used), add an nss USE flag to use nss as upstream
+  allows (but make sure to have a compatible curl if requested). Update
+  metadata to add pam to the list of maintainers and to update the
+  documentation of pcsc-lite USE flag (now enabled by default).
 
 *pam_pkcs11-0.6.5 (24 Oct 2010)
 



1.1                  sys-auth/pam_pkcs11/pam_pkcs11-0.6.5-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_pkcs11/pam_pkcs11-0.6.5-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_pkcs11/pam_pkcs11-0.6.5-r1.ebuild?rev=1.1&content-type=text/plain

Index: pam_pkcs11-0.6.5-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 2010/10/30 16:22:53 flameeyes 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 nss"

RDEPEND="sys-libs/pam
	!nss? (
		dev-libs/openssl
		curl? ( || ( net-misc/curl[-ssl] net-misc/curl[ssl,-nss,-gnutls] ) )
	)
	nss? (
		dev-libs/nss
		curl? ( || ( net-misc/curl[-ssl] net-misc/curl[ssl,nss,-gnutls] ) )
	)
	curl? ( net-misc/curl )
	ldap? ( net-nds/openldap )
	pcsc-lite? ( sys-apps/pcsc-lite )"
DEPEND="${RDEPEND}
	dev-util/pkgconfig"
RDEPEND="${RDEPEND}
	dev-libs/opensc"

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\|\${exec_prefix}\)/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) \
		$(use_with nss) \
		--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.