[arch-commits] Commit in pam/trunk (PKGBUILD pam-1.1.1-db5.patch)

[Allan McRae]

    Date: Tuesday, October 19, 2010 @ 07:54:04
  Author: allan
Revision: 96216

upgpkg: pam 1.1.1-2
db-5.1 rebuild

Added:
  pam/trunk/pam-1.1.1-db5.patch
Modified:
  pam/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   15 +++++++++------
 pam-1.1.1-db5.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-19 11:43:42 UTC (rev 96215)
+++ PKGBUILD	2010-10-19 11:54:04 UTC (rev 96216)
@@ -4,33 +4,36 @@
 
 pkgname=pam
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.kernel.org/pub/linux/libs/pam/"
-depends=('glibc' 'db>=4.8' 'cracklib')
+depends=('glibc' 'db' 'cracklib')
 makedepends=('flex')
 backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment)
-source=(http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 \
-        ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2 \
+source=(http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
+        ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2
+        pam-1.1.1-db5.patch
         other)
 options=('!libtool' '!emptydirs')
 md5sums=('9b3d952b173d5b9836cbc7e8de108bee'
          'e2788389a6c59224110a45fcff30e02b'
+         '7ab50aacef6871dcf900a1d4df158667'
          '6e6c8719e5989d976a14610f340bd33a')
 
 build() {
   cd $srcdir/Linux-PAM-$pkgver
+  patch -Np1 -i $srcdir/pam-1.1.1-db5.patch
   ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib
-  make || return 1
+  make
   make INSTALL=/bin/install DESTDIR=$pkgdir install
   install -D -m644 ../other $pkgdir/etc/pam.d/other
   # build pam_unix2 module
   # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
   cd $srcdir/pam_unix2-2.6
   ./configure
-  make || return 1
+  make
   make DESTDIR=$pkgdir install
   # add the realtime permissions for audio users
   sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf

Added: pam-1.1.1-db5.patch
===================================================================
--- pam-1.1.1-db5.patch	                        (rev 0)
+++ pam-1.1.1-db5.patch	2010-10-19 11:54:04 UTC (rev 96216)
@@ -0,0 +1,12 @@
+--- Linux-PAM-1.1.1/modules/pam_userdb/pam_userdb.c.ark	2010-04-15 13:41:11.521290322 +0200
++++ Linux-PAM-1.1.1/modules/pam_userdb/pam_userdb.c	2010-04-15 13:41:35.923290703 +0200
+@@ -29,7 +29,8 @@
+ # include <ndbm.h>
+ #else
+ # ifdef HAVE_DB_H
+-#  define DB_DBM_HSEARCH    1 /* use the dbm interface */
++#  define DB_DBM_HSEARCH    1 /* use the dbm interface for db <= 4.8 */
++#  define HAVE_DBM 1 /* use the dbm interface for db >= 5.0 */
+ #  include <db.h>
+ # else
+ #  error "failed to find a libdb or equivalent"