From 810a5a6e8edafe2550300c5030083669db6e3973 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 6 Jul 2012 00:01:51 +0000
Subject: Fri Jul  6 00:01:50 UTC 2012

---
 core/util-linux/PKGBUILD   | 28 +++++++++++++++++++++-------
 core/util-linux/pam-common |  6 ++++++
 core/util-linux/pam-login  |  7 +++++++
 3 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 core/util-linux/pam-common
 create mode 100644 core/util-linux/pam-login

(limited to 'core/util-linux')

diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 8d43830fd..4b7332d61 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 160349 2012-06-01 12:56:46Z dreisner $
+# $Id: PKGBUILD 162992 2012-07-04 21:44:53Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
 pkgver=2.21.2
-pkgrel=1
+pkgrel=3
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
 groups=('base')
-depends=('udev' 'pam')
+depends=('pam')
 conflicts=('util-linux-ng')
 provides=("util-linux-ng=${pkgver}")
 license=('GPL2')
 options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz)
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz
+        pam-login
+        pam-common)
+backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,13 +31,14 @@ build() {
               --enable-write \
               --enable-raw \
               --disable-wall \
-              --enable-new-mount
+              --enable-new-mount \
+              --enable-login-utils
 
   make
 }
 
 check() {
-	make -C "$pkgname-$pkgver" check
+  make -C "$pkgname-$pkgver" check
 }
 
 package() {
@@ -51,5 +55,15 @@ package() {
 
   # delete stray empty dir, fixed upstream
   rm -r usr/share/man/ru
+
+  # setuid chfn and chsh
+  chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn}
+
+  # install PAM files for login-utils
+  install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
+  install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
+  install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
 }
-md5sums=('54ba880f1d66782c2287ee2c898520e9')
+md5sums=('54ba880f1d66782c2287ee2c898520e9'
+         '4368b3f98abd8a32662e094c54e7f9b1'
+         'a31374fef2cba0ca34dfc7078e2969e4')
diff --git a/core/util-linux/pam-common b/core/util-linux/pam-common
new file mode 100644
index 000000000..a7bf8a4a5
--- /dev/null
+++ b/core/util-linux/pam-common
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth		sufficient	pam_rootok.so
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so
+password	required	pam_permit.so
diff --git a/core/util-linux/pam-login b/core/util-linux/pam-login
new file mode 100644
index 000000000..1960d9497
--- /dev/null
+++ b/core/util-linux/pam-login
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth       required     pam_securetty.so
+auth       requisite    pam_nologin.so
+auth       include      system-local-login
+account    include      system-local-login
+session    include      system-local-login
-- 
cgit v1.2.3-54-g00ecf