util-linux: upgraded package to upstream
Upgraded sys-apps/util-linux to version 2.27.1 on amd64
Used "--unstable-ok"
BUG=chromium:583671
TEST=Built packages for swanky
CQ-DEPEND=CL:325741, CL:333903
Change-Id: I9781f65e5c07207c88d46cd91d6f01c65dd0d427
Reviewed-on: https://chromium-review.googlesource.com/325680
Commit-Ready: Sabin Floares <sabin.floares@intel.com>
Tested-by: Sabin Floares <sabin.floares@intel.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.25.1-r1 b/metadata/md5-cache/sys-apps/util-linux-2.25.1-r1
deleted file mode 100644
index 04616aa..0000000
--- a/metadata/md5-cache/sys-apps/util-linux-2.25.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-1.3-r2 caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7 ) dev-lang/python-exec:2[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) udev? ( virtual/udev ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers
-DESCRIPTION=Various useful Linux utilities
-EAPI=4
-HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/
-IUSE=caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=*
-LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-1.3-r2 caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7 ) dev-lang/python-exec:2[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) udev? ( virtual/udev ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/util-linux/v2.25/util-linux-2.25.1.tar.xz
-_eclasses_=bash-completion-r1 d339dd40b2014cf1edba8592580eef42 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 python-single-r1 f782db6207752efeca1d59c016d8c813 python-utils-r1 42cc5b750abbcf9d4389848380bbef91 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=988bcbb6812ed31b4d5607a0287cf893
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.27.1 b/metadata/md5-cache/sys-apps/util-linux-2.27.1
new file mode 100644
index 0000000..9bbc79a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.27.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline:0 ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers virtual/pkgconfig
+DESCRIPTION=Various useful Linux utilities
+EAPI=5
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=*
+LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline:0 ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-1.3-r2
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/util-linux/v2.27/util-linux-2.27.1.tar.xz
+_eclasses_=bash-completion-r1 d339dd40b2014cf1edba8592580eef42 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 python-single-r1 f782db6207752efeca1d59c016d8c813 python-utils-r1 9500a9740660edfcbc0b3b0b491ef307 systemd 9f063b2cc19c5e8030911372aa246c4e toolchain-funcs 48b38a216afb92db6314d6c3187abea3
+_md5_=3aaaa801ab39ef314d62fe255e8828ef
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 5bf82f1..c083227 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1 +1 @@
-DIST util-linux-2.25.1.tar.xz 3695172 SHA256 4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8 SHA512 a670cb4318beed0a455efb339ebea6ec7c5d672e15877e7e25cae2ec9c0795fbe4275b6c85a590467c3de92ab2f64cdcd0427c9a2a6e4c6b76f563592fb7be8d WHIRLPOOL 44c17bd3ad0b05c47bb955b934011b460c3992ea5d5b43977d2001b245820b775e16bedbaa10ff9c223d59b0809674884c76f0dc34d707864d17b49b4deaab9d
+DIST util-linux-2.27.1.tar.xz 3964512 SHA256 0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290 SHA512 a450a0c2d26a6deaf5e53b8f6bddf59409aefb1f0aaf07393f68a418408fbc62c5da353c8ba53c7cac8ea6e3dddfad59161753d888c31f5ccea445e81accbad8 WHIRLPOOL b0641f013762a667efcb2fabe6e3e09dd09252835d841e25cde506aca3a74876ad34f8130f3227683c7e8f19359205c4014dfcd9055d860ae6e3e54621478639
diff --git a/sys-apps/util-linux/files/util-linux-2.25.1-blkid-probe-fix.patch b/sys-apps/util-linux/files/util-linux-2.25.1-blkid-probe-fix.patch
deleted file mode 100644
index 1ede123..0000000
--- a/sys-apps/util-linux/files/util-linux-2.25.1-blkid-probe-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 00749bc366fe6106df918660a92a388cfff4f35f Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 7 Oct 2014 12:44:34 +0200
-Subject: [PATCH] libblkid: zeroize errno on blkid_probe_get_buffer() success
-
-Since 37f4060225df0591ab8e1dd676dbc8115d900d4f prober functions are
-sensitive to errno, it seems more robust to set errno=0 with in
-blkid_probe_get_buffer() on success than set the zero on all places
-where we call blkid_probe_get_buffer().
-
-Addresses: https://github.com/karelzak/util-linux/issues/119
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libblkid/src/probe.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
-index 4fea3cc..3f7e43b 100644
---- a/libblkid/src/probe.c
-+++ b/libblkid/src/probe.c
-@@ -539,8 +539,10 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr,
- struct list_head *p;
- struct blkid_bufinfo *bf = NULL;
-
-- if (pr->size <= 0)
-+ if (pr->size <= 0) {
-+ errno = EINVAL;
- return NULL;
-+ }
-
- if (pr->parent &&
- pr->parent->devno == pr->devno &&
-@@ -602,6 +604,7 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr,
- list_add_tail(&bf->bufs, &pr->buffers);
- }
-
-+ errno = 0;
- return off ? bf->data + (off - bf->off) : bf->data;
- }
-
---
-2.1.0.rc2.206.gedb03e5
-
diff --git a/sys-apps/util-linux/files/util-linux-2.27.1-sysmacros.patch b/sys-apps/util-linux/files/util-linux-2.27.1-sysmacros.patch
new file mode 100644
index 0000000..9c64e07
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.27.1-sysmacros.patch
@@ -0,0 +1,278 @@
+From 71cd37a19acef366ff12f322c78c711559764e13 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 7 Mar 2016 16:42:05 -0500
+Subject: [PATCH] include sysmacros.h where used
+
+BSD/Linux systems stick major/minor/makedev in sysmacros.h. Newer Linux
+libraries have been moving away from including sysmacros.h implicitly via
+sys/types.h, so include it directly.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+
+diff --git a/lib/ismounted.c b/lib/ismounted.c
+index f83be65..9b0e447 100644
+--- a/lib/ismounted.c
++++ b/lib/ismounted.c
+@@ -18,6 +18,7 @@
+ #include <sys/stat.h>
+ #include <ctype.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ #ifdef __APPLE__
+ #include <sys/ucred.h>
+ #include <sys/mount.h>
+diff --git a/lib/sysfs.c b/lib/sysfs.c
+index 9e973a4..4b46459 100644
+--- a/lib/sysfs.c
++++ b/lib/sysfs.c
+@@ -7,6 +7,7 @@
+ * Written by Karel Zak <kzak@redhat.com>
+ */
+ #include <ctype.h>
++#include <sys/sysmacros.h>
+
+ #include "c.h"
+ #include "at.h"
+diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
+index fe8eab1..56f5336 100644
+--- a/login-utils/sulogin-consoles.c
++++ b/login-utils/sulogin-consoles.c
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c
+index dbbe5b5..d583800 100644
+--- a/libblkid/src/devname.c
++++ b/libblkid/src/devname.c
+@@ -25,6 +25,7 @@
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#include <sys/sysmacros.h>
+ #include <dirent.h>
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c
+index 58fbce5..4b8f3db 100644
+--- a/libblkid/src/devno.c
++++ b/libblkid/src/devno.c
+@@ -31,6 +31,7 @@
+ #endif
+ #include <fcntl.h>
+ #include <inttypes.h>
++#include <sys/sysmacros.h>
+
+ #include "blkidP.h"
+ #include "pathnames.h"
+diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
+index cee7008..29b4428 100644
+--- a/libmount/src/tab_parse.c
++++ b/libmount/src/tab_parse.c
+@@ -16,6 +16,7 @@
+ #include <limits.h>
+ #include <dirent.h>
+ #include <fcntl.h>
++#include <sys/sysmacros.h>
+
+ #include "at.h"
+ #include "mangle.h"
+diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
+index f72be14..e14119b 100644
+--- a/misc-utils/findmnt.c
++++ b/misc-utils/findmnt.c
+@@ -31,6 +31,7 @@
+ #include <assert.h>
+ #include <poll.h>
+ #include <sys/statvfs.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #ifdef HAVE_LIBUDEV
+ # include <libudev.h>
+diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
+index c9a39b3..6010167 100644
+--- a/misc-utils/lsblk.c
++++ b/misc-utils/lsblk.c
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <stdint.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
+diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
+index a47c1d0..7689964 100644
+--- a/misc-utils/lslocks.c
++++ b/misc-utils/lslocks.c
+@@ -30,6 +30,7 @@
+ #include <dirent.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+
+ #include <libmount.h>
+diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
+index 6f9e78b..2b7e712 100644
+--- a/disk-utils/fsck.c
++++ b/disk-utils/fsck.c
+@@ -30,6 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/file.h>
+ #include <fcntl.h>
+ #include <limits.h>
+diff --git a/disk-utils/partx.c b/disk-utils/partx.c
+index 50bd6a4..955166b 100644
+--- a/disk-utils/partx.c
++++ b/disk-utils/partx.c
+@@ -19,6 +19,7 @@
+ #include <unistd.h>
+ #include <assert.h>
+ #include <dirent.h>
++#include <sys/sysmacros.h>
+
+ #include <blkid.h>
+ #include <libsmartcols.h>
+diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
+index 81371eb..9c1aacb 100644
+--- a/disk-utils/sfdisk.c
++++ b/disk-utils/sfdisk.c
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <getopt.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <assert.h>
+ #include <fcntl.h>
+ #include <libsmartcols.h>
+diff --git a/libblkid/src/evaluate.c b/libblkid/src/evaluate.c
+index ffbe097..3d9a76b 100644
+--- a/libblkid/src/evaluate.c
++++ b/libblkid/src/evaluate.c
+@@ -12,6 +12,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <ctype.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
+index c8e0bfe..4ba5411 100644
+--- a/libblkid/src/partitions/partitions.c
++++ b/libblkid/src/partitions/partitions.c
+@@ -15,6 +15,7 @@
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <errno.h>
+ #include <stdint.h>
+ #include <inttypes.h>
+diff --git a/libblkid/src/topology/dm.c b/libblkid/src/topology/dm.c
+index e061632..993161c 100644
+--- a/libblkid/src/topology/dm.c
++++ b/libblkid/src/topology/dm.c
+@@ -17,6 +17,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+
+ #include "topology.h"
+diff --git a/libblkid/src/topology/evms.c b/libblkid/src/topology/evms.c
+index 7a4fd55..b59b97b 100644
+--- a/libblkid/src/topology/evms.c
++++ b/libblkid/src/topology/evms.c
+@@ -18,6 +18,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+
+ #include "topology.h"
+diff --git a/libblkid/src/topology/lvm.c b/libblkid/src/topology/lvm.c
+index bd079d4..2ade0c2 100644
+--- a/libblkid/src/topology/lvm.c
++++ b/libblkid/src/topology/lvm.c
+@@ -17,6 +17,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+
+ #include "topology.h"
+diff --git a/libblkid/src/topology/md.c b/libblkid/src/topology/md.c
+index 5eba947..388f996 100644
+--- a/libblkid/src/topology/md.c
++++ b/libblkid/src/topology/md.c
+@@ -18,6 +18,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+
+ #include "topology.h"
+diff --git a/libmount/python/fs.c b/libmount/python/fs.c
+index 0789d37..651a7c5 100644
+--- a/libmount/python/fs.c
++++ b/libmount/python/fs.c
+@@ -27,6 +27,7 @@
+
+ #include "pylibmount.h"
+ #include <errno.h>
++#include <sys/sysmacros.h>
+
+ #define Fs_HELP "Fs(source=None, root=None, target=None, fstype=None, options=None, attributes=None, freq=0, passno=0)"
+
+diff --git a/libmount/src/fs.c b/libmount/src/fs.c
+index 2bab7d6..ab3155d 100644
+--- a/libmount/src/fs.c
++++ b/libmount/src/fs.c
+@@ -14,6 +14,7 @@
+ #include <ctype.h>
+ #include <blkid.h>
+ #include <stddef.h>
++#include <sys/sysmacros.h>
+
+ #include "mountP.h"
+ #include "strutils.h"
+diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
+index 1d57ab3..90a42b6 100644
+--- a/sys-utils/losetup.c
++++ b/sys-utils/losetup.c
+@@ -12,6 +12,7 @@
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <inttypes.h>
+ #include <getopt.h>
+
+diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
+index ad9c1da..64d0a7e 100644
+--- a/sys-utils/mountpoint.c
++++ b/sys-utils/mountpoint.c
+@@ -31,6 +31,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+
+ #include <libmount.h>
+
+--
+2.6.2
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index 8caf3fd..c2ad0f9 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<use>
- <flag name='caps'>build setpriv helper (run programs with diff capabilities)</flag>
- <flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag>
- <flag name='cytune'>build cytune for Cyclades-Z multiport serial cards</flag>
- <flag name='fdformat'>build fdformat (floppy disk format)</flag>
- <flag name='pam'>build runuser helper</flag>
- <flag name='suid'>
+ <flag name="caps">build setpriv helper (run programs with diff capabilities)</flag>
+ <flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag>
+ <flag name="cytune">build cytune for Cyclades-Z multiport serial cards</flag>
+ <flag name="fdformat">build fdformat (floppy disk format)</flag>
+ <flag name="kill">build the kill program</flag>
+ <flag name="pam">build runuser helper</flag>
+ <flag name="suid">
install mount/umount as setuid so non-root users may mount/umount devices,
and wall/write as setgid so non-root users can notify other users
</flag>
- <flag name='tty-helpers'>install the mesg/wall/write tools for talking to local users</flag>
+ <flag name="tty-helpers">install the mesg/wall/write tools for talking to local users</flag>
</use>
- <upstream>
- <remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
- </upstream>
+<upstream>
+ <remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/sys-apps/util-linux/util-linux-2.25.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.27.1.ebuild
similarity index 73%
rename from sys-apps/util-linux/util-linux-2.25.1-r1.ebuild
rename to sys-apps/util-linux/util-linux-2.27.1.ebuild
index 0e3779a..a07ceb8 100644
--- a/sys-apps/util-linux/util-linux-2.25.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.27.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.1.ebuild,v 1.1 2014/09/05 13:20:22 polynomial-c Exp $
+# $Id$
-EAPI="4"
+EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_{2,3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
- python-single-r1 multilib-minimal
+ python-single-r1 multilib-minimal systemd
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}
@@ -21,29 +21,24 @@
fi
DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
SLOT="0"
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-RDEPEND="!sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !sys-block/eject
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
- !<app-shells/bash-completion-1.3-r2
- caps? ( sys-libs/libcap-ng )
+RDEPEND="caps? ( sys-libs/libcap-ng )
cramfs? ( sys-libs/zlib )
- ncurses? ( >=sys-libs/ncurses-5.2-r2 )
+ ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
pam? ( sys-libs/pam )
python? ( ${PYTHON_DEPS} )
+ readline? ( sys-libs/readline:0 )
selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
slang? ( sys-libs/slang )
- udev? ( virtual/udev )
+ !build? ( systemd? ( sys-apps/systemd ) )
+ udev? ( virtual/libudev:= )
abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140406-r2
+ !<=app-emulation/emul-linux-x86-baselibs-20150406-r2
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
)"
DEPEND="${RDEPEND}
@@ -51,6 +46,18 @@
nls? ( sys-devel/gettext )
test? ( sys-devel/bc )
virtual/os-headers"
+RDEPEND+="
+ kill? (
+ !sys-apps/coreutils[kill]
+ !sys-process/procps[kill]
+ )
+ !sys-process/schedutils
+ !sys-apps/setarch
+ !<sys-apps/sysvinit-2.88-r7
+ !sys-block/eject
+ !<sys-libs/e2fsprogs-libs-1.41.8
+ !<sys-fs/e2fsprogs-1.41.8
+ !<app-shells/bash-completion-1.3-r2"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -61,11 +68,11 @@
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-blkid-probe-fix.patch
if [[ ${PV} == 9999 ]] ; then
po/update-potfiles
eautoreconf
fi
+ epatch "${FILESDIR}"/${P}-sysmacros.patch
elibtoolize
}
@@ -84,14 +91,16 @@
multilib_src_configure() {
lfs_fallocate_test
+ # The scanf test in a run-time test which fails while cross-compiling.
+ # Blindly assume a POSIX setup since we require libmount, and libmount
+ # itself fails when the scanf test fails. #531856
+ tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
- # We manually set --libdir to the default since on prefix, econf will set it to
- # a value which the configure script does not recognize. This makes it set the
- # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
+ export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
ECONF_SOURCE=${S} \
econf \
--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
- --libdir='${prefix}/'"$(get_libdir)" \
+ --docdir='${datarootdir}'/doc/${PF} \
$(multilib_native_use_enable nls) \
--enable-agetty \
--with-bashcompletiondir="$(get_bashcompdir)" \
@@ -101,13 +110,14 @@
$(multilib_native_use_enable cramfs) \
$(multilib_native_use_enable fdformat) \
--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
- --disable-kill \
+ $(use_enable kill) \
--disable-login \
$(multilib_native_use_enable tty-helpers mesg) \
--disable-nologin \
--enable-partx \
$(multilib_native_use_with python) \
--enable-raw \
+ $(multilib_native_use_with readline) \
--enable-rename \
--disable-reset \
--enable-schedutils \
@@ -119,6 +129,8 @@
$(use_with selinux) \
$(multilib_native_use_with slang) \
$(use_enable static-libs static) \
+ $(multilib_native_use_with systemd) \
+ --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
$(multilib_native_use_with udev) \
$(tc-has-tls || echo --disable-tls)
}
@@ -144,7 +156,7 @@
emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
install-pkgconfigDATA install-uuidincHEADERS \
install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
- install-nodist_smartcolsincHEADERS
+ install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
fi
if multilib_is_native_abi; then
