[arch-commits] Commit in pam/repos (18 files)
Tobias Powalowski
tpowa at archlinux.org
Mon Oct 15 05:13:57 UTC 2012
Date: Monday, October 15, 2012 @ 01:13:56
Author: tpowa
Revision: 168736
db-move: moved pam from [testing] to [core] (i686, x86_64)
Added:
pam/repos/core-i686/PKGBUILD
(from rev 168733, pam/repos/testing-i686/PKGBUILD)
pam/repos/core-i686/other
(from rev 168733, pam/repos/testing-i686/other)
pam/repos/core-i686/pam.install
(from rev 168733, pam/repos/testing-i686/pam.install)
pam/repos/core-i686/pam_namespace-build-1.1.6.patch
(from rev 168733, pam/repos/testing-i686/pam_namespace-build-1.1.6.patch)
pam/repos/core-i686/pam_unix2-glibc216.patch
(from rev 168733, pam/repos/testing-i686/pam_unix2-glibc216.patch)
pam/repos/core-x86_64/PKGBUILD
(from rev 168733, pam/repos/testing-x86_64/PKGBUILD)
pam/repos/core-x86_64/other
(from rev 168733, pam/repos/testing-x86_64/other)
pam/repos/core-x86_64/pam.install
(from rev 168733, pam/repos/testing-x86_64/pam.install)
pam/repos/core-x86_64/pam_namespace-build-1.1.6.patch
(from rev 168733, pam/repos/testing-x86_64/pam_namespace-build-1.1.6.patch)
pam/repos/core-x86_64/pam_unix2-glibc216.patch
(from rev 168733, 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-x86_64/PKGBUILD
pam/repos/core-x86_64/other
pam/repos/core-x86_64/pam.install
pam/repos/testing-i686/
pam/repos/testing-x86_64/
---------------------------------------------+
core-i686/PKGBUILD | 126 +++++++++++++-------------
core-i686/other | 10 +-
core-i686/pam.install | 24 ++--
core-i686/pam_namespace-build-1.1.6.patch | 11 ++
core-i686/pam_unix2-glibc216.patch | 20 ++++
core-x86_64/PKGBUILD | 126 +++++++++++++-------------
core-x86_64/other | 10 +-
core-x86_64/pam.install | 24 ++--
core-x86_64/pam_namespace-build-1.1.6.patch | 11 ++
core-x86_64/pam_unix2-glibc216.patch | 20 ++++
10 files changed, 228 insertions(+), 154 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2012-10-15 05:13:51 UTC (rev 168735)
+++ core-i686/PKGBUILD 2012-10-15 05:13:56 UTC (rev 168736)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgname=pam
-pkgver=1.1.5
-pkgrel=4
-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.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2)
-options=('!libtool' '!emptydirs')
-md5sums=('927ee5585bdec5256c75117e9348aa47'
- 'e2788389a6c59224110a45fcff30e02b')
-
-build() {
- cd $srcdir/Linux-PAM-$pkgver
- ./configure --libdir=/usr/lib
- make
-
- cd $srcdir/pam_unix2-2.6
- ./configure --libdir=/usr/lib
- make
-}
-
-package() {
- cd $srcdir/Linux-PAM-$pkgver
- make DESTDIR=$pkgdir install
-
- # build pam_unix2 module
- # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
- cd $srcdir/pam_unix2-2.6
- 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
- at audio - rtprio 65
- at audio - nice -10
- at 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/sbin/unix_chkpwd
-}
Copied: pam/repos/core-i686/PKGBUILD (from rev 168733, pam/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-10-15 05:13:56 UTC (rev 168736)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=pam
+pkgver=1.1.6
+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
+ pam_namespace-build-1.1.6.patch)
+options=('!libtool' '!emptydirs')
+md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
+ 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
+ 'dac109f68e04a4df37575fda6001ea17'
+ '440a510164ba5eb69bf41e129746ff44')
+
+build() {
+ cd $srcdir/Linux-PAM-$pkgver
+ ./configure --libdir=/usr/lib
+ patch -Np0 -i ../pam_namespace-build-1.1.6.patch
+ make
+
+ cd $srcdir/pam_unix2-2.9.1
+ patch -Np1 -i ../pam_unix2-glibc216.patch
+ ./configure --libdir=/usr/lib
+ 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
+ at audio - rtprio 65
+ at audio - nice -10
+ at 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/sbin/unix_chkpwd
+}
Deleted: core-i686/other
===================================================================
--- core-i686/other 2012-10-15 05:13:51 UTC (rev 168735)
+++ core-i686/other 2012-10-15 05:13:56 UTC (rev 168736)
@@ -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 168733, pam/repos/testing-i686/other)
===================================================================
--- core-i686/other (rev 0)
+++ core-i686/other 2012-10-15 05:13:56 UTC (rev 168736)
@@ -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 2012-10-15 05:13:51 UTC (rev 168735)
+++ core-i686/pam.install 2012-10-15 05:13:56 UTC (rev 168736)
@@ -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
-}
Copied: pam/repos/core-i686/pam.install (from rev 168733, pam/repos/testing-i686/pam.install)
===================================================================
--- core-i686/pam.install (rev 0)
+++ core-i686/pam.install 2012-10-15 05:13:56 UTC (rev 168736)
@@ -0,0 +1,12 @@
+# 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
+}
Copied: pam/repos/core-i686/pam_namespace-build-1.1.6.patch (from rev 168733, pam/repos/testing-i686/pam_namespace-build-1.1.6.patch)
===================================================================
--- core-i686/pam_namespace-build-1.1.6.patch (rev 0)
+++ core-i686/pam_namespace-build-1.1.6.patch 2012-10-15 05:13:56 UTC (rev 168736)
@@ -0,0 +1,11 @@
+--- 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
+
Copied: pam/repos/core-i686/pam_unix2-glibc216.patch (from rev 168733, pam/repos/testing-i686/pam_unix2-glibc216.patch)
===================================================================
--- core-i686/pam_unix2-glibc216.patch (rev 0)
+++ core-i686/pam_unix2-glibc216.patch 2012-10-15 05:13:56 UTC (rev 168736)
@@ -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 2012-10-15 05:13:51 UTC (rev 168735)
+++ core-x86_64/PKGBUILD 2012-10-15 05:13:56 UTC (rev 168736)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgname=pam
-pkgver=1.1.5
-pkgrel=4
-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.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2)
-options=('!libtool' '!emptydirs')
-md5sums=('927ee5585bdec5256c75117e9348aa47'
- 'e2788389a6c59224110a45fcff30e02b')
-
-build() {
- cd $srcdir/Linux-PAM-$pkgver
- ./configure --libdir=/usr/lib
- make
-
- cd $srcdir/pam_unix2-2.6
- ./configure --libdir=/usr/lib
- make
-}
-
-package() {
- cd $srcdir/Linux-PAM-$pkgver
- make DESTDIR=$pkgdir install
-
- # build pam_unix2 module
- # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
- cd $srcdir/pam_unix2-2.6
- 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
- at audio - rtprio 65
- at audio - nice -10
- at 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/sbin/unix_chkpwd
-}
Copied: pam/repos/core-x86_64/PKGBUILD (from rev 168733, pam/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2012-10-15 05:13:56 UTC (rev 168736)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=pam
+pkgver=1.1.6
+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
+ pam_namespace-build-1.1.6.patch)
+options=('!libtool' '!emptydirs')
+md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
+ 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
+ 'dac109f68e04a4df37575fda6001ea17'
+ '440a510164ba5eb69bf41e129746ff44')
+
+build() {
+ cd $srcdir/Linux-PAM-$pkgver
+ ./configure --libdir=/usr/lib
+ patch -Np0 -i ../pam_namespace-build-1.1.6.patch
+ make
+
+ cd $srcdir/pam_unix2-2.9.1
+ patch -Np1 -i ../pam_unix2-glibc216.patch
+ ./configure --libdir=/usr/lib
+ 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
+ at audio - rtprio 65
+ at audio - nice -10
+ at 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/sbin/unix_chkpwd
+}
Deleted: core-x86_64/other
===================================================================
--- core-x86_64/other 2012-10-15 05:13:51 UTC (rev 168735)
+++ core-x86_64/other 2012-10-15 05:13:56 UTC (rev 168736)
@@ -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 168733, pam/repos/testing-x86_64/other)
===================================================================
--- core-x86_64/other (rev 0)
+++ core-x86_64/other 2012-10-15 05:13:56 UTC (rev 168736)
@@ -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 2012-10-15 05:13:51 UTC (rev 168735)
+++ core-x86_64/pam.install 2012-10-15 05:13:56 UTC (rev 168736)
@@ -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
-}
Copied: pam/repos/core-x86_64/pam.install (from rev 168733, pam/repos/testing-x86_64/pam.install)
===================================================================
--- core-x86_64/pam.install (rev 0)
+++ core-x86_64/pam.install 2012-10-15 05:13:56 UTC (rev 168736)
@@ -0,0 +1,12 @@
+# 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
+}
Copied: pam/repos/core-x86_64/pam_namespace-build-1.1.6.patch (from rev 168733, pam/repos/testing-x86_64/pam_namespace-build-1.1.6.patch)
===================================================================
--- core-x86_64/pam_namespace-build-1.1.6.patch (rev 0)
+++ core-x86_64/pam_namespace-build-1.1.6.patch 2012-10-15 05:13:56 UTC (rev 168736)
@@ -0,0 +1,11 @@
+--- 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
+
Copied: pam/repos/core-x86_64/pam_unix2-glibc216.patch (from rev 168733, 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 2012-10-15 05:13:56 UTC (rev 168736)
@@ -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"
+
More information about the arch-commits
mailing list