pam: update to 1.4.0

1 files changed, 34 insertions, 44 deletions

diff --git a/abs/core/pam/PKGBUILD b/abs/core/pam/PKGBUILD
index 63bd83d..bcad4df 100644
--- a/abs/core/pam/PKGBUILD
+++ b/abs/core/pam/PKGBUILD
@@ -1,70 +1,60 @@
-# $Id$
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.4.0
+pkgrel=3
 pkgdesc="PAM (Pluggable Authentication Modules) library"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL2')
 url="http://linux-pam.org"
-depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
+depends=('glibc' 'libtirpc' 'pambase' 'audit')
 makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
-backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment)
-source=(http://linux-pam.org/library/Linux-PAM-$pkgver.tar.bz2
-        https://sources.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
-        pam_unix2-glibc216.patch)
-md5sums=('da4b2289b7cfb19583d54e9eaaef1c3a'
-         'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
-         'dac109f68e04a4df37575fda6001ea17')
+backup=(etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/environment)
+source=(https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver.tar.xz
+        https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver.tar.xz.asc
+        395915dae1571e10e2766c999974de864655ea3a.patch
+        af0faf666c5008e54dfe43684f210e3581ff1bca.patch
+        0e9b286afe1224b91ff00936058b084ad4b776e4.patch
+        $pkgname.tmpfiles)
+validpgpkeys=(
+        '8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB' # Thorsten Kukuk
+        '296D6F29A020808E8717A8842DB5BD89A340AEB7' #Dimitry V. Levin <ldv@altlinux.org>
+)
+
+sha256sums=('cd6d928c51e64139be3bdb38692c68183a509b83d4f2c221024ccd4bcddfd034'
+            'SKIP'
+            'cd2440d7bec55fa91e499060c0bf248f4fd20e7a0ef613eb7a06ee083f7ce21b'
+            'ac3e1d307756f5975587a7846500414c02d2b60acb271017b9c7aa6f47c89875'
+            '68f81b67dde5ee6003524b6b14e2d6f27edcfc0a2bde4c55a1cacbc6e299c207'
+            '5631f224e90c4f0459361c2a5b250112e3a91ba849754bb6f67d69d683a2e5ac')
 
 options=('!emptydirs')
 
-prepare () {
-  cd $srcdir/Linux-PAM-$pkgver
-
-  # fix pam_unix2 building
-  cd $srcdir/pam_unix2-2.9.1
-  patch -Np1 -i "${srcdir}/pam_unix2-glibc216.patch"
+prepare() {
+  cd Linux-PAM-$pkgver
+  patch -p1 -i ../395915dae1571e10e2766c999974de864655ea3a.patch
+  patch -p1 -i ../af0faf666c5008e54dfe43684f210e3581ff1bca.patch
+  patch -p1 -i ../0e9b286afe1224b91ff00936058b084ad4b776e4.patch
 }
 
 build() {
-  cd $srcdir/Linux-PAM-$pkgver
+  cd Linux-PAM-$pkgver
   ./configure --libdir=/usr/lib --sbindir=/usr/bin --disable-db
   make
-
-  cd $srcdir/pam_unix2-2.9.1
-  # modify flags to build against the pam compiled here, not a system lib.
-  ./configure \
-      CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \
-      LDFLAGS="$LDFLAGS -L$srcdir/Linux-PAM-$pkgver/libpam/.libs/" \
-      --libdir=/usr/lib \
-      --sbindir=/usr/bin
-  make
 }
 
 package() {
-  cd $srcdir/Linux-PAM-$pkgver
-  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.9.1
-  make DESTDIR=$pkgdir install
-
-  # fix some missing symlinks from old pam for compatibility
-  cd $pkgdir/usr/lib/security
-  ln -s pam_unix.so pam_unix_acct.so
-  ln -s pam_unix.so pam_unix_auth.so
-  ln -s pam_unix.so pam_unix_passwd.so
-  ln -s pam_unix.so pam_unix_session.so
+  install -Dm 644 $pkgname.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
+  cd Linux-PAM-$pkgver
+  make DESTDIR="$pkgdir" SCONFIGDIR=/etc/security install
 
   # set unix_chkpwd uid
-  chmod +s $pkgdir/usr/bin/unix_chkpwd
+  chmod +s "$pkgdir"/usr/bin/unix_chkpwd
+
   # remove doc which is not used anymore
   # FS #40749
-  rm $pkgdir/usr/share/doc/Linux-PAM/sag-pam_userdb.html
+  #rm "$pkgdir"/usr/share/doc/Linux-PAM/sag-pam_userdb.html
 
   # disable coredumps
   sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf