Add patch to fix building with Berkeley DB 5.0, closes bug #319831. Thanks to Lars Wendler for reporting.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 29 insertions, 7 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index d18253b9f8ca..1c32a174a51b 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.258 2010/04/26 12:04:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.259 2010/05/18 14:45:05 flameeyes Exp $
+
+  18 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> pam-1.1.1-r2.ebuild,
+  +files/Linux-PAM-1.1.1+berkdb-5.patch:
+  Add patch to fix building with Berkeley DB 5.0, closes bug #319831. Thanks
+  to Lars Wendler for reporting.
 
   26 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch, -pam-1.0.4.ebuild,
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index a1f967810e3b..cbdf5079d8c3 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -7,6 +7,7 @@ AUX Linux-PAM-1.1.0-debug.patch 565 RMD160 545e499fa45d7ec568387f4ee4fd8474cbfb3
 AUX Linux-PAM-1.1.0-nonls.patch 367 RMD160 80ff3ce536e3bf3cb4e4448bf1062972b2b143bf SHA1 f67af3138312092514f61212073392779084d877 SHA256 7777ca2a86e716ee4cc5b2059d45bd526d8d887a81f5ec083a59076245c4a429
 AUX Linux-PAM-1.1.0-uclibc.patch 2643 RMD160 4294e27b8d90d8d9ee93c427d7eaf8af419f72f6 SHA1 aae4eb27892e1671c34d045a2d596d834aeb95e5 SHA256 b20ff20402778ff174694fe059afeecc6e8df8266d8ecae30419c7c930ffa5ae
 AUX Linux-PAM-1.1.0-xcrypt.patch 609 RMD160 115048d4d4d501c03ea5604c0f5bb6f10435fe8b SHA1 2e5cb04fa6d10c3b19800d555e30b590a651583f SHA256 98304d8534bc44c3acbf5300f06a25c30b3ec8ce9e19bcacd6112b8434857398
+AUX Linux-PAM-1.1.1+berkdb-5.patch 473 RMD160 a03806a7406c97944b7efbd0cc624c219fa13c20 SHA1 1cd13c810fb1c967734e78c1fdec75e176261544 SHA256 76c9cea947452e1d15ab815df7052bf74e434ab598dde7e5afab8e46cf8c7dd0
 AUX Linux-PAM-1.1.1-gentoodb.patch 1145 RMD160 a9f8a6adf67f4804eaf0dab51d48545bf2ab41cf SHA1 48b08cccd47f1fe63d3ac9c048e071c9955bf657 SHA256 7cbb9477d9a83b642e9f2a5e4d9be7c0831b7d131890482c623e08a2193beadc
 AUX Linux-PAM-1.1.1-xcrypt.patch 867 RMD160 8742c63058f01198b3c0bc5e6c0a430c90c65b90 SHA1 0c8830ceb483ff071f2aa5722c16c52183b3de55 SHA256 447b85fd045c688fa995791f58c6be45e73dec071dd43ee9773df1a6b7eb0486
 DIST Linux-PAM-1.1.0-docs.tar.bz2 494697 RMD160 324f4cdabbaaa85ac5afca9babea1bfe21e32285 SHA1 56cdc680d48a3dc1ffbd9becb855a4724d5f39ad SHA256 7d8e4455cf44937ccc0c7fb370d469c9bef33c68979b23f706fb37727bf8812b
@@ -14,13 +15,13 @@ DIST Linux-PAM-1.1.0.tar.bz2 1106379 RMD160 b57473ac39ef5c5ec22459e78e00abdbead3
 DIST Linux-PAM-1.1.1-docs.tar.bz2 495534 RMD160 182639c3fa79c96dbc263f2d16346345949bb0c8 SHA1 9e25f276546844bb5a58f30b5e5d5a97d25c5af5 SHA256 89950180aba6e5e05671c43d970d9738fd2b71b1421a2cf4d504f5c529586ac6
 DIST Linux-PAM-1.1.1.tar.bz2 1120055 RMD160 2d3c39cb2c3542d380e1331fef08c7086cc829d9 SHA1 8baf11b04396230ba7cf8b2bfb2d2bd75aab8fa6 SHA256 608d3eb9d7a5e1a7505fff62e6a583fdb6e52dc05bf54dc9661c5f395b1fb904
 EBUILD pam-1.1.0.ebuild 5250 RMD160 72b539e4564fc086b55202216c4b42ca20b7790c SHA1 a5ea008a77a8538e299331f4979097047c66cbcb SHA256 d119aedf71062fbb30a5d818df9bccdaa7ef170c3af479858793964a18c96fbd
-EBUILD pam-1.1.1-r2.ebuild 5566 RMD160 27852232e3642f5e4f1ffe047a7d34199e22b59e SHA1 b490d2be67f5271d553e5ea492ec4bfe54b930f1 SHA256 e3375c52945bda35e29b3df9a557bba0c036b1a61ed10da04febbf063b0711eb
-MISC ChangeLog 41709 RMD160 d94563a9c380386183b0d4fe4270cb8a888ea3c5 SHA1 4f14ebd6d44b3581ecdb0a47866f8358f6a3f7d6 SHA256 b0ab04ca30f83517cbc71a7d2a59a9dacb735bcedfb7fd439a38876ac2d6b687
+EBUILD pam-1.1.1-r2.ebuild 5725 RMD160 9a806d9c4574267b00ff70d90e5b9619628a1af7 SHA1 bf963b2d4df71dd88133211334bae085608896ae SHA256 c3aa0681d8864c7971431a14e424336e283e0ee226e609c1faf2c43f6b9c31f7
+MISC ChangeLog 41938 RMD160 1849677cbfc36a74c7fec9ce285725fa30527703 SHA1 b56148faa6fd506fe326ec861b1d204344c54a2c SHA256 8cb349a16457cda25fd8cfb59f91ba3b8acd97522d64194dda17b5710cf77589
 MISC metadata.xml 1129 RMD160 a800f5ac4255ca20c26791ff0b57c3c923666623 SHA1 99e58550271cf1c3e23c4547387469a0d211ae55 SHA256 e160643aca26e0418b31429836ae1b4c673474cd6130b7e2ac0d0bf41380df0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvVgUYACgkQAiZjviIA2Xi9lwCg1JibCgsTv0zcAiB+LFD+G3cK
-+qEAoNMB2RaPgmXKteSLbPvO0OtEig9p
-=ZJbT
+iEYEARECAAYFAkvyp+0ACgkQAiZjviIA2Xh67ACgxc75qi2U5XPI5HFdwRITdR+0
+XswAoK79pXUychj3VzBTOPumbYubS3Ru
+=Fypj
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.1+berkdb-5.patch b/sys-libs/pam/files/Linux-PAM-1.1.1+berkdb-5.patch
new file mode 100644
index 000000000000..ece92119b29a
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.1+berkdb-5.patch
@@ -0,0 +1,12 @@
+Index: Linux-PAM-1.1.1/modules/pam_userdb/pam_userdb.c
+===================================================================
+--- Linux-PAM-1.1.1.orig/modules/pam_userdb/pam_userdb.c
++++ Linux-PAM-1.1.1/modules/pam_userdb/pam_userdb.c
+@@ -30,6 +30,7 @@
+ #else
+ # ifdef HAVE_DB_H
+ #  define DB_DBM_HSEARCH    1 /* use the dbm interface */
++#  define HAVE_DBM            /* for BerkDB 5.0 and later */
+ #  include <db.h>
+ # else
+ #  error "failed to find a libdb or equivalent"
diff --git a/sys-libs/pam/pam-1.1.1-r2.ebuild b/sys-libs/pam/pam-1.1.1-r2.ebuild
index 4a7195a2e871..1f5b646e2eff 100644
--- a/sys-libs/pam/pam-1.1.1-r2.ebuild
+++ b/sys-libs/pam/pam-1.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1-r2.ebuild,v 1.2 2010/04/26 12:04:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1-r2.ebuild,v 1.3 2010/05/18 14:45:05 flameeyes Exp $
 
 EAPI="3"
 
@@ -98,6 +98,10 @@ src_prepare() {
 	# found
 	epatch "${FILESDIR}/${MY_PN}-1.1.1-xcrypt.patch"
 
+	# fix building with Berkeley DB 5.0 and later; now defining
+	# DB_DBM_HSEARCH is not enough; bug #319831
+	epatch "${FILESDIR}/${MY_PN}-1.1.1+berkdb-5.patch"
+
 	# Remove libtool-2 libtool macros, see bug 261167
 	rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."