Bump to current Linux-PAM version, change the dependency to block older Linux-PAM so that the dependency over Linux-PAM can be replaced with a virtual dependency, for usage with OpenPAM.

(Portage version: 2.1.3_rc6)

4 files changed, 164 insertions, 1 deletions

diff --git a/sys-auth/pam_userdb/ChangeLog b/sys-auth/pam_userdb/ChangeLog
index 0d62f1ee205c..3fdbbbe4a109 100644
--- a/sys-auth/pam_userdb/ChangeLog
+++ b/sys-auth/pam_userdb/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-auth/pam_userdb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v 1.11 2007/07/02 15:28:53 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v 1.12 2007/07/08 15:37:36 flameeyes Exp $
+
+*pam_userdb-0.99.8.0 (08 Jul 2007)
+
+  08 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/Linux-PAM-0.99.8.0-berkdb-uniquename.patch,
+  +pam_userdb-0.99.8.0.ebuild:
+  Bump to current Linux-PAM version, change the dependency to block older
+  Linux-PAM so that the dependency over Linux-PAM can be replaced with a
+  virtual dependency, for usage with OpenPAM.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   pam_userdb-0.99.6.3.ebuild:
diff --git a/sys-auth/pam_userdb/files/Linux-PAM-0.99.8.0-berkdb-uniquename.patch b/sys-auth/pam_userdb/files/Linux-PAM-0.99.8.0-berkdb-uniquename.patch
new file mode 100644
index 000000000000..45223a6809de
--- /dev/null
+++ b/sys-auth/pam_userdb/files/Linux-PAM-0.99.8.0-berkdb-uniquename.patch
@@ -0,0 +1,20 @@
+Index: Linux-PAM-0.99.8.0/configure.in
+===================================================================
+--- Linux-PAM-0.99.8.0.orig/configure.in
++++ Linux-PAM-0.99.8.0/configure.in
+@@ -351,11 +351,13 @@ dnl libraries are unuseable, so try libd
+ AC_ARG_ENABLE([db],
+         AC_HELP_STRING([--enable-db=(db|ndbm|yes|no)],[Default behavior 'yes', which is to check for libdb first, followed by ndbm. Use 'no' to disable db support.]),
+         WITH_DB=$enableval, WITH_DB=yes)
++AC_ARG_WITH([db-uniquename],
++	AC_HELP_STRING([--with-db-uniquename=extension],[Unique name for db libraries and functions.]))
+ if test x"$WITH_DB" != xno ; then
+         if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then
+-              AC_CHECK_LIB([db], [db_create], LIBDB="-ldb", LIBDB="")
++              AC_CHECK_LIB([db$with_db_uniquename], [db_create$with_db_uniquename], LIBDB="-ldb$with_db_uniquename", LIBDB="")
+               if test -z "$LIBDB" ; then
+-                  AC_CHECK_LIB([db], [dbm_store], LIBDB="-ldb", LIBDB="")
++                  AC_CHECK_LIB([db$with_db_uniquename], [dbm_store$with_db_uniquename], LIBDB="-ldb$with_db_uniquename", LIBDB="")
+               fi
+         fi
+         if test -z "$LIBDB" ; then
diff --git a/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.8.0 b/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.8.0
new file mode 100644
index 000000000000..1938eb9fdce8
--- /dev/null
+++ b/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.8.0
@@ -0,0 +1,6 @@
+MD5 e05a9a1e95ec9bcfa5c09d44f46ad943 Linux-PAM-0.99.8.0.tar.bz2 903366
+RMD160 9e2c9bc00318ef711a2af4561a1c763c2ca28db5 Linux-PAM-0.99.8.0.tar.bz2 903366
+SHA256 4b42990b4cada5ad0abefd6048b8646b17813448fbf13d758cbce605908f02a2 Linux-PAM-0.99.8.0.tar.bz2 903366
+MD5 13585a20ce32f113b8e8cdb57f52e3bb db-4.3.29.tar.gz 6103264
+RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b db-4.3.29.tar.gz 6103264
+SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4 db-4.3.29.tar.gz 6103264
diff --git a/sys-auth/pam_userdb/pam_userdb-0.99.8.0.ebuild b/sys-auth/pam_userdb/pam_userdb-0.99.8.0.ebuild
new file mode 100644
index 000000000000..ec43533c1586
--- /dev/null
+++ b/sys-auth/pam_userdb/pam_userdb-0.99.8.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.8.0.ebuild,v 1.1 2007/07/08 15:37:36 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit libtool multilib eutils pam autotools toolchain-funcs flag-o-matic
+
+# BDB is internalized to get a non-threaded lib for pam_userdb.so to
+# be built with.  The runtime-only dependency on BDB suggests the user
+# will use the system-installed db_load to create pam_userdb databases.
+BDB_VER="4.3.29"
+
+MY_P="Linux-PAM-${PV}"
+
+HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
+DESCRIPTION="Linux-PAM pam_userdb (Berkeley DB) module"
+
+SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/${MY_P}.tar.bz2
+	http://downloads.sleepycat.com/db-${BDB_VER}.tar.gz"
+
+LICENSE="PAM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls elibc_FreeBSD"
+
+RDEPEND="nls? ( virtual/libintl )
+	!<sys-libs/pam-0.99
+	>=sys-libs/pam-0.99.6.3-r1"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	>=sys-libs/db-${BDB_VER}"
+
+S="${WORKDIR}/${MY_P}"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${MY_P}-berkdb-uniquename.patch"
+	AT_M4DIR="m4" eautoreconf
+
+	elibtoolize
+}
+
+src_compile() {
+	local myconf
+
+	# don't build documentation as it doesn't seem to really work
+	export SGML2PS=no
+	export SGML2TXT=no
+	export SGML2HTML=no
+	export SGML2LATEX=no
+	export PS2PDF=no
+
+	if use hppa || use elibc_FreeBSD; then
+		myconf="${myconf} --disable-pie"
+	fi
+
+	local BDB_DIR="${WORKDIR}/db-${BDB_VER}"
+
+	# BDB is internalized to get a non-threaded lib for pam_userdb.so to
+	# be built with.  To demand-load a shared library which uses threads
+	# into an application which doesn't is a Very Bad Idea!
+	einfo "Building Berkley DB ${BDB_VER}..."
+	cd "${BDB_DIR}/build_unix" || die
+
+	CFLAGS="${CFLAGS} -fPIC" \
+		ECONF_SOURCE="../dist" \
+		econf \
+		--disable-compat185 \
+		--disable-cxx \
+		--disable-diagnostic \
+		--disable-dump185 \
+		--disable-java \
+		--disable-rpc \
+		--disable-tcl \
+		--disable-shared \
+		--disable-o_direct \
+		--with-pic \
+		--with-uniquename="_pam" \
+		--with-mutex="UNIX/fcntl" \
+		--prefix="${S}/modules/pam_userdb" \
+		--includedir="${S}/modules/pam_userdb" \
+		--libdir="${S}/modules/pam_userdb" || die "Bad BDB ./configure"
+
+	# XXX: hack out O_DIRECT support in db4 for now.
+	#	   (Done above now with --disable-o_direct now)
+
+	emake CC="$(tc-getCC)" || die "BDB build failed"
+	emake install || die
+
+	# We link against libdb_pam (*-dbpam.patch), else stupid libtool goes
+	# and relinks it during install to libdb in /usr/lib
+	cp -f "${S}"/modules/pam_userdb/libdb{,_pam}.a
+
+	# Make sure out static libs are used
+	append-flags -I "{S}/modules/pam_userdb"
+	append-ldflags -L "${S}/modules/pam_userdb"
+
+	cd "${S}"
+	econf \
+		$(use_enable nls) \
+		--enable-berkdb \
+		--enable-securedir=/$(get_libdir)/security \
+		--enable-isadir=/$(get_libdir)/security \
+		--disable-dependency-tracking \
+		--disable-prelude \
+		--enable-docdir=/usr/share/doc/${PF} \
+		--with-db-uniquename=_pam \
+		${myconf} || die "econf failed"
+
+	cd "${S}/modules/pam_userdb"
+	emake || die "emake failed"
+}
+
+src_install() {
+	cd "${S}/modules/pam_userdb"
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc "${S}/modules/pam_userdb/README"
+
+	# No, we don't really need .la files for PAM modules.
+	rm -f "${D}/$(get_libdir)/security/"*.la
+}