[arch-commits] Commit in util-linux/repos (26 files)
Dave Reisner
dreisner at archlinux.org
Mon Jul 28 13:16:16 UTC 2014
Date: Monday, July 28, 2014 @ 15:16:16
Author: dreisner
Revision: 218250
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
util-linux/repos/testing-i686/0001-fdisk-fix-l-device.patch
(from rev 218249, util-linux/trunk/0001-fdisk-fix-l-device.patch)
util-linux/repos/testing-i686/PKGBUILD
(from rev 218249, util-linux/trunk/PKGBUILD)
util-linux/repos/testing-i686/pam-common
(from rev 218249, util-linux/trunk/pam-common)
util-linux/repos/testing-i686/pam-login
(from rev 218249, util-linux/trunk/pam-login)
util-linux/repos/testing-i686/pam-su
(from rev 218249, util-linux/trunk/pam-su)
util-linux/repos/testing-i686/util-linux.install
(from rev 218249, util-linux/trunk/util-linux.install)
util-linux/repos/testing-i686/uuidd.tmpfiles
(from rev 218249, util-linux/trunk/uuidd.tmpfiles)
util-linux/repos/testing-x86_64/0001-fdisk-fix-l-device.patch
(from rev 218249, util-linux/trunk/0001-fdisk-fix-l-device.patch)
util-linux/repos/testing-x86_64/PKGBUILD
(from rev 218249, util-linux/trunk/PKGBUILD)
util-linux/repos/testing-x86_64/pam-common
(from rev 218249, util-linux/trunk/pam-common)
util-linux/repos/testing-x86_64/pam-login
(from rev 218249, util-linux/trunk/pam-login)
util-linux/repos/testing-x86_64/pam-su
(from rev 218249, util-linux/trunk/pam-su)
util-linux/repos/testing-x86_64/util-linux.install
(from rev 218249, util-linux/trunk/util-linux.install)
util-linux/repos/testing-x86_64/uuidd.tmpfiles
(from rev 218249, util-linux/trunk/uuidd.tmpfiles)
Deleted:
util-linux/repos/testing-i686/PKGBUILD
util-linux/repos/testing-i686/pam-common
util-linux/repos/testing-i686/pam-login
util-linux/repos/testing-i686/pam-su
util-linux/repos/testing-i686/util-linux.install
util-linux/repos/testing-i686/uuidd.tmpfiles
util-linux/repos/testing-x86_64/PKGBUILD
util-linux/repos/testing-x86_64/pam-common
util-linux/repos/testing-x86_64/pam-login
util-linux/repos/testing-x86_64/pam-su
util-linux/repos/testing-x86_64/util-linux.install
util-linux/repos/testing-x86_64/uuidd.tmpfiles
----------------------------------------------+
/PKGBUILD | 206 +++++++++++++++++++++++++
/pam-common | 12 +
/pam-login | 14 +
/pam-su | 18 ++
/util-linux.install | 42 +++++
/uuidd.tmpfiles | 2
testing-i686/0001-fdisk-fix-l-device.patch | 61 +++++++
testing-i686/PKGBUILD | 95 -----------
testing-i686/pam-common | 6
testing-i686/pam-login | 7
testing-i686/pam-su | 9 -
testing-i686/util-linux.install | 21 --
testing-i686/uuidd.tmpfiles | 1
testing-x86_64/0001-fdisk-fix-l-device.patch | 61 +++++++
testing-x86_64/PKGBUILD | 95 -----------
testing-x86_64/pam-common | 6
testing-x86_64/pam-login | 7
testing-x86_64/pam-su | 9 -
testing-x86_64/util-linux.install | 21 --
testing-x86_64/uuidd.tmpfiles | 1
20 files changed, 416 insertions(+), 278 deletions(-)
Copied: util-linux/repos/testing-i686/0001-fdisk-fix-l-device.patch (from rev 218249, util-linux/trunk/0001-fdisk-fix-l-device.patch)
===================================================================
--- testing-i686/0001-fdisk-fix-l-device.patch (rev 0)
+++ testing-i686/0001-fdisk-fix-l-device.patch 2014-07-28 13:16:16 UTC (rev 218250)
@@ -0,0 +1,61 @@
+From 52d92543ffb8efb56036f316a1072d8fbba62c38 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at redhat.com>
+Date: Mon, 28 Jul 2014 11:57:10 +0200
+Subject: [PATCH] fdisk: fix -l [<device>]
+
+ * don't use err(), but warn(), so don't stop after the first error
+
+ * display all errors when "-l <device> ..." specified
+
+ * display only EACCES errors when list whole disks from
+ /proc/partitions ("fdisk -l" )
+
+Reported-by: Boian Bonev <bbonev at ipacct.com>
+Addresses: https://github.com/karelzak/util-linux/pull/106
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+ disk-utils/fdisk.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
+index 8d57dbb..46e632a 100644
+--- a/disk-utils/fdisk.c
++++ b/disk-utils/fdisk.c
+@@ -670,10 +670,13 @@ static int is_ide_cdrom_or_tape(char *device)
+ return ret;
+ }
+
+-static void print_device_pt(struct fdisk_context *cxt, char *device)
++static void print_device_pt(struct fdisk_context *cxt, char *device, int warnme)
+ {
+- if (fdisk_context_assign_device(cxt, device, 1) != 0) /* read-only */
+- err(EXIT_FAILURE, _("cannot open %s"), device);
++ if (fdisk_context_assign_device(cxt, device, 1) != 0) { /* read-only */
++ if (warnme || errno == EACCES)
++ warn(_("cannot open %s"), device);
++ return;
++ }
+
+ list_disk_geometry(cxt);
+
+@@ -717,7 +720,7 @@ static void print_all_devices_pt(struct fdisk_context *cxt)
+ if (!cn)
+ continue;
+ if (!is_ide_cdrom_or_tape(cn))
+- print_device_pt(cxt, cn);
++ print_device_pt(cxt, cn, 0);
+ free(cn);
+ }
+ fclose(f);
+@@ -912,7 +915,7 @@ int main(int argc, char **argv)
+ if (argc > optind) {
+ int k;
+ for (k = optind; k < argc; k++)
+- print_device_pt(cxt, argv[k]);
++ print_device_pt(cxt, argv[k], 1);
+ } else
+ print_all_devices_pt(cxt);
+ break;
+--
+2.0.3
+
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-i686/PKGBUILD 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1,95 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgbase=util-linux
-pkgname=(util-linux libutil-linux)
-pkgver=2.25
-pkgrel=2
-pkgdesc="Miscellaneous system utilities for Linux"
-url="http://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64')
-makedepends=('systemd' 'python')
-license=('GPL2')
-options=('strip' 'debug')
-source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz"
- uuidd.tmpfiles
- pam-login
- pam-common
- pam-su)
-md5sums=('4c78fdef4cb882caafad61e33cafbc14'
- 'a39554bfd65cccfd8254bb46922f4a67'
- '4368b3f98abd8a32662e094c54e7f9b1'
- 'a31374fef2cba0ca34dfc7078e2969e4'
- 'fa85e5cce5d723275b14365ba71a8aad')
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure --prefix=/usr \
- --libdir=/usr/lib \
- --bindir=/usr/bin \
- --localstatedir=/run \
- --enable-fs-paths-extra=/usr/bin \
- --enable-raw \
- --enable-vipw \
- --enable-newgrp \
- --enable-chfn-chsh \
- --enable-write \
- --enable-mesg \
- --enable-socket-activation \
- --with-python=3
-
- make
-}
-
-package_util-linux() {
- conflicts=('util-linux-ng' 'eject')
- provides=("util-linux-ng=$pkgver" 'eject')
- depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux')
- optdepends=('python: python bindings to libmount')
- install=util-linux.install
- groups=('base' 'base-devel')
- backup=(etc/pam.d/chfn
- etc/pam.d/chsh
- etc/pam.d/login
- etc/pam.d/su
- etc/pam.d/su-l)
-
- 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
- rmdir sbin usr/sbin
-
- ### create libutil-linux split
- rm -rf "$srcdir/_libutil-linux"
- install -dm755 "$srcdir"/_libutil-linux/usr/lib
- cd "$srcdir"/_libutil-linux
- mv "$pkgdir"/usr/lib/lib*.{a,so}* usr/lib
-}
-
-package_libutil-linux() {
- pkgdesc="util-linux runtime libraries"
- provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
-
- mv "$srcdir/_libutil-linux"/* "$pkgdir"
-}
Copied: util-linux/repos/testing-i686/PKGBUILD (from rev 218249, util-linux/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-07-28 13:16:16 UTC (rev 218250)
@@ -0,0 +1,103 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgbase=util-linux
+pkgname=(util-linux libutil-linux)
+pkgver=2.25
+pkgrel=3
+pkgdesc="Miscellaneous system utilities for Linux"
+url="http://www.kernel.org/pub/linux/utils/util-linux/"
+arch=('i686' 'x86_64')
+makedepends=('systemd' 'python')
+license=('GPL2')
+options=('strip' 'debug')
+source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz"
+ uuidd.tmpfiles
+ pam-login
+ pam-common
+ pam-su
+ 0001-fdisk-fix-l-device.patch)
+md5sums=('4c78fdef4cb882caafad61e33cafbc14'
+ 'a39554bfd65cccfd8254bb46922f4a67'
+ '4368b3f98abd8a32662e094c54e7f9b1'
+ 'a31374fef2cba0ca34dfc7078e2969e4'
+ 'fa85e5cce5d723275b14365ba71a8aad'
+ '93cf977a7abc6f30152295e2aef453fa')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-fdisk-fix-l-device.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure --prefix=/usr \
+ --libdir=/usr/lib \
+ --bindir=/usr/bin \
+ --localstatedir=/run \
+ --enable-fs-paths-extra=/usr/bin \
+ --enable-raw \
+ --enable-vipw \
+ --enable-newgrp \
+ --enable-chfn-chsh \
+ --enable-write \
+ --enable-mesg \
+ --enable-socket-activation \
+ --with-python=3
+
+ make
+}
+
+package_util-linux() {
+ conflicts=('util-linux-ng' 'eject')
+ provides=("util-linux-ng=$pkgver" 'eject')
+ depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux')
+ optdepends=('python: python bindings to libmount')
+ install=util-linux.install
+ groups=('base' 'base-devel')
+ backup=(etc/pam.d/chfn
+ etc/pam.d/chsh
+ etc/pam.d/login
+ etc/pam.d/su
+ etc/pam.d/su-l)
+
+ 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
+ rmdir sbin usr/sbin
+
+ ### create libutil-linux split
+ rm -rf "$srcdir/_libutil-linux"
+ install -dm755 "$srcdir"/_libutil-linux/usr/lib
+ cd "$srcdir"/_libutil-linux
+ mv "$pkgdir"/usr/lib/lib*.{a,so}* usr/lib
+}
+
+package_libutil-linux() {
+ pkgdesc="util-linux runtime libraries"
+ provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+
+ mv "$srcdir/_libutil-linux"/* "$pkgdir"
+}
Deleted: testing-i686/pam-common
===================================================================
--- testing-i686/pam-common 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-i686/pam-common 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1,6 +0,0 @@
-#%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/testing-i686/pam-common (from rev 218249, util-linux/trunk/pam-common)
===================================================================
--- testing-i686/pam-common (rev 0)
+++ testing-i686/pam-common 2014-07-28 13:16:16 UTC (rev 218250)
@@ -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
Deleted: testing-i686/pam-login
===================================================================
--- testing-i686/pam-login 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-i686/pam-login 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1,7 +0,0 @@
-#%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/testing-i686/pam-login (from rev 218249, util-linux/trunk/pam-login)
===================================================================
--- testing-i686/pam-login (rev 0)
+++ testing-i686/pam-login 2014-07-28 13:16:16 UTC (rev 218250)
@@ -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
Deleted: testing-i686/pam-su
===================================================================
--- testing-i686/pam-su 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-i686/pam-su 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1,9 +0,0 @@
-#%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/testing-i686/pam-su (from rev 218249, util-linux/trunk/pam-su)
===================================================================
--- testing-i686/pam-su (rev 0)
+++ testing-i686/pam-su 2014-07-28 13:16:16 UTC (rev 218250)
@@ -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
Deleted: testing-i686/util-linux.install
===================================================================
--- testing-i686/util-linux.install 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-i686/util-linux.install 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1,21 +0,0 @@
-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/testing-i686/util-linux.install (from rev 218249, util-linux/trunk/util-linux.install)
===================================================================
--- testing-i686/util-linux.install (rev 0)
+++ testing-i686/util-linux.install 2014-07-28 13:16:16 UTC (rev 218250)
@@ -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
+}
Deleted: testing-i686/uuidd.tmpfiles
===================================================================
--- testing-i686/uuidd.tmpfiles 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-i686/uuidd.tmpfiles 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1 +0,0 @@
-d /run/uuidd 0755 uuidd uuidd
Copied: util-linux/repos/testing-i686/uuidd.tmpfiles (from rev 218249, util-linux/trunk/uuidd.tmpfiles)
===================================================================
--- testing-i686/uuidd.tmpfiles (rev 0)
+++ testing-i686/uuidd.tmpfiles 2014-07-28 13:16:16 UTC (rev 218250)
@@ -0,0 +1 @@
+d /run/uuidd 0755 uuidd uuidd
Copied: util-linux/repos/testing-x86_64/0001-fdisk-fix-l-device.patch (from rev 218249, util-linux/trunk/0001-fdisk-fix-l-device.patch)
===================================================================
--- testing-x86_64/0001-fdisk-fix-l-device.patch (rev 0)
+++ testing-x86_64/0001-fdisk-fix-l-device.patch 2014-07-28 13:16:16 UTC (rev 218250)
@@ -0,0 +1,61 @@
+From 52d92543ffb8efb56036f316a1072d8fbba62c38 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at redhat.com>
+Date: Mon, 28 Jul 2014 11:57:10 +0200
+Subject: [PATCH] fdisk: fix -l [<device>]
+
+ * don't use err(), but warn(), so don't stop after the first error
+
+ * display all errors when "-l <device> ..." specified
+
+ * display only EACCES errors when list whole disks from
+ /proc/partitions ("fdisk -l" )
+
+Reported-by: Boian Bonev <bbonev at ipacct.com>
+Addresses: https://github.com/karelzak/util-linux/pull/106
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+ disk-utils/fdisk.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
+index 8d57dbb..46e632a 100644
+--- a/disk-utils/fdisk.c
++++ b/disk-utils/fdisk.c
+@@ -670,10 +670,13 @@ static int is_ide_cdrom_or_tape(char *device)
+ return ret;
+ }
+
+-static void print_device_pt(struct fdisk_context *cxt, char *device)
++static void print_device_pt(struct fdisk_context *cxt, char *device, int warnme)
+ {
+- if (fdisk_context_assign_device(cxt, device, 1) != 0) /* read-only */
+- err(EXIT_FAILURE, _("cannot open %s"), device);
++ if (fdisk_context_assign_device(cxt, device, 1) != 0) { /* read-only */
++ if (warnme || errno == EACCES)
++ warn(_("cannot open %s"), device);
++ return;
++ }
+
+ list_disk_geometry(cxt);
+
+@@ -717,7 +720,7 @@ static void print_all_devices_pt(struct fdisk_context *cxt)
+ if (!cn)
+ continue;
+ if (!is_ide_cdrom_or_tape(cn))
+- print_device_pt(cxt, cn);
++ print_device_pt(cxt, cn, 0);
+ free(cn);
+ }
+ fclose(f);
+@@ -912,7 +915,7 @@ int main(int argc, char **argv)
+ if (argc > optind) {
+ int k;
+ for (k = optind; k < argc; k++)
+- print_device_pt(cxt, argv[k]);
++ print_device_pt(cxt, argv[k], 1);
+ } else
+ print_all_devices_pt(cxt);
+ break;
+--
+2.0.3
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-x86_64/PKGBUILD 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1,95 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgbase=util-linux
-pkgname=(util-linux libutil-linux)
-pkgver=2.25
-pkgrel=2
-pkgdesc="Miscellaneous system utilities for Linux"
-url="http://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64')
-makedepends=('systemd' 'python')
-license=('GPL2')
-options=('strip' 'debug')
-source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz"
- uuidd.tmpfiles
- pam-login
- pam-common
- pam-su)
-md5sums=('4c78fdef4cb882caafad61e33cafbc14'
- 'a39554bfd65cccfd8254bb46922f4a67'
- '4368b3f98abd8a32662e094c54e7f9b1'
- 'a31374fef2cba0ca34dfc7078e2969e4'
- 'fa85e5cce5d723275b14365ba71a8aad')
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure --prefix=/usr \
- --libdir=/usr/lib \
- --bindir=/usr/bin \
- --localstatedir=/run \
- --enable-fs-paths-extra=/usr/bin \
- --enable-raw \
- --enable-vipw \
- --enable-newgrp \
- --enable-chfn-chsh \
- --enable-write \
- --enable-mesg \
- --enable-socket-activation \
- --with-python=3
-
- make
-}
-
-package_util-linux() {
- conflicts=('util-linux-ng' 'eject')
- provides=("util-linux-ng=$pkgver" 'eject')
- depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux')
- optdepends=('python: python bindings to libmount')
- install=util-linux.install
- groups=('base' 'base-devel')
- backup=(etc/pam.d/chfn
- etc/pam.d/chsh
- etc/pam.d/login
- etc/pam.d/su
- etc/pam.d/su-l)
-
- 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
- rmdir sbin usr/sbin
-
- ### create libutil-linux split
- rm -rf "$srcdir/_libutil-linux"
- install -dm755 "$srcdir"/_libutil-linux/usr/lib
- cd "$srcdir"/_libutil-linux
- mv "$pkgdir"/usr/lib/lib*.{a,so}* usr/lib
-}
-
-package_libutil-linux() {
- pkgdesc="util-linux runtime libraries"
- provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
-
- mv "$srcdir/_libutil-linux"/* "$pkgdir"
-}
Copied: util-linux/repos/testing-x86_64/PKGBUILD (from rev 218249, util-linux/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-07-28 13:16:16 UTC (rev 218250)
@@ -0,0 +1,103 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgbase=util-linux
+pkgname=(util-linux libutil-linux)
+pkgver=2.25
+pkgrel=3
+pkgdesc="Miscellaneous system utilities for Linux"
+url="http://www.kernel.org/pub/linux/utils/util-linux/"
+arch=('i686' 'x86_64')
+makedepends=('systemd' 'python')
+license=('GPL2')
+options=('strip' 'debug')
+source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz"
+ uuidd.tmpfiles
+ pam-login
+ pam-common
+ pam-su
+ 0001-fdisk-fix-l-device.patch)
+md5sums=('4c78fdef4cb882caafad61e33cafbc14'
+ 'a39554bfd65cccfd8254bb46922f4a67'
+ '4368b3f98abd8a32662e094c54e7f9b1'
+ 'a31374fef2cba0ca34dfc7078e2969e4'
+ 'fa85e5cce5d723275b14365ba71a8aad'
+ '93cf977a7abc6f30152295e2aef453fa')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-fdisk-fix-l-device.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure --prefix=/usr \
+ --libdir=/usr/lib \
+ --bindir=/usr/bin \
+ --localstatedir=/run \
+ --enable-fs-paths-extra=/usr/bin \
+ --enable-raw \
+ --enable-vipw \
+ --enable-newgrp \
+ --enable-chfn-chsh \
+ --enable-write \
+ --enable-mesg \
+ --enable-socket-activation \
+ --with-python=3
+
+ make
+}
+
+package_util-linux() {
+ conflicts=('util-linux-ng' 'eject')
+ provides=("util-linux-ng=$pkgver" 'eject')
+ depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux')
+ optdepends=('python: python bindings to libmount')
+ install=util-linux.install
+ groups=('base' 'base-devel')
+ backup=(etc/pam.d/chfn
+ etc/pam.d/chsh
+ etc/pam.d/login
+ etc/pam.d/su
+ etc/pam.d/su-l)
+
+ 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
+ rmdir sbin usr/sbin
+
+ ### create libutil-linux split
+ rm -rf "$srcdir/_libutil-linux"
+ install -dm755 "$srcdir"/_libutil-linux/usr/lib
+ cd "$srcdir"/_libutil-linux
+ mv "$pkgdir"/usr/lib/lib*.{a,so}* usr/lib
+}
+
+package_libutil-linux() {
+ pkgdesc="util-linux runtime libraries"
+ provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+
+ mv "$srcdir/_libutil-linux"/* "$pkgdir"
+}
Deleted: testing-x86_64/pam-common
===================================================================
--- testing-x86_64/pam-common 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-x86_64/pam-common 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1,6 +0,0 @@
-#%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/testing-x86_64/pam-common (from rev 218249, util-linux/trunk/pam-common)
===================================================================
--- testing-x86_64/pam-common (rev 0)
+++ testing-x86_64/pam-common 2014-07-28 13:16:16 UTC (rev 218250)
@@ -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
Deleted: testing-x86_64/pam-login
===================================================================
--- testing-x86_64/pam-login 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-x86_64/pam-login 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1,7 +0,0 @@
-#%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/testing-x86_64/pam-login (from rev 218249, util-linux/trunk/pam-login)
===================================================================
--- testing-x86_64/pam-login (rev 0)
+++ testing-x86_64/pam-login 2014-07-28 13:16:16 UTC (rev 218250)
@@ -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
Deleted: testing-x86_64/pam-su
===================================================================
--- testing-x86_64/pam-su 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-x86_64/pam-su 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1,9 +0,0 @@
-#%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/testing-x86_64/pam-su (from rev 218249, util-linux/trunk/pam-su)
===================================================================
--- testing-x86_64/pam-su (rev 0)
+++ testing-x86_64/pam-su 2014-07-28 13:16:16 UTC (rev 218250)
@@ -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
Deleted: testing-x86_64/util-linux.install
===================================================================
--- testing-x86_64/util-linux.install 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-x86_64/util-linux.install 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1,21 +0,0 @@
-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/testing-x86_64/util-linux.install (from rev 218249, util-linux/trunk/util-linux.install)
===================================================================
--- testing-x86_64/util-linux.install (rev 0)
+++ testing-x86_64/util-linux.install 2014-07-28 13:16:16 UTC (rev 218250)
@@ -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
+}
Deleted: testing-x86_64/uuidd.tmpfiles
===================================================================
--- testing-x86_64/uuidd.tmpfiles 2014-07-28 13:15:25 UTC (rev 218249)
+++ testing-x86_64/uuidd.tmpfiles 2014-07-28 13:16:16 UTC (rev 218250)
@@ -1 +0,0 @@
-d /run/uuidd 0755 uuidd uuidd
Copied: util-linux/repos/testing-x86_64/uuidd.tmpfiles (from rev 218249, util-linux/trunk/uuidd.tmpfiles)
===================================================================
--- testing-x86_64/uuidd.tmpfiles (rev 0)
+++ testing-x86_64/uuidd.tmpfiles 2014-07-28 13:16:16 UTC (rev 218250)
@@ -0,0 +1 @@
+d /run/uuidd 0755 uuidd uuidd
More information about the arch-commits
mailing list