[arch-commits] Commit in pam/trunk (4 files)

[Tobias Powalowski]

    Date: Friday, October 12, 2012 @ 05:18:35
  Author: tpowa
Revision: 168470

upgpkg: pam 1.1.6-1

update to 1.1.6, update pam_unix2 2.9.1

Added:
  pam/trunk/pam_namespace-build-1.1.6.patch
  pam/trunk/pam_unix2-glibc216.patch
Modified:
  pam/trunk/PKGBUILD
Deleted:
  pam/trunk/pam-glibc-2.16.patch

---------------------------------+
 PKGBUILD                        |   27 ++++++++++++++-------------
 pam-glibc-2.16.patch            |   10 ----------
 pam_namespace-build-1.1.6.patch |   11 +++++++++++
 pam_unix2-glibc216.patch        |   20 ++++++++++++++++++++
 4 files changed, 45 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-12 07:20:49 UTC (rev 168469)
+++ PKGBUILD	2012-10-12 09:18:35 UTC (rev 168470)
@@ -3,8 +3,8 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=pam
-pkgver=1.1.5
-pkgrel=5
+pkgver=1.1.6
+pkgrel=1
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,30 +14,34 @@
 backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment)
 source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
         #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-glibc-2.16.patch)
+        ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
+        pam_unix2-glibc216.patch
+        pam_namespace-build-1.1.6.patch)
 options=('!libtool' '!emptydirs')
-md5sums=('927ee5585bdec5256c75117e9348aa47'
-         'e2788389a6c59224110a45fcff30e02b')
+md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
+         'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
+         'dac109f68e04a4df37575fda6001ea17'
+         '440a510164ba5eb69bf41e129746ff44')
 
 build() {
   cd $srcdir/Linux-PAM-$pkgver
-  patch -Np1 -i ../pam-glibc-2.16.patch
   ./configure --libdir=/usr/lib
+  patch -Np0 -i ../pam_namespace-build-1.1.6.patch
   make
 
-  cd $srcdir/pam_unix2-2.6
+  cd $srcdir/pam_unix2-2.9.1
+  patch -Np1 -i ../pam_unix2-glibc216.patch
   ./configure --libdir=/usr/lib
   make
 }
 
 package() {
   cd $srcdir/Linux-PAM-$pkgver
-  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir SCONFIGDIR=/etc/security install
 
   # build pam_unix2 module
   # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
-  cd $srcdir/pam_unix2-2.6
+  cd $srcdir/pam_unix2-2.9.1
   make DESTDIR=$pkgdir install
 
   # add the realtime permissions for audio users
@@ -60,6 +64,3 @@
   # set unix_chkpwd uid
   chmod +s $pkgdir/sbin/unix_chkpwd
 }
-md5sums=('927ee5585bdec5256c75117e9348aa47'
-         'e2788389a6c59224110a45fcff30e02b'
-         '469023948632df30d2cb2015b77aa0fe')

Deleted: pam-glibc-2.16.patch
===================================================================
--- pam-glibc-2.16.patch	2012-10-12 07:20:49 UTC (rev 168469)
+++ pam-glibc-2.16.patch	2012-10-12 09:18:35 UTC (rev 168470)
@@ -1,10 +0,0 @@
---- a/modules/pam_unix/pam_unix_acct.c	2011-06-21 11:04:56.000000000 +0200
-+++ b/modules/pam_unix/pam_unix_acct.c	2012-07-05 16:04:35.643727485 +0200
-@@ -41,6 +41,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/resource.h>
- #include <syslog.h>
- #include <pwd.h>
- #include <shadow.h>

Added: pam_namespace-build-1.1.6.patch
===================================================================
--- pam_namespace-build-1.1.6.patch	                        (rev 0)
+++ pam_namespace-build-1.1.6.patch	2012-10-12 09:18:35 UTC (rev 168470)
@@ -0,0 +1,11 @@
+--- modules/pam_namespace/Makefile~	2012-10-12 10:59:13.557550706 +0200
++++ modules/pam_namespace/Makefile	2012-10-12 10:59:13.564217270 +0200
+@@ -869,7 +869,7 @@
+ 
+ 
+ install-data-local:
+-	mkdir -p $(namespaceddir)
++	mkdir -p $(DESTDIR)$(namespaceddir)
+ README: pam_namespace.8.xml namespace.conf.5.xml
+ -include $(top_srcdir)/Make.xml.rules
+ 

Added: pam_unix2-glibc216.patch
===================================================================
--- pam_unix2-glibc216.patch	                        (rev 0)
+++ pam_unix2-glibc216.patch	2012-10-12 09:18:35 UTC (rev 168470)
@@ -0,0 +1,20 @@
+Index: pam_unix2-2.9.1/src/read-files.c
+===================================================================
+--- pam_unix2-2.9.1.orig/src/read-files.c
++++ pam_unix2-2.9.1/src/read-files.c
+@@ -30,8 +30,14 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <nss.h>
+-#include <bits/libc-lock.h>
++#include <pthread.h>
+ #define __libc_lock_t pthread_mutex_t
++#define __libc_lock_define_initialized(CLASS,NAME) \
++  CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
++#define __libc_lock_lock(NAME) \
++  pthread_mutex_lock, (&(NAME))
++#define __libc_lock_unlock(NAME) \
++  pthread_mutex_unlock, (&(NAME))
+ 
+ #include "read-files.h"
+