diff options
author | root <root@rshg054.dnsready.net> | 2013-10-29 01:05:02 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-10-29 01:05:02 -0700 |
commit | 38b1ce25596ae456fefb3214a73c3d1005da568f (patch) | |
tree | 5cb69842c94bdd2b34b01be22f97b5949237550f /core/pam | |
parent | 1a32448c2c53b0e66ce0fe14c5dd2057afd432bc (diff) |
Tue Oct 29 01:04:23 PDT 2013
Diffstat (limited to 'core/pam')
-rw-r--r-- | core/pam/PKGBUILD | 12 | ||||
-rw-r--r-- | core/pam/pam.install | 12 | ||||
-rw-r--r-- | core/pam/pam_namespace-build-1.1.6.patch | 11 |
3 files changed, 9 insertions, 26 deletions
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index a3c10cdca..7cbc47890 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196782 2013-10-19 06:36:42Z tpowa $ +# $Id: PKGBUILD 197680 2013-10-28 10:54:41Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam pkgver=1.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') @@ -28,7 +28,13 @@ build() { cd $srcdir/pam_unix2-2.9.1 patch -Np1 -i ../pam_unix2-glibc216.patch - ./configure --libdir=/usr/lib --sbindir=/usr/bin + + # 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 } diff --git a/core/pam/pam.install b/core/pam/pam.install deleted file mode 100644 index 55ea99700..000000000 --- a/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 - usr/bin/ldconfig -r . -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} diff --git a/core/pam/pam_namespace-build-1.1.6.patch b/core/pam/pam_namespace-build-1.1.6.patch deleted file mode 100644 index aeabc234c..000000000 --- a/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 - |