From a3007f1d8169071a20afc4a71e7491104e1285f7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 27 Jul 2012 11:16:29 +0200
Subject: [PATCH] util-linux: update to 2.22rc1.

---
 srcpkgs/util-linux/files/common.pam           |  6 +++
 srcpkgs/util-linux/files/login.pam            | 19 ++++++++
 srcpkgs/util-linux/files/su.pam               |  7 +++
 srcpkgs/util-linux/libblkid.rshlibs           |  2 +
 srcpkgs/util-linux/libmount.rshlibs           |  2 +
 .../patches/localstatedir-mess.patch          | 27 ++++++++++++
 srcpkgs/util-linux/template                   | 44 ++++++++++++-------
 srcpkgs/util-linux/util-linux.rshlibs         |  5 +++
 8 files changed, 97 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/util-linux/files/common.pam
 create mode 100644 srcpkgs/util-linux/files/login.pam
 create mode 100644 srcpkgs/util-linux/files/su.pam
 create mode 100644 srcpkgs/util-linux/patches/localstatedir-mess.patch

diff --git a/srcpkgs/util-linux/files/common.pam b/srcpkgs/util-linux/files/common.pam
new file mode 100644
index 00000000000..a7bf8a4a5b0
--- /dev/null
+++ b/srcpkgs/util-linux/files/common.pam
@@ -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/srcpkgs/util-linux/files/login.pam b/srcpkgs/util-linux/files/login.pam
new file mode 100644
index 00000000000..536777dfb75
--- /dev/null
+++ b/srcpkgs/util-linux/files/login.pam
@@ -0,0 +1,19 @@
+# login pam service with sha512 passwords and cracklib support.
+auth 		requisite	pam_nologin.so
+auth 		required	pam_securetty.so
+auth 		required	pam_unix.so
+
+account 	required	pam_access.so
+account 	required	pam_unix.so
+
+session 	required	pam_env.so
+session 	required	pam_motd.so
+session 	optional	pam_mail.so 	dir=/var/mail standard
+session 	optional	pam_lastlog.so
+session 	required	pam_unix.so
+session		required	pam_loginuid.so
+session		required	pam_systemd.so	kill-session-processes=1
+session 	required	pam_limits.so
+
+password	required	pam_cracklib.so	try_first_pass retry=3
+password	required	pam_unix.so 	sha512 shadow nullok try_first_pass use_authtok
diff --git a/srcpkgs/util-linux/files/su.pam b/srcpkgs/util-linux/files/su.pam
new file mode 100644
index 00000000000..2307f44c19b
--- /dev/null
+++ b/srcpkgs/util-linux/files/su.pam
@@ -0,0 +1,7 @@
+auth		sufficient	pam_rootok.so
+auth 		required	pam_unix.so
+account		required	pam_unix.so
+session		optional	pam_mail.so	dir=/var/mail standard
+session		optional	pam_xauth.so
+session		required	pam_env.so
+session		required	pam_unix.so
diff --git a/srcpkgs/util-linux/libblkid.rshlibs b/srcpkgs/util-linux/libblkid.rshlibs
index d0dcd0e300f..1222577ca46 100644
--- a/srcpkgs/util-linux/libblkid.rshlibs
+++ b/srcpkgs/util-linux/libblkid.rshlibs
@@ -1,2 +1,4 @@
 libuuid.so.1
 libc.so.6
+ld-linux-x86-64.so.2 x86_64
+ld-linux.so.2 i686
diff --git a/srcpkgs/util-linux/libmount.rshlibs b/srcpkgs/util-linux/libmount.rshlibs
index 058f802fe04..31ea38bd8b4 100644
--- a/srcpkgs/util-linux/libmount.rshlibs
+++ b/srcpkgs/util-linux/libmount.rshlibs
@@ -1,3 +1,5 @@
 libblkid.so.1
 libuuid.so.1
 libc.so.6
+ld-linux-x86-64.so.2 x86_64
+ld-linux.so.2 i686
diff --git a/srcpkgs/util-linux/patches/localstatedir-mess.patch b/srcpkgs/util-linux/patches/localstatedir-mess.patch
new file mode 100644
index 00000000000..af30beb5d68
--- /dev/null
+++ b/srcpkgs/util-linux/patches/localstatedir-mess.patch
@@ -0,0 +1,27 @@
+--- configure.orig	2012-07-27 11:11:26.767603020 +0200
++++ configure	2012-07-27 11:12:15.692451582 +0200
+@@ -3383,23 +3383,7 @@ $as_echo "$as_me:   --libdir defaults to
+   esac ;;
+ esac
+ 
+-case $prefix:$localstatedir in
+-  NONE:'${prefix}/var')
+-    localstatedir=/run
+-    { $as_echo "$as_me:${as_lineno-$LINENO}:   --localstatedir defaults to /run" >&5
+-$as_echo "$as_me:   --localstatedir defaults to /run" >&6;}
+-    ;;
+-  *:'${prefix}/var')
+-    localstatedir=${prefix}/run
+-    ;;
+-  NONE:*)
+-    ;;
+-  *:*)
+-    localstatedir=${prefix}/${localstatedir}
+-    ;;
+-esac
+-
+-
++localstatedir=/run
+ libdirname=`basename "$libdir"`
+ 
+ 
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index fa110c515bf..3167fcfd387 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,41 +1,55 @@
 # Template file for 'util-linux'
 pkgname=util-linux
-version=2.21.2
-revision=2
-depends="coreutils shadow"
-makedepends="pkg-config zlib-devel ncurses-devel"
-replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1"
+_distver=2.22
+_patchver=rc1
+wrksrc=${pkgname}-${_distver}-${_patchver}
+version=${_distver}${_patchver}
+revision=1
+depends="coreutils shadow>=4.1.5.1_3"
+makedepends="pkg-config zlib-devel ncurses-devel pam-devel"
+replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5_1_3"
 subpackages="libmount libmount-devel libblkid libblkid-devel libuuid libuuid-devel"
-make_dirs="/var/lib/hwclock 0755 0 0"
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
 license="GPL-2"
-distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.21/${pkgname}-${version}.tar.xz"
-checksum=39b25765a02385dc73580ab5edc3c5a2cecd03c92b42e41b03fd037b1c7cefe6
+distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.22/${pkgname}-${_distver}-${_patchver}.tar.xz"
+checksum=0f7e636dd71b618d51cc1a7e06d207a8f384aea7b7fdb66eeb9c6d04ed21fe19
 long_desc="
  The ${pkgname} package contains miscellaneous utility programs. Among
  them are utilities for handling file systems, consoles, partitions,
  and messages."
 
+systemd_services="uuidd.socket"
+
+conf_files="
+/etc/pam.d/chfn
+/etc/pam.d/chsh
+/etc/pam.d/su
+/etc/pam.d/login"
+
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} --bindir=/usr/bin --sbindir=/usr/sbin \
-		--libdir=/usr/lib --libexecdir=/usr/lib --without-udev \
-		--enable-partx --enable-write --enable-new-mount \
+	./configure --prefix=/usr --exec-prefix=/usr --libdir=/usr/lib \
+		--bindir=/usr/bin --sbindir=/usr/sbin \
 		--enable-libuuid --disable-makeinstall-chown \
 		--enable-libblkid --enable-fsck --disable-rpath \
 		--enable-fs-paths-extra=/usr/sbin:/usr/bin \
+		--enable-vipw --enable-newgrp --enable-chfn-chsh \
+		--with-systemdsystemunitdir=/usr/lib/systemd/system \
+		--without-udev --enable-write --disable-kill \
 		SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie"
 }
 
 do_build() {
-	sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
 	make ${makejobs}
 }
 
 do_install() {
 	make DESTDIR=${DESTDIR} install
-	# Remove obsolete chkdupexec
-	rm -f ${DESTDIR}/usr/bin/chkdupexe
-	rm -f ${DESTDIR}/usr/share/man/man1/chkdupexe.1
+
+	# pam login utils.
+	vinstall $FILESDIR/login.pam 644 etc/pam.d login
+	vinstall $FILESDIR/su.pam 644 etc/pam.d su
+	vinstall $FILESDIR/common.pam 644 etc/pam.d chfn
+	vinstall $FILESDIR/common.pam 644 etc/pam.d chsh
 }
diff --git a/srcpkgs/util-linux/util-linux.rshlibs b/srcpkgs/util-linux/util-linux.rshlibs
index 622836bee9d..4a90c2b53e7 100644
--- a/srcpkgs/util-linux/util-linux.rshlibs
+++ b/srcpkgs/util-linux/util-linux.rshlibs
@@ -5,3 +5,8 @@ libuuid.so.1
 libncursesw.so.6
 libutil.so.1
 libmount.so.1
+libpam.so.0
+libpam_misc.so.0
+libcrypt.so.1
+ld-linux-x86-64.so.2 x86_64
+ld-linux.so.2 i686