summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO20
-rwxr-xr-x[-rw-r--r--]PKGBUILD105
-rwxr-xr-x[-rw-r--r--]pam-1.1.8-cve-2013-7041.patch0
-rwxr-xr-x[-rw-r--r--]pam-1.1.8-cve-2014-2583.patch0
-rwxr-xr-x[-rw-r--r--]pam_unix2-glibc216.patch0
5 files changed, 52 insertions, 73 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9770ddab386a..e8b17d8d5da2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,24 @@
# Generated by mksrcinfo v8
-# Tue Dec 29 18:56:07 UTC 2015
+# Tue Dec 29 19:01:53 UTC 2015
pkgbase = libx32-pam
- pkgdesc = PAM (Pluggable Authentication Modules) library (x32 ABI)
- pkgver = 1.1.8
- pkgrel = 5
+ pkgdesc = PAM (Pluggable Authentication Modules) (x32 ABI)
+ pkgver = 1.2.1
+ pkgrel = 1.1
url = http://linux-pam.org
arch = x86_64
license = GPL2
- makedepends = libx32-flex
makedepends = gcc-multilib-x32
+ makedepends = libx32-flex
depends = libx32-cracklib
depends = libx32-libtirpc
depends = pam
options = !emptydirs
- source = https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-1.1.8.tar.bz2
- source = ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
+ source = http://linux-pam.org/library/Linux-PAM-1.2.1.tar.bz2
+ source = https://sources.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
source = pam_unix2-glibc216.patch
- source = pam-1.1.8-cve-2013-7041.patch
- source = pam-1.1.8-cve-2014-2583.patch
- sha256sums = c4b1f23a236d169e2496fea20721578d864ba00f7242d2b41d81050ac87a1e55
+ sha256sums = 342b1211c0d3b203a7df2540a5b03a428a087bd8a48c17e49ae268f992b334d9
sha256sums = 3315747699fece4e1cc5771885d243b3e017c4c4ca1326e86228d590a840e955
sha256sums = 6644c5cff46878c65bdc77977becbeda392675702264bfcc7c610a45a9982574
- sha256sums = 18034730d74f67c79feb2c6abc796442c0c548ce221b8e9d633e98a7bd3cce2c
- sha256sums = b10255f690f9f4a8cec044383d9cd03031b9a7be9892d824b2adc451d6d06f65
pkgname = libx32-pam
diff --git a/PKGBUILD b/PKGBUILD
index ae7e119d4d02..ff48723e69ee 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,93 +1,76 @@
-# Upstream Maintainer: jtts
-# Contributor: josephgbr <rafael.f.f1 at gmail.com>
+# $Id: PKGBUILD 143656 2015-10-11 15:23:01Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: jtts <jussaar@mbnet.fi>
+# Contributor: josephgbr <rafael.f.f1@gmail.com>
# Contributor: Janax <janax99@yahoo.com>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
-# Maintainer: Fantix King <fantix.king at gmail.com>
+# x32 Maintainer: Fantix King <fantix.king at gmail.com>
-_pkgbasename=pam
-pkgname=libx32-${_pkgbasename}
-pkgver=1.1.8
-pkgrel=5
-pkgdesc="PAM (Pluggable Authentication Modules) library (x32 ABI)"
+pkgname=libx32-pam
+pkgver=1.2.1
+pkgrel=1.1
+pkgdesc='PAM (Pluggable Authentication Modules) (x32 ABI)'
arch=('x86_64')
+url='http://linux-pam.org'
license=('GPL2')
-url="http://linux-pam.org"
-depends=(libx32-cracklib libx32-libtirpc $_pkgbasename) # pambase libx32-glibc
-makedepends=('libx32-flex' 'gcc-multilib-x32') # 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=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
- ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
- pam_unix2-glibc216.patch
- pam-1.1.8-cve-2013-7041.patch
- pam-1.1.8-cve-2014-2583.patch)
-sha256sums=('c4b1f23a236d169e2496fea20721578d864ba00f7242d2b41d81050ac87a1e55'
+depends=('libx32-cracklib' 'libx32-libtirpc' 'pam')
+makedepends=('gcc-multilib-x32' 'libx32-flex')
+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')
+sha256sums=('342b1211c0d3b203a7df2540a5b03a428a087bd8a48c17e49ae268f992b334d9'
'3315747699fece4e1cc5771885d243b3e017c4c4ca1326e86228d590a840e955'
- '6644c5cff46878c65bdc77977becbeda392675702264bfcc7c610a45a9982574'
- '18034730d74f67c79feb2c6abc796442c0c548ce221b8e9d633e98a7bd3cce2c'
- 'b10255f690f9f4a8cec044383d9cd03031b9a7be9892d824b2adc451d6d06f65')
+ '6644c5cff46878c65bdc77977becbeda392675702264bfcc7c610a45a9982574')
options=('!emptydirs')
prepare () {
- cd $srcdir/Linux-PAM-$pkgver
- # fix CVEs in pam
- patch -Np1 -i "${srcdir}/pam-1.1.8-cve-2013-7041.patch"
- patch -Np1 -i "${srcdir}/pam-1.1.8-cve-2014-2583.patch"
+ cd pam_unix2-2.9.1
- # fix pam_unix2 building
- cd $srcdir/pam_unix2-2.9.1
- patch -Np1 -i "${srcdir}/pam_unix2-glibc216.patch"
+ patch -Np1 -i ../pam_unix2-glibc216.patch
}
build() {
+ cd Linux-PAM-${pkgver}
+
export CC='gcc -mx32'
export CXX='g++ -mx32'
export PKG_CONFIG_PATH='/usr/libx32/pkgconfig'
- cd $srcdir/Linux-PAM-$pkgver
- ./configure --libdir=/usr/libx32 --sbindir=/usr/bin --with-xml-catalog=no --disable-db
+ ./configure \
+ --prefix='/usr' \
+ --libdir='/usr/libx32' \
+ --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/libx32 \
- --sbindir=/usr/bin
+ cd ../pam_unix2-2.9.1
+
+ export CFLAGS="$CFLAGS -I"${srcdir}"/Linux-PAM-${pkgver}/libpam/include/"
+ export LDFLAGS="$LDFLAGS -L"${srcdir}"/Linux-PAM-${pkgver}/libpam/.libs/"
+
+ ./configure --prefix='/usr' \
+ --libdir='/usr/libx32' \
+ --sbindir='/usr/bin'
make
}
package() {
- cd $srcdir/Linux-PAM-$pkgver
- make DESTDIR=$pkgdir SCONFIGDIR=/etc/security install
+ cd Linux-PAM-${pkgver}
+
+ make DESTDIR="${pkgdir}" SCONFIGDIR='/etc/security' install
+ rm -rf "${pkgdir}"/{etc,usr/{include,share,bin}}
+
+ cd ../pam_unix2-2.9.1
- # 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
- install src/pam_unix2.so $pkgdir/usr/libx32/security/pam_unix2.so
+ install -m 644 src/pam_unix2.so "${pkgdir}"/usr/libx32/security/
- # add the realtime permissions for audio users
- #sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
- #cat >>$pkgdir/etc/security/limits.conf <<_EOT
-#* - rtprio 0
-#* - nice 0
-#@audio - rtprio 65
-#@audio - nice -10
-#@audio - memlock 40000
-#_EOT
+ cd "${pkgdir}"/usr/libx32/security
- # fix some missing symlinks from old pam for compatibility
- cd $pkgdir/usr/libx32/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
-
- # cleanup for libx32 package
- rm -rf "${pkgdir}"/{etc,usr/{include,share,bin}}
}
+
+# vim: ts=2 sw=2 et:
diff --git a/pam-1.1.8-cve-2013-7041.patch b/pam-1.1.8-cve-2013-7041.patch
index 96fa9160bff9..96fa9160bff9 100644..100755
--- a/pam-1.1.8-cve-2013-7041.patch
+++ b/pam-1.1.8-cve-2013-7041.patch
diff --git a/pam-1.1.8-cve-2014-2583.patch b/pam-1.1.8-cve-2014-2583.patch
index f2aa2de8cba5..f2aa2de8cba5 100644..100755
--- a/pam-1.1.8-cve-2014-2583.patch
+++ b/pam-1.1.8-cve-2014-2583.patch
diff --git a/pam_unix2-glibc216.patch b/pam_unix2-glibc216.patch
index faa6a235f6ac..faa6a235f6ac 100644..100755
--- a/pam_unix2-glibc216.patch
+++ b/pam_unix2-glibc216.patch