[arch-commits] Commit in util-linux/repos (14 files)

Tom Gundersen tomegun at nymeria.archlinux.org
Thu May 30 08:59:20 EDT 2013


    Date: Thursday, May 30, 2013 @ 14:59:20
  Author: tomegun
Revision: 186684

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  util-linux/repos/staging-i686/
  util-linux/repos/staging-i686/PKGBUILD
    (from rev 186683, util-linux/trunk/PKGBUILD)
  util-linux/repos/staging-i686/pam-common
    (from rev 186683, util-linux/trunk/pam-common)
  util-linux/repos/staging-i686/pam-login
    (from rev 186683, util-linux/trunk/pam-login)
  util-linux/repos/staging-i686/pam-su
    (from rev 186683, util-linux/trunk/pam-su)
  util-linux/repos/staging-i686/util-linux.install
    (from rev 186683, util-linux/trunk/util-linux.install)
  util-linux/repos/staging-i686/uuidd.tmpfiles
    (from rev 186683, util-linux/trunk/uuidd.tmpfiles)
  util-linux/repos/staging-x86_64/
  util-linux/repos/staging-x86_64/PKGBUILD
    (from rev 186683, util-linux/trunk/PKGBUILD)
  util-linux/repos/staging-x86_64/pam-common
    (from rev 186683, util-linux/trunk/pam-common)
  util-linux/repos/staging-x86_64/pam-login
    (from rev 186683, util-linux/trunk/pam-login)
  util-linux/repos/staging-x86_64/pam-su
    (from rev 186683, util-linux/trunk/pam-su)
  util-linux/repos/staging-x86_64/util-linux.install
    (from rev 186683, util-linux/trunk/util-linux.install)
  util-linux/repos/staging-x86_64/uuidd.tmpfiles
    (from rev 186683, util-linux/trunk/uuidd.tmpfiles)

-----------------------------------+
 staging-i686/PKGBUILD             |   87 ++++++++++++++++++++++++++++++++++++
 staging-i686/pam-common           |    6 ++
 staging-i686/pam-login            |    7 ++
 staging-i686/pam-su               |    9 +++
 staging-i686/util-linux.install   |   21 ++++++++
 staging-i686/uuidd.tmpfiles       |    1 
 staging-x86_64/PKGBUILD           |   87 ++++++++++++++++++++++++++++++++++++
 staging-x86_64/pam-common         |    6 ++
 staging-x86_64/pam-login          |    7 ++
 staging-x86_64/pam-su             |    9 +++
 staging-x86_64/util-linux.install |   21 ++++++++
 staging-x86_64/uuidd.tmpfiles     |    1 
 12 files changed, 262 insertions(+)

Copied: util-linux/repos/staging-i686/PKGBUILD (from rev 186683, util-linux/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2013-05-30 12:59:20 UTC (rev 186684)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=util-linux
+pkgver=2.23.1
+pkgrel=2
+pkgdesc="Miscellaneous system utilities for Linux"
+url="http://www.kernel.org/pub/linux/utils/util-linux/"
+arch=('i686' 'x86_64')
+groups=('base' 'base-devel')
+depends=('pam' 'shadow' 'coreutils' 'glibc')
+makedepends=('systemd')
+# checkdepends=('bc')
+conflicts=('util-linux-ng' 'eject')
+provides=("util-linux-ng=$pkgver" 'eject')
+license=('GPL2')
+options=('!libtool')
+source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz"
+        uuidd.tmpfiles
+        pam-login
+        pam-common
+        pam-su)
+backup=(etc/pam.d/chfn
+        etc/pam.d/chsh
+        etc/pam.d/login
+        etc/pam.d/su
+        etc/pam.d/su-l)
+install=util-linux.install
+md5sums=('33ba55ce82f8e3b8d7a38fac0f62779a'
+         'a39554bfd65cccfd8254bb46922f4a67'
+         '4368b3f98abd8a32662e094c54e7f9b1'
+         'a31374fef2cba0ca34dfc7078e2969e4'
+         'fa85e5cce5d723275b14365ba71a8aad')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+              --libdir=/usr/lib \
+              --localstatedir=/run \
+              --enable-fs-paths-extra=/usr/bin \
+              --enable-raw \
+              --enable-vipw \
+              --enable-newgrp \
+              --enable-chfn-chsh \
+              --enable-write \
+              --enable-mesg \
+              --enable-socket-activation
+
+#              --enable-reset \ # part of ncurses
+#              --enable-line \ # not part of any package
+#              --enable-last \ # not compat
+
+  make
+}
+
+#check() {
+# fails for some reason in chroot, works outside
+#  make -C "$pkgname-$pkgver" check
+#}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="${pkgdir}" install
+
+  # setuid chfn and chsh
+  chmod 4755 "$pkgdir"/usr/bin/{newgrp,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"
+  install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su"
+  install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l"
+
+  # include tmpfiles fragment for uuidd
+  # TODO(dreisner): offer this upstream?
+  install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
+
+  # usrmove
+  cd "$pkgdir"
+  mv {,usr/}sbin/* usr/bin
+  mv bin/* usr/bin
+  rmdir bin sbin usr/sbin
+}

Copied: util-linux/repos/staging-i686/pam-common (from rev 186683, util-linux/trunk/pam-common)
===================================================================
--- staging-i686/pam-common	                        (rev 0)
+++ staging-i686/pam-common	2013-05-30 12:59:20 UTC (rev 186684)
@@ -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

Copied: util-linux/repos/staging-i686/pam-login (from rev 186683, util-linux/trunk/pam-login)
===================================================================
--- staging-i686/pam-login	                        (rev 0)
+++ staging-i686/pam-login	2013-05-30 12:59:20 UTC (rev 186684)
@@ -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

Copied: util-linux/repos/staging-i686/pam-su (from rev 186683, util-linux/trunk/pam-su)
===================================================================
--- staging-i686/pam-su	                        (rev 0)
+++ staging-i686/pam-su	2013-05-30 12:59:20 UTC (rev 186684)
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth		sufficient	pam_rootok.so
+# Uncomment the following line to implicitly trust users in the "wheel" group.
+#auth		sufficient	pam_wheel.so trust use_uid
+# Uncomment the following line to require a user to be in the "wheel" group.
+#auth		required	pam_wheel.so use_uid
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so

Copied: util-linux/repos/staging-i686/util-linux.install (from rev 186683, util-linux/trunk/util-linux.install)
===================================================================
--- staging-i686/util-linux.install	                        (rev 0)
+++ staging-i686/util-linux.install	2013-05-30 12:59:20 UTC (rev 186684)
@@ -0,0 +1,21 @@
+post_install() {
+  # we don't want use systemd-tmpfiles here because
+  # the package dependency would create a circular dep.
+  if [ ! -d run/uuidd ]; then
+    # refer to uid/gid by number to avoid dependency on filesystem
+    install -o 68 -g 68 -dm755 run/uuidd
+  fi
+}
+
+post_upgrade() {
+  if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then
+    if [ -f /var/lib/hwclock/adjtime ]; then
+      mv /var/lib/hwclock/adjtime /etc/adjtime
+    fi
+    if [ -d /var/lib/hwclock ]; then
+      rmdir /var/lib/hwclock
+    fi
+  fi
+
+  post_install
+}

Copied: util-linux/repos/staging-i686/uuidd.tmpfiles (from rev 186683, util-linux/trunk/uuidd.tmpfiles)
===================================================================
--- staging-i686/uuidd.tmpfiles	                        (rev 0)
+++ staging-i686/uuidd.tmpfiles	2013-05-30 12:59:20 UTC (rev 186684)
@@ -0,0 +1 @@
+d /run/uuidd 0755 uuidd uuidd

Copied: util-linux/repos/staging-x86_64/PKGBUILD (from rev 186683, util-linux/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2013-05-30 12:59:20 UTC (rev 186684)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=util-linux
+pkgver=2.23.1
+pkgrel=2
+pkgdesc="Miscellaneous system utilities for Linux"
+url="http://www.kernel.org/pub/linux/utils/util-linux/"
+arch=('i686' 'x86_64')
+groups=('base' 'base-devel')
+depends=('pam' 'shadow' 'coreutils' 'glibc')
+makedepends=('systemd')
+# checkdepends=('bc')
+conflicts=('util-linux-ng' 'eject')
+provides=("util-linux-ng=$pkgver" 'eject')
+license=('GPL2')
+options=('!libtool')
+source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz"
+        uuidd.tmpfiles
+        pam-login
+        pam-common
+        pam-su)
+backup=(etc/pam.d/chfn
+        etc/pam.d/chsh
+        etc/pam.d/login
+        etc/pam.d/su
+        etc/pam.d/su-l)
+install=util-linux.install
+md5sums=('33ba55ce82f8e3b8d7a38fac0f62779a'
+         'a39554bfd65cccfd8254bb46922f4a67'
+         '4368b3f98abd8a32662e094c54e7f9b1'
+         'a31374fef2cba0ca34dfc7078e2969e4'
+         'fa85e5cce5d723275b14365ba71a8aad')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+              --libdir=/usr/lib \
+              --localstatedir=/run \
+              --enable-fs-paths-extra=/usr/bin \
+              --enable-raw \
+              --enable-vipw \
+              --enable-newgrp \
+              --enable-chfn-chsh \
+              --enable-write \
+              --enable-mesg \
+              --enable-socket-activation
+
+#              --enable-reset \ # part of ncurses
+#              --enable-line \ # not part of any package
+#              --enable-last \ # not compat
+
+  make
+}
+
+#check() {
+# fails for some reason in chroot, works outside
+#  make -C "$pkgname-$pkgver" check
+#}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="${pkgdir}" install
+
+  # setuid chfn and chsh
+  chmod 4755 "$pkgdir"/usr/bin/{newgrp,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"
+  install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su"
+  install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l"
+
+  # include tmpfiles fragment for uuidd
+  # TODO(dreisner): offer this upstream?
+  install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
+
+  # usrmove
+  cd "$pkgdir"
+  mv {,usr/}sbin/* usr/bin
+  mv bin/* usr/bin
+  rmdir bin sbin usr/sbin
+}

Copied: util-linux/repos/staging-x86_64/pam-common (from rev 186683, util-linux/trunk/pam-common)
===================================================================
--- staging-x86_64/pam-common	                        (rev 0)
+++ staging-x86_64/pam-common	2013-05-30 12:59:20 UTC (rev 186684)
@@ -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

Copied: util-linux/repos/staging-x86_64/pam-login (from rev 186683, util-linux/trunk/pam-login)
===================================================================
--- staging-x86_64/pam-login	                        (rev 0)
+++ staging-x86_64/pam-login	2013-05-30 12:59:20 UTC (rev 186684)
@@ -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

Copied: util-linux/repos/staging-x86_64/pam-su (from rev 186683, util-linux/trunk/pam-su)
===================================================================
--- staging-x86_64/pam-su	                        (rev 0)
+++ staging-x86_64/pam-su	2013-05-30 12:59:20 UTC (rev 186684)
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth		sufficient	pam_rootok.so
+# Uncomment the following line to implicitly trust users in the "wheel" group.
+#auth		sufficient	pam_wheel.so trust use_uid
+# Uncomment the following line to require a user to be in the "wheel" group.
+#auth		required	pam_wheel.so use_uid
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so

Copied: util-linux/repos/staging-x86_64/util-linux.install (from rev 186683, util-linux/trunk/util-linux.install)
===================================================================
--- staging-x86_64/util-linux.install	                        (rev 0)
+++ staging-x86_64/util-linux.install	2013-05-30 12:59:20 UTC (rev 186684)
@@ -0,0 +1,21 @@
+post_install() {
+  # we don't want use systemd-tmpfiles here because
+  # the package dependency would create a circular dep.
+  if [ ! -d run/uuidd ]; then
+    # refer to uid/gid by number to avoid dependency on filesystem
+    install -o 68 -g 68 -dm755 run/uuidd
+  fi
+}
+
+post_upgrade() {
+  if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then
+    if [ -f /var/lib/hwclock/adjtime ]; then
+      mv /var/lib/hwclock/adjtime /etc/adjtime
+    fi
+    if [ -d /var/lib/hwclock ]; then
+      rmdir /var/lib/hwclock
+    fi
+  fi
+
+  post_install
+}

Copied: util-linux/repos/staging-x86_64/uuidd.tmpfiles (from rev 186683, util-linux/trunk/uuidd.tmpfiles)
===================================================================
--- staging-x86_64/uuidd.tmpfiles	                        (rev 0)
+++ staging-x86_64/uuidd.tmpfiles	2013-05-30 12:59:20 UTC (rev 186684)
@@ -0,0 +1 @@
+d /run/uuidd 0755 uuidd uuidd



More information about the arch-commits mailing list