Re-add support for building berkdb statically.

Package-Manager: portage-2.1.2_pre2-r2

5 files changed, 100 insertions, 18 deletions

diff --git a/sys-auth/pam_userdb/ChangeLog b/sys-auth/pam_userdb/ChangeLog
index 8eb58a4acb1d..0854596606a6 100644
--- a/sys-auth/pam_userdb/ChangeLog
+++ b/sys-auth/pam_userdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/pam_userdb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v 1.1 2006/10/04 07:29:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v 1.2 2006/10/04 08:34:40 flameeyes Exp $
+
+  04 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/Linux-PAM-0.99.6.3-berkdbpam.patch, pam_userdb-0.99.6.3.ebuild:
+  Re-add support for building berkdb statically.
 
 *pam_userdb-0.99.6.3 (04 Oct 2006)
 
diff --git a/sys-auth/pam_userdb/Manifest b/sys-auth/pam_userdb/Manifest
index f3eee943a820..f72b3a93d91b 100644
--- a/sys-auth/pam_userdb/Manifest
+++ b/sys-auth/pam_userdb/Manifest
@@ -1,26 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX Linux-PAM-0.99.6.3-berkdbpam.patch 668 RMD160 adcfb1610b5372e18a0a89d5783348bad4dc3d0b SHA1 bc5ebed0447cb48e1d7a79e9afe316153e787787 SHA256 a1af44e28e2429d88dbe0758de63ebf67cb48c1610b29c4bbc50410fc4731f1b
+MD5 2e021e62cfd180847517510e52139dc6 files/Linux-PAM-0.99.6.3-berkdbpam.patch 668
+RMD160 adcfb1610b5372e18a0a89d5783348bad4dc3d0b files/Linux-PAM-0.99.6.3-berkdbpam.patch 668
+SHA256 a1af44e28e2429d88dbe0758de63ebf67cb48c1610b29c4bbc50410fc4731f1b files/Linux-PAM-0.99.6.3-berkdbpam.patch 668
 DIST Linux-PAM-0.99.6.3.tar.bz2 863340 RMD160 9c02478d0b5fe5af72b736a64ede6b09618c98e0 SHA1 984f86b5a767fba1572c7963b8f8c997132fff2b SHA256 8468b0fd062cead62a66a048280d28ed70420eefc55b5c9a3fdb361891f2ccd4
-EBUILD pam_userdb-0.99.6.3.ebuild 1580 RMD160 df3bc98186bfef8043d3d575206f6fafaf667caa SHA1 f951d87d47c175ff0d9428d7c38d7e39f91ad8e6 SHA256 1fb4f8f0fefe652c473596f2b10c575ca292a1cc9b77ab2f9bb2a944e409bd90
-MD5 b78cddabccc21563f97f3fac0f15a7af pam_userdb-0.99.6.3.ebuild 1580
-RMD160 df3bc98186bfef8043d3d575206f6fafaf667caa pam_userdb-0.99.6.3.ebuild 1580
-SHA256 1fb4f8f0fefe652c473596f2b10c575ca292a1cc9b77ab2f9bb2a944e409bd90 pam_userdb-0.99.6.3.ebuild 1580
-MISC ChangeLog 421 RMD160 a15be527729d2473d23312e0c22ceb77b386d931 SHA1 0b097f7e3170ff04fe93585523c204d0f33d4847 SHA256 80f4154a983b34746d82a15a1dfe31a9786d48916c6c41cdea1f6dd745001e78
-MD5 f0f8f01e44a134a52b8e86d75b279295 ChangeLog 421
-RMD160 a15be527729d2473d23312e0c22ceb77b386d931 ChangeLog 421
-SHA256 80f4154a983b34746d82a15a1dfe31a9786d48916c6c41cdea1f6dd745001e78 ChangeLog 421
+DIST db-4.3.29.tar.gz 6103264 RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b SHA1 7ddac51fcbd5945aed154be2ee1fe166b3acd628 SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4
+EBUILD pam_userdb-0.99.6.3.ebuild 3363 RMD160 50e17b6aadc591f7efde4d46e904ff53a121ca6a SHA1 bea897924b008cfde5e857f8c0deb699064f9a62 SHA256 bb9facc2540e0499f1f0f99bf23e1f77ded52fba33249a900d3aaf82b32e7caf
+MD5 fbe09455f4682b963c80d46f93b951de pam_userdb-0.99.6.3.ebuild 3363
+RMD160 50e17b6aadc591f7efde4d46e904ff53a121ca6a pam_userdb-0.99.6.3.ebuild 3363
+SHA256 bb9facc2540e0499f1f0f99bf23e1f77ded52fba33249a900d3aaf82b32e7caf pam_userdb-0.99.6.3.ebuild 3363
+MISC ChangeLog 597 RMD160 942bd6c14f0cd37892b9f2b6910ec53b93a3308e SHA1 e1588e704c249d4e223be87e816b0582d98b0e3d SHA256 c536bd11150f7cfd8b4554943b26fd7f3e1365dde33ffe21a928cd8ab2c4f122
+MD5 3f043414263aa3ac43c5d79822a515e5 ChangeLog 597
+RMD160 942bd6c14f0cd37892b9f2b6910ec53b93a3308e ChangeLog 597
+SHA256 c536bd11150f7cfd8b4554943b26fd7f3e1365dde33ffe21a928cd8ab2c4f122 ChangeLog 597
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
 SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c metadata.xml 218
-MD5 908844567621b16e0e2bdecb789c27a3 files/digest-pam_userdb-0.99.6.3 259
-RMD160 3f02ccfaf84966f22db9306c6aa912fe1de07a76 files/digest-pam_userdb-0.99.6.3 259
-SHA256 ec33fef3deb83b8589594fee5532ab7e8ddfbd29feb56497f8779bfd419ac8f7 files/digest-pam_userdb-0.99.6.3 259
+MD5 650dcefdfe741fe73766f551cb658db3 files/digest-pam_userdb-0.99.6.3 491
+RMD160 b4d27b0a9ce5341505df826a8b0abf9fa55e75e0 files/digest-pam_userdb-0.99.6.3 491
+SHA256 15bc6a434ce490e32ec2bd026596abc89cc53df3b738b7d9e17013c79d28f328 files/digest-pam_userdb-0.99.6.3 491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFI2LrAiZjviIA2XgRAv+YAJ9YopWqRD/pnLPAQN7NNwSW5LMdFgCgz8FC
-exeOfehPyTQpNpTUAjqcNrk=
-=EdZ5
+iD8DBQFFI3InAiZjviIA2XgRAtuqAKDsB8+xU1Ye/Yx63uaAJ/Ezau9SPwCdH6je
+1EK811ZNHSBDacpepwqKfI8=
+=eVXs
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_userdb/files/Linux-PAM-0.99.6.3-berkdbpam.patch b/sys-auth/pam_userdb/files/Linux-PAM-0.99.6.3-berkdbpam.patch
new file mode 100644
index 000000000000..b42c4e9a4ee7
--- /dev/null
+++ b/sys-auth/pam_userdb/files/Linux-PAM-0.99.6.3-berkdbpam.patch
@@ -0,0 +1,14 @@
+--- Linux-PAM-0.99.5.0/configure.in	2006-07-01 16:21:41.000000000 +0200
++++ Linux-PAM-0.99.5.0.az/configure.in	2006-07-01 16:22:03.000000000 +0200
+@@ -331,9 +331,9 @@
+ 
+ dnl check for libdb or libndbm as fallback. Some libndbm compat
+ dnl libraries are unuseable, so try libdb first.
+-AC_CHECK_LIB([db], [db_create], LIBDB="-ldb", LIBDB="")
++AC_CHECK_LIB([db_pam], [db_create_pam], LIBDB="-ldb_pam", LIBDB="")
+ if test -z "$LIBDB" ; then
+-    AC_CHECK_LIB([db], [dbm_store], LIBDB="-ldb", LIBDB="")
++    AC_CHECK_LIB([db_pam], [dbm_store_pam], LIBDB="-ldb_pam", LIBDB="")
+ fi
+ if test -z "$LIBDB" ; then
+     AC_CHECK_LIB([ndbm],[dbm_store], LIBDB="-lndbm", LIBDB="")
diff --git a/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.6.3 b/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.6.3
index 48bbbcaac6a2..f293a5c1b81a 100644
--- a/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.6.3
+++ b/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.6.3
@@ -1,3 +1,6 @@
 MD5 4c2830ed55a41e795af6a482009a036c Linux-PAM-0.99.6.3.tar.bz2 863340
 RMD160 9c02478d0b5fe5af72b736a64ede6b09618c98e0 Linux-PAM-0.99.6.3.tar.bz2 863340
 SHA256 8468b0fd062cead62a66a048280d28ed70420eefc55b5c9a3fdb361891f2ccd4 Linux-PAM-0.99.6.3.tar.bz2 863340
+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.6.3.ebuild b/sys-auth/pam_userdb/pam_userdb-0.99.6.3.ebuild
index beaa18998c1c..255e871e1bc0 100644
--- a/sys-auth/pam_userdb/pam_userdb-0.99.6.3.ebuild
+++ b/sys-auth/pam_userdb/pam_userdb-0.99.6.3.ebuild
@@ -1,15 +1,24 @@
 # Copyright 1999-2006 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.6.3.ebuild,v 1.1 2006/10/04 07:29:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.6.3.ebuild,v 1.2 2006/10/04 08:34:40 flameeyes Exp $
 
-inherit libtool multilib eutils pam
+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"
+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"
@@ -20,6 +29,8 @@ RDEPEND="nls? ( virtual/libintl )
 	>=sys-libs/pam-0.99.6.3-r1"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	berkdb? ( >=sys-libs/db-${BDB_VER} )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -29,6 +40,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${MY_P}-berkdbpam.patch"
+	AT_M4DIR="m4" eautoreconf
+
 	elibtoolize
 }
 
@@ -46,6 +60,48 @@ src_compile() {
 		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 \