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

[Bartłomiej Piotrowski]

    Date: Monday, April 16, 2018 @ 12:32:12
  Author: bpiotrowski
Revision: 321906

1.3.0-2: libnsl rebuild; remove pam_unix2 and compatibility symlinks

Modified:
  pam/trunk/PKGBUILD

----------+
 PKGBUILD |   40 ++++------------------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-16 12:11:04 UTC (rev 321905)
+++ PKGBUILD	2018-04-16 12:32:12 UTC (rev 321906)
@@ -4,7 +4,7 @@
 
 pkgname=pam
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('x86_64')
 license=('GPL2')
@@ -12,36 +12,15 @@
 depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
 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')
+source=(http://linux-pam.org/library/Linux-PAM-$pkgver.tar.bz2)
+md5sums=('da4b2289b7cfb19583d54e9eaaef1c3a')
 
 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"
-}
-
 build() {
   cd $srcdir/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() {
@@ -48,20 +27,9 @@
   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
-
   # set unix_chkpwd uid
   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