Cleanup old versions; add a new revision hiding symbols. Add to pam herd as well as crypto.

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

8 files changed, 63 insertions, 83 deletions

diff --git a/sys-auth/pam_p11/ChangeLog b/sys-auth/pam_p11/ChangeLog
index 079dbe39ee78..d686ca168c93 100644
--- a/sys-auth/pam_p11/ChangeLog
+++ b/sys-auth/pam_p11/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-auth/pam_p11
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_p11/ChangeLog,v 1.29 2009/06/09 02:22:29 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_p11/ChangeLog,v 1.30 2010/10/30 19:52:16 flameeyes Exp $
+
+*pam_p11-0.1.5-r1 (30 Oct 2010)
+
+  30 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pam_p11-0.1.3.ebuild, -files/pam_p11-0.1.3-qa.patch,
+  -pam_p11-0.1.4.ebuild, pam_p11-0.1.5.ebuild, +pam_p11-0.1.5-r1.ebuild,
+  +files/pam_symbols.ver, metadata.xml:
+  Cleanup old versions; add a new revision hiding symbols. Add to pam herd
+  as well as crypto.
 
   09 Jun 2009; Jeroen Roovers <jer@gentoo.org> pam_p11-0.1.5.ebuild:
   Stable for HPPA (bug #268674).
diff --git a/sys-auth/pam_p11/files/pam_p11-0.1.3-qa.patch b/sys-auth/pam_p11/files/pam_p11-0.1.3-qa.patch
deleted file mode 100644
index 12eb62fca861..000000000000
--- a/sys-auth/pam_p11/files/pam_p11-0.1.3-qa.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urNp pam_p11-0.1.3.org/src/test.c pam_p11-0.1.3/src/test.c
---- pam_p11-0.1.3.org/src/test.c	2005-12-26 22:44:06.000000000 +0200
-+++ pam_p11-0.1.3/src/test.c	2007-11-10 19:35:10.000000000 +0200
-@@ -3,6 +3,7 @@
- 
- #include <security/pam_appl.h>
- #include <security/pam_misc.h>
-+#include <security/pam_modules.h>
- 
- int main(int argc, char **argv)
- {
diff --git a/sys-auth/pam_p11/files/pam_symbols.ver b/sys-auth/pam_p11/files/pam_symbols.ver
new file mode 100644
index 000000000000..dbc677b77a2d
--- /dev/null
+++ b/sys-auth/pam_p11/files/pam_symbols.ver
@@ -0,0 +1,4 @@
+{
+	global: pam_sm_*;
+	local: *;
+};
diff --git a/sys-auth/pam_p11/metadata.xml b/sys-auth/pam_p11/metadata.xml
index fed9944cb13d..eb061ae9d512 100644
--- a/sys-auth/pam_p11/metadata.xml
+++ b/sys-auth/pam_p11/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<longdescription>
-		pam_p11 is a plugable authentication module package for using
-		cryptographic tokens for authentication.
-	</longdescription>
+  <herd>crypto</herd>
+  <herd>pam-bugs</herd>
 </pkgmetadata>
diff --git a/sys-auth/pam_p11/pam_p11-0.1.3.ebuild b/sys-auth/pam_p11/pam_p11-0.1.3.ebuild
deleted file mode 100644
index caae06ff6dbc..000000000000
--- a/sys-auth/pam_p11/pam_p11-0.1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_p11/pam_p11-0.1.3.ebuild,v 1.10 2008/06/19 11:04:39 dragonheart Exp $
-
-inherit pam eutils
-
-DESCRIPTION="pam_p11 is a pam package for using cryptographic tokens as authentication"
-HOMEPAGE="http://www.opensc-project.org/pam_p11/"
-SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/pam
-		dev-libs/libp11
-		dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-qa.patch"
-}
-
-src_install() {
-	dopammod src/.libs/pam_p11_opensc.so
-	dopammod src/.libs/pam_p11_openssh.so
-
-	dohtml doc/*.html doc/*.css
-}
diff --git a/sys-auth/pam_p11/pam_p11-0.1.4.ebuild b/sys-auth/pam_p11/pam_p11-0.1.4.ebuild
deleted file mode 100644
index 34c523b03509..000000000000
--- a/sys-auth/pam_p11/pam_p11-0.1.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_p11/pam_p11-0.1.4.ebuild,v 1.2 2009/05/25 19:08:15 ranger Exp $
-
-inherit pam
-
-DESCRIPTION="pam_p11 is a pam package for using cryptographic tokens as authentication"
-HOMEPAGE="http://www.opensc-project.org/pam_p11/"
-SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-		dev-libs/libp11
-		dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-#MAKEOPTS="${MAKEOPTS} -j1"
-
-src_install() {
-	dopammod src/.libs/pam_p11_opensc.so
-	dopammod src/.libs/pam_p11_openssh.so
-
-	dohtml doc/*.html doc/*.css
-}
diff --git a/sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild b/sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..ac1df7d968fa
--- /dev/null
+++ b/sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild,v 1.1 2010/10/30 19:52:16 flameeyes Exp $
+
+EAPI=2
+
+inherit pam flag-o-matic
+
+DESCRIPTION="PAM module for authenticating against PKCS#11 tokens"
+HOMEPAGE="http://www.opensc-project.org/pam_p11/"
+SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/pam
+		dev-libs/libp11
+		dev-libs/openssl"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_configure() {
+	# hide all the otherwise-exported symbols that may clash with
+	# other software loading the PAM modules (see bug #274924 as an
+	# example).
+	append-ldflags -Wl,--version-script="${FILESDIR}"/pam_symbols.ver
+
+	econf \
+		--disable-static \
+		--disable-dependency-tracking \
+		--enable-fast-install \
+		|| die
+}
+
+src_install() {
+	dopammod src/.libs/pam_p11_opensc.so
+	dopammod src/.libs/pam_p11_openssh.so
+
+	dohtml doc/*.html doc/*.css || die
+	dodoc NEWS || die
+}
diff --git a/sys-auth/pam_p11/pam_p11-0.1.5.ebuild b/sys-auth/pam_p11/pam_p11-0.1.5.ebuild
index 2316c9cf60e4..480e86a4dc80 100644
--- a/sys-auth/pam_p11/pam_p11-0.1.5.ebuild
+++ b/sys-auth/pam_p11/pam_p11-0.1.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_p11/pam_p11-0.1.5.ebuild,v 1.8 2009/06/09 02:22:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_p11/pam_p11-0.1.5.ebuild,v 1.9 2010/10/30 19:52:16 flameeyes Exp $
 
 inherit pam
 
-DESCRIPTION="pam_p11 is a pam package for using cryptographic tokens as authentication"
+DESCRIPTION="PAM module for authenticating against PKCS#11 tokens"
 HOMEPAGE="http://www.opensc-project.org/pam_p11/"
 SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"