Date: Monday, October 28, 2013 @ 11:54:41 Author: tpowa Revision: 197680
db-move: moved pam from [testing] to [core] (i686, x86_64) Added: pam/repos/core-i686/PKGBUILD (from rev 197679, pam/repos/testing-i686/PKGBUILD) pam/repos/core-i686/other (from rev 197679, pam/repos/testing-i686/other) pam/repos/core-i686/pam_unix2-glibc216.patch (from rev 197679, pam/repos/testing-i686/pam_unix2-glibc216.patch) pam/repos/core-x86_64/PKGBUILD (from rev 197679, pam/repos/testing-x86_64/PKGBUILD) pam/repos/core-x86_64/other (from rev 197679, pam/repos/testing-x86_64/other) pam/repos/core-x86_64/pam_unix2-glibc216.patch (from rev 197679, pam/repos/testing-x86_64/pam_unix2-glibc216.patch) Deleted: pam/repos/core-i686/PKGBUILD pam/repos/core-i686/other pam/repos/core-i686/pam.install pam/repos/core-i686/pam_namespace-build-1.1.6.patch pam/repos/core-i686/pam_unix2-glibc216.patch pam/repos/core-x86_64/PKGBUILD pam/repos/core-x86_64/other pam/repos/core-x86_64/pam.install pam/repos/core-x86_64/pam_namespace-build-1.1.6.patch pam/repos/core-x86_64/pam_unix2-glibc216.patch pam/repos/testing-i686/ pam/repos/testing-x86_64/ ---------------------------------------------+ /PKGBUILD | 138 ++++++++++++++++++++++++++ /other | 10 + /pam_unix2-glibc216.patch | 40 +++++++ core-i686/PKGBUILD | 63 ----------- core-i686/other | 5 core-i686/pam.install | 12 -- core-i686/pam_namespace-build-1.1.6.patch | 11 -- core-i686/pam_unix2-glibc216.patch | 20 --- core-x86_64/PKGBUILD | 63 ----------- core-x86_64/other | 5 core-x86_64/pam.install | 12 -- core-x86_64/pam_namespace-build-1.1.6.patch | 11 -- core-x86_64/pam_unix2-glibc216.patch | 20 --- 13 files changed, 188 insertions(+), 222 deletions(-) Deleted: core-i686/PKGBUILD =================================================================== --- core-i686/PKGBUILD 2013-10-28 10:40:59 UTC (rev 197679) +++ core-i686/PKGBUILD 2013-10-28 10:54:41 UTC (rev 197680) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=pam -pkgver=1.1.8 -pkgrel=1 -pkgdesc="PAM (Pluggable Authentication Modules) library" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.kernel.org/pub/linux/libs/pam/" -depends=('glibc' 'db' '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=(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) -options=('!libtool' '!emptydirs') -md5sums=('35b6091af95981b1b2cd60d813b5e4ee' - 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' - 'dac109f68e04a4df37575fda6001ea17') - -build() { - cd $srcdir/Linux-PAM-$pkgver - ./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 --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 - - # 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 - - # 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 -} Copied: pam/repos/core-i686/PKGBUILD (from rev 197679, pam/repos/testing-i686/PKGBUILD) =================================================================== --- core-i686/PKGBUILD (rev 0) +++ core-i686/PKGBUILD 2013-10-28 10:54:41 UTC (rev 197680) @@ -0,0 +1,69 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=pam +pkgver=1.1.8 +pkgrel=2 +pkgdesc="PAM (Pluggable Authentication Modules) library" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.kernel.org/pub/linux/libs/pam/" +depends=('glibc' 'db' '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=(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) +options=('!libtool' '!emptydirs') +md5sums=('35b6091af95981b1b2cd60d813b5e4ee' + 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' + 'dac109f68e04a4df37575fda6001ea17') + +build() { + cd $srcdir/Linux-PAM-$pkgver + ./configure --libdir=/usr/lib --sbindir=/usr/bin + make + + cd $srcdir/pam_unix2-2.9.1 + patch -Np1 -i ../pam_unix2-glibc216.patch + + # 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 + + # 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 + + # 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 +} Deleted: core-i686/other =================================================================== --- core-i686/other 2013-10-28 10:40:59 UTC (rev 197679) +++ core-i686/other 2013-10-28 10:54:41 UTC (rev 197680) @@ -1,5 +0,0 @@ -#%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/core-i686/other (from rev 197679, pam/repos/testing-i686/other) =================================================================== --- core-i686/other (rev 0) +++ core-i686/other 2013-10-28 10:54:41 UTC (rev 197680) @@ -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 Deleted: core-i686/pam.install =================================================================== --- core-i686/pam.install 2013-10-28 10:40:59 UTC (rev 197679) +++ core-i686/pam.install 2013-10-28 10:54:41 UTC (rev 197680) @@ -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 -} Deleted: core-i686/pam_namespace-build-1.1.6.patch =================================================================== --- core-i686/pam_namespace-build-1.1.6.patch 2013-10-28 10:40:59 UTC (rev 197679) +++ core-i686/pam_namespace-build-1.1.6.patch 2013-10-28 10:54:41 UTC (rev 197680) @@ -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 - Deleted: core-i686/pam_unix2-glibc216.patch =================================================================== --- core-i686/pam_unix2-glibc216.patch 2013-10-28 10:40:59 UTC (rev 197679) +++ core-i686/pam_unix2-glibc216.patch 2013-10-28 10:54:41 UTC (rev 197680) @@ -1,20 +0,0 @@ -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/core-i686/pam_unix2-glibc216.patch (from rev 197679, pam/repos/testing-i686/pam_unix2-glibc216.patch) =================================================================== --- core-i686/pam_unix2-glibc216.patch (rev 0) +++ core-i686/pam_unix2-glibc216.patch 2013-10-28 10:54:41 UTC (rev 197680) @@ -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" + Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2013-10-28 10:40:59 UTC (rev 197679) +++ core-x86_64/PKGBUILD 2013-10-28 10:54:41 UTC (rev 197680) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=pam -pkgver=1.1.8 -pkgrel=1 -pkgdesc="PAM (Pluggable Authentication Modules) library" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.kernel.org/pub/linux/libs/pam/" -depends=('glibc' 'db' '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=(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) -options=('!libtool' '!emptydirs') -md5sums=('35b6091af95981b1b2cd60d813b5e4ee' - 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' - 'dac109f68e04a4df37575fda6001ea17') - -build() { - cd $srcdir/Linux-PAM-$pkgver - ./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 --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 - - # 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 - - # 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 -} Copied: pam/repos/core-x86_64/PKGBUILD (from rev 197679, pam/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2013-10-28 10:54:41 UTC (rev 197680) @@ -0,0 +1,69 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=pam +pkgver=1.1.8 +pkgrel=2 +pkgdesc="PAM (Pluggable Authentication Modules) library" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.kernel.org/pub/linux/libs/pam/" +depends=('glibc' 'db' '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=(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) +options=('!libtool' '!emptydirs') +md5sums=('35b6091af95981b1b2cd60d813b5e4ee' + 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' + 'dac109f68e04a4df37575fda6001ea17') + +build() { + cd $srcdir/Linux-PAM-$pkgver + ./configure --libdir=/usr/lib --sbindir=/usr/bin + make + + cd $srcdir/pam_unix2-2.9.1 + patch -Np1 -i ../pam_unix2-glibc216.patch + + # 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 + + # 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 + + # 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 +} Deleted: core-x86_64/other =================================================================== --- core-x86_64/other 2013-10-28 10:40:59 UTC (rev 197679) +++ core-x86_64/other 2013-10-28 10:54:41 UTC (rev 197680) @@ -1,5 +0,0 @@ -#%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/core-x86_64/other (from rev 197679, pam/repos/testing-x86_64/other) =================================================================== --- core-x86_64/other (rev 0) +++ core-x86_64/other 2013-10-28 10:54:41 UTC (rev 197680) @@ -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 Deleted: core-x86_64/pam.install =================================================================== --- core-x86_64/pam.install 2013-10-28 10:40:59 UTC (rev 197679) +++ core-x86_64/pam.install 2013-10-28 10:54:41 UTC (rev 197680) @@ -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 -} Deleted: core-x86_64/pam_namespace-build-1.1.6.patch =================================================================== --- core-x86_64/pam_namespace-build-1.1.6.patch 2013-10-28 10:40:59 UTC (rev 197679) +++ core-x86_64/pam_namespace-build-1.1.6.patch 2013-10-28 10:54:41 UTC (rev 197680) @@ -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 - Deleted: core-x86_64/pam_unix2-glibc216.patch =================================================================== --- core-x86_64/pam_unix2-glibc216.patch 2013-10-28 10:40:59 UTC (rev 197679) +++ core-x86_64/pam_unix2-glibc216.patch 2013-10-28 10:54:41 UTC (rev 197680) @@ -1,20 +0,0 @@ -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/core-x86_64/pam_unix2-glibc216.patch (from rev 197679, pam/repos/testing-x86_64/pam_unix2-glibc216.patch) =================================================================== --- core-x86_64/pam_unix2-glibc216.patch (rev 0) +++ core-x86_64/pam_unix2-glibc216.patch 2013-10-28 10:54:41 UTC (rev 197680) @@ -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" +