diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-11-03 10:50:00 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-11-03 10:50:00 +0000 |
| commit | 3e01ecfda25a6e8095f87cb026fccadeac4ae8f7 (patch) | |
| tree | 3b2e8cf12e7002fbe8b764ebbdd86cd84f3728fd | |
| parent | add page_alloc patch; add linux-2.5 patches (diff) | |
| download | historical-3e01ecfda25a6e8095f87cb026fccadeac4ae8f7.tar.gz historical-3e01ecfda25a6e8095f87cb026fccadeac4ae8f7.tar.bz2 historical-3e01ecfda25a6e8095f87cb026fccadeac4ae8f7.zip | |
fix pam_userdb.so linking against wrong libdb problem
| -rw-r--r-- | sys-libs/pam/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/pam/files/pam-0.75-pam_userdb-use-db3.patch | 50 | ||||
| -rw-r--r-- | sys-libs/pam/pam-0.75-r10.ebuild | 8 |
3 files changed, 63 insertions, 3 deletions
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog index bec4294fcf9e..cae4903e6b01 100644 --- a/sys-libs/pam/ChangeLog +++ b/sys-libs/pam/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/pam # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.14 2002/10/26 10:11:15 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.15 2002/11/03 10:50:00 azarah Exp $ + + 26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> pam-0.75-r10.ebuild : + + Add pam-0.75-pam_userdb-use-db3.patch to get pam_userdb to link to + db3 or db4 if present, rather than libndbm, as that causes unresolved + symbols. *pam-0.75-r10 (26 Oct 2002) diff --git a/sys-libs/pam/files/pam-0.75-pam_userdb-use-db3.patch b/sys-libs/pam/files/pam-0.75-pam_userdb-use-db3.patch new file mode 100644 index 000000000000..2fb9793eb2c4 --- /dev/null +++ b/sys-libs/pam/files/pam-0.75-pam_userdb-use-db3.patch @@ -0,0 +1,50 @@ +diff -urN pam_userdb.orig/Makefile pam_userdb/Makefile +--- Linux-PAM-0.75/modules/pam_userdb/Makefile.orig 2002-11-03 12:09:40.000000000 +0200 ++++ Linux-PAM-0.75/modules/pam_userdb/Makefile 2002-11-03 12:23:50.000000000 +0200 +@@ -12,7 +12,7 @@ + + ifeq ($(HAVE_NDBM_H),yes) + WHICH_DB=ndbm +- MODULE_SIMPLE_EXTRALIBS = -lndbm ++ MODULE_SIMPLE_EXTRALIBS = `sh ./dbversion.sh` + else + ifeq ($(HAVE_LIBDB),yes) + WHICH_DB=db +diff -urN pam_userdb.orig/dbversion.sh pam_userdb/dbversion.sh +--- Linux-PAM-0.75/modules/pam_userdb/dbversion.sh.orig 1970-01-01 02:00:00.000000000 +0200 ++++ Linux-PAM-0.75/modules/pam_userdb/dbversion.sh 2002-11-03 12:25:35.000000000 +0200 +@@ -0,0 +1,34 @@ ++#!/bin/sh ++ ++# libndbm functionality is included in db3 and db4, so ++# rather use them if found ... ++ ++list=`ls /lib/libdb.so.4* /usr/lib/libdb.so.4* 2>/dev/null` ++if [ -n "$list" ] ++then ++ for x in $list ++ do ++ if [ -e $x ] ++ then ++ echo "$x" ++ exit 0 ++ fi ++ done ++fi ++ ++list=`ls /lib/libdb.so.3* /usr/lib/libdb.so.3* 2>/dev/null` ++if [ -n "$list" ] ++then ++ for x in $list ++ do ++ if [ -e $x ] ++ then ++ echo "$x" ++ exit 0 ++ fi ++ done ++fi ++ ++echo "-lndbm" ++exit 0 ++ diff --git a/sys-libs/pam/pam-0.75-r10.ebuild b/sys-libs/pam/pam-0.75-r10.ebuild index 1c777542a2b9..81710d82048d 100644 --- a/sys-libs/pam/pam-0.75-r10.ebuild +++ b/sys-libs/pam/pam-0.75-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.75-r10.ebuild,v 1.1 2002/10/26 10:11:15 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.75-r10.ebuild,v 1.2 2002/11/03 10:50:00 azarah Exp $ IUSE="berkdb" @@ -26,7 +26,7 @@ DEPEND=">=sys-libs/cracklib-2.7-r3 >=sys-devel/automake-1.6 >=sys-devel/flex-2.5.4a-r5 berkdb? ( ~sys-libs/db-1.85 - ~sys-libs/db-3.2.9 )" + >=sys-libs/db-3.2.9 )" src_unpack() { unpack ${A} @@ -49,6 +49,10 @@ src_unpack() { fi done + # Get pam_userdb to link to db3 or db4 if they exist + # <azarah@gentoo.org> (3 Nov 2002) + cd ${S}; patch -p1 < ${FILESDIR}/${P}-pam_userdb-use-db3.patch || die + for readme in modules/pam_*/README do cp -f ${readme} doc/txts/README.$(dirname ${readme} | sed -e 's|^modules/||') |