diff options
Diffstat (limited to 'abs')
| -rw-r--r-- | abs/core/pam/PKGBUILD | 31 | ||||
| -rw-r--r-- | abs/core/pam/pam.install | 12 | ||||
| -rw-r--r-- | abs/core/pam/pam_namespace-build-1.1.6.patch | 11 |
3 files changed, 17 insertions, 37 deletions
diff --git a/abs/core/pam/PKGBUILD b/abs/core/pam/PKGBUILD index 1e7c611..965f215 100644 --- a/abs/core/pam/PKGBUILD +++ b/abs/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168736 2012-10-15 05:13:56Z tpowa $ +# $Id: PKGBUILD 197836 2013-10-30 11:06:23Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam -pkgver=1.1.6 -pkgrel=1 +pkgver=1.1.8 +pkgrel=2 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') @@ -15,23 +15,23 @@ backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespac 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.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=('7b73e58b7ce79ffa321d408de06db2c4' - 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' - 'dac109f68e04a4df37575fda6001ea17' - '440a510164ba5eb69bf41e129746ff44') + pam_unix2-glibc216.patch) +options=('!emptydirs') build() { cd $srcdir/Linux-PAM-$pkgver - ./configure --libdir=/usr/lib - patch -Np0 -i ../pam_namespace-build-1.1.6.patch + ./configure --libdir=/usr/lib --sbindir=/usr/bin make cd $srcdir/pam_unix2-2.9.1 patch -Np1 -i ../pam_unix2-glibc216.patch - ./configure --libdir=/usr/lib + + # 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 } @@ -62,5 +62,8 @@ _EOT ln -s pam_unix.so pam_unix_session.so # set unix_chkpwd uid - chmod +s $pkgdir/sbin/unix_chkpwd + chmod +s $pkgdir/usr/bin/unix_chkpwd } +md5sums=('35b6091af95981b1b2cd60d813b5e4ee' + 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' + 'dac109f68e04a4df37575fda6001ea17') diff --git a/abs/core/pam/pam.install b/abs/core/pam/pam.install deleted file mode 100644 index 9d45880..0000000 --- a/abs/core/pam/pam.install +++ /dev/null @@ -1,12 +0,0 @@ -# arg 1: the new package version -post_install() { - # need to run this immediately -- pacman only runs it at the end of - # all package installs - /sbin/ldconfig -r . -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} diff --git a/abs/core/pam/pam_namespace-build-1.1.6.patch b/abs/core/pam/pam_namespace-build-1.1.6.patch deleted file mode 100644 index aeabc23..0000000 --- a/abs/core/pam/pam_namespace-build-1.1.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - |