Date: Thursday, June 9, 2016 @ 19:45:37 Author: tpowa Revision: 269220
archrelease: copy trunk to testing-i686, testing-x86_64 Added: pam/repos/testing-i686/ pam/repos/testing-i686/PKGBUILD (from rev 269219, pam/trunk/PKGBUILD) pam/repos/testing-i686/other (from rev 269219, pam/trunk/other) pam/repos/testing-i686/pam_unix2-glibc216.patch (from rev 269219, pam/trunk/pam_unix2-glibc216.patch) pam/repos/testing-x86_64/ pam/repos/testing-x86_64/PKGBUILD (from rev 269219, pam/trunk/PKGBUILD) pam/repos/testing-x86_64/other (from rev 269219, pam/trunk/other) pam/repos/testing-x86_64/pam_unix2-glibc216.patch (from rev 269219, pam/trunk/pam_unix2-glibc216.patch) -----------------------------------------+ testing-i686/PKGBUILD | 68 ++++++++++++++++++++++++++++++ testing-i686/other | 5 ++ testing-i686/pam_unix2-glibc216.patch | 20 ++++++++ testing-x86_64/PKGBUILD | 68 ++++++++++++++++++++++++++++++ testing-x86_64/other | 5 ++ testing-x86_64/pam_unix2-glibc216.patch | 20 ++++++++ 6 files changed, 186 insertions(+) Copied: pam/repos/testing-i686/PKGBUILD (from rev 269219, pam/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-06-09 17:45:37 UTC (rev 269220) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=pam +pkgver=1.3.0 +pkgrel=1 +pkgdesc="PAM (Pluggable Authentication Modules) library" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://linux-pam.org" +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') + +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() { + 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 +} Copied: pam/repos/testing-i686/other (from rev 269219, pam/trunk/other) =================================================================== --- testing-i686/other (rev 0) +++ testing-i686/other 2016-06-09 17:45:37 UTC (rev 269220) @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so Copied: pam/repos/testing-i686/pam_unix2-glibc216.patch (from rev 269219, pam/trunk/pam_unix2-glibc216.patch) =================================================================== --- testing-i686/pam_unix2-glibc216.patch (rev 0) +++ testing-i686/pam_unix2-glibc216.patch 2016-06-09 17:45:37 UTC (rev 269220) @@ -0,0 +1,20 @@ +Index: pam_unix2-2.9.1/src/read-files.c +=================================================================== +--- pam_unix2-2.9.1.orig/src/read-files.c ++++ pam_unix2-2.9.1/src/read-files.c +@@ -30,8 +30,14 @@ + #include <errno.h> + #include <fcntl.h> + #include <nss.h> +-#include <bits/libc-lock.h> ++#include <pthread.h> + #define __libc_lock_t pthread_mutex_t ++#define __libc_lock_define_initialized(CLASS,NAME) \ ++ CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER; ++#define __libc_lock_lock(NAME) \ ++ pthread_mutex_lock, (&(NAME)) ++#define __libc_lock_unlock(NAME) \ ++ pthread_mutex_unlock, (&(NAME)) + + #include "read-files.h" + Copied: pam/repos/testing-x86_64/PKGBUILD (from rev 269219, pam/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-06-09 17:45:37 UTC (rev 269220) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=pam +pkgver=1.3.0 +pkgrel=1 +pkgdesc="PAM (Pluggable Authentication Modules) library" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://linux-pam.org" +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') + +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() { + 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 +} Copied: pam/repos/testing-x86_64/other (from rev 269219, pam/trunk/other) =================================================================== --- testing-x86_64/other (rev 0) +++ testing-x86_64/other 2016-06-09 17:45:37 UTC (rev 269220) @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so Copied: pam/repos/testing-x86_64/pam_unix2-glibc216.patch (from rev 269219, pam/trunk/pam_unix2-glibc216.patch) =================================================================== --- testing-x86_64/pam_unix2-glibc216.patch (rev 0) +++ testing-x86_64/pam_unix2-glibc216.patch 2016-06-09 17:45:37 UTC (rev 269220) @@ -0,0 +1,20 @@ +Index: pam_unix2-2.9.1/src/read-files.c +=================================================================== +--- pam_unix2-2.9.1.orig/src/read-files.c ++++ pam_unix2-2.9.1/src/read-files.c +@@ -30,8 +30,14 @@ + #include <errno.h> + #include <fcntl.h> + #include <nss.h> +-#include <bits/libc-lock.h> ++#include <pthread.h> + #define __libc_lock_t pthread_mutex_t ++#define __libc_lock_define_initialized(CLASS,NAME) \ ++ CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER; ++#define __libc_lock_lock(NAME) \ ++ pthread_mutex_lock, (&(NAME)) ++#define __libc_lock_unlock(NAME) \ ++ pthread_mutex_unlock, (&(NAME)) + + #include "read-files.h" +