[oe-commits] Khem Raj : libpam_1.1.0.bb: Add patch to fix running with DB5

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 9d886cd149d1ed68dfb82ca0a4a01112a187ea05
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9d886cd149d1ed68dfb82ca0a4a01112a187ea05

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue Jun  8 14:22:42 2010 -0700

libpam_1.1.0.bb: Add patch to fix running with DB5

* Imported from gentoo bug #319831

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/pam/libpam-1.1.0/define-HAVE_DBM.patch |   12 ++++++++++++
 recipes/pam/libpam_1.1.0.bb                    |    3 ++-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/recipes/pam/libpam-1.1.0/define-HAVE_DBM.patch b/recipes/pam/libpam-1.1.0/define-HAVE_DBM.patch
new file mode 100644
index 0000000..eceb67d
--- /dev/null
+++ b/recipes/pam/libpam-1.1.0/define-HAVE_DBM.patch
@@ -0,0 +1,12 @@
+Index: Linux-PAM-1.1.0/modules/pam_userdb/pam_userdb.c
+===================================================================
+--- Linux-PAM-1.1.0.orig/modules/pam_userdb/pam_userdb.c	2010-06-08 14:19:25.147555285 -0700
++++ Linux-PAM-1.1.0/modules/pam_userdb/pam_userdb.c	2010-06-08 14:20:50.707692049 -0700
+@@ -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/recipes/pam/libpam_1.1.0.bb b/recipes/pam/libpam_1.1.0.bb
index 3e88376..b54e81a 100644
--- a/recipes/pam/libpam_1.1.0.bb
+++ b/recipes/pam/libpam_1.1.0.bb
@@ -15,7 +15,7 @@ DEPENDS = "flex flex-native"
 # PAM is not a lot of use without configuration files and the plugins
 RRECOMMENDS_${PN} = "libpam-meta libpam-base-files"
 
-PR = "r1"
+PR = "r2"
 
 # The project is actually called Linux-PAM but that gives
 # a bad OE package name because of the upper case characters
@@ -26,6 +26,7 @@ S = "${WORKDIR}/${p}"
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/pam/library/${p}.tar.bz2 \
            file://pam-nodocs.patch \
            file://fix_disabled_nls.patch \
+           file://define-HAVE_DBM.patch \
           "
 
 UCLIBC_PATCHES = " file://pam-disable-nis-on-uclibc.patch \