commit: b4ba1268f4634f68b331b3210ae548e7dbbb246a Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu May 30 23:27:36 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri May 31 00:58:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ba1268
sys-apps/util-linux: Bump to version 2.34_rc2. Removed old. Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-apps/util-linux/Manifest | 2 +- ...ux-2.34_rc1-lsblk_fix_heap_use_after_free.patch | 23 ------------------ ...34_rc1-lscpu_floating_point_exception_fix.patch | 28 ---------------------- ...-2.34_rc1.ebuild => util-linux-2.34_rc2.ebuild} | 19 +++++++-------- 4 files changed, 9 insertions(+), 63 deletions(-) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index d1e17410555..6ef615f749a 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,4 +1,4 @@ DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689 -DIST util-linux-2.34-rc1.tar.xz 4930092 BLAKE2B 742322c85c2b92ff16cc95e98da40522350d84c9e72b929d763da882f54ff88e4ff38d1622a2642b88fcb124e9221ff32e26403e5d76cc06bcfeb6c92e450d91 SHA512 4f968f04394f6beaafd60a84daf1db808ec486dbfa82d2f58b0678f93adc37477395a1b22c0c2af33f9652c5fa82f8bb3c1ce8b62146c983bce270fe45c1419b +DIST util-linux-2.34-rc2.tar.xz 4990080 BLAKE2B 63c7bc91d04e8cde2f67e2fad5a6a4b6ffe7b392d284c29b01b5a89eea26b42436656f8c4544555545b3718a739674c795c13a41e3a1e1cb2a98e952d02f9283 SHA512 54ae5ab146a2f8185dd1e46b363d3f83fd6791eb95f83522307ea59dcf23be93a9496fd1ca10bb09788ebd429c62db8fcde8747ed793c7826340289efb4e77d0 diff --git a/sys-apps/util-linux/files/util-linux-2.34_rc1-lsblk_fix_heap_use_after_free.patch b/sys-apps/util-linux/files/util-linux-2.34_rc1-lsblk_fix_heap_use_after_free.patch deleted file mode 100644 index 41291205c5a..00000000000 --- a/sys-apps/util-linux/files/util-linux-2.34_rc1-lsblk_fix_heap_use_after_free.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f6f8a671a9a45125b6261c08b849833bce0f39a8 Mon Sep 17 00:00:00 2001 -From: Karel Zak <k...@redhat.com> -Date: Mon, 6 May 2019 12:39:07 +0200 -Subject: [PATCH] lsblk: fix heap-use-after-free - -Addresses: https://github.com/karelzak/util-linux/issues/787 -Signed-off-by: Karel Zak <k...@redhat.com> ---- - misc-utils/lsblk.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index 34a6cd9ca..30d5d9b4e 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1560,6 +1560,7 @@ static int process_all_devices(struct lsblk_devtree *tr) - if (is_maj_excluded(dev->maj) || !is_maj_included(dev->maj)) { - DBG(DEV, ul_debug(" %s: ignore (by filter)", d->d_name)); - lsblk_devtree_remove_device(tr, dev); -+ dev = NULL; - goto next; - } - diff --git a/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch b/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch deleted file mode 100644 index b1314e0e44c..00000000000 --- a/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 836455917879333e94d4a535aa22f1235b5d4885 Mon Sep 17 00:00:00 2001 -From: Sami Kerola <kerol...@iki.fi> -Date: Sat, 18 May 2019 10:19:35 +0100 -Subject: [PATCH] lscpu: fix floating point exception - -FIXME: this commit should include vmware_fpe regression test inclusion. - -Caused-by: e5f721132ec8b8c933a396d8dcb3efcb67854f13 -Addresses: https://github.com/karelzak/util-linux/issues/788 -Reported-by: Lars Wendler <polynomia...@gentoo.org> -Signed-off-by: Sami Kerola <kerol...@iki.fi> ---- - sys-utils/lscpu.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c -index ca7f6a037..7f6277f00 100644 ---- a/sys-utils/lscpu.c -+++ b/sys-utils/lscpu.c -@@ -1925,6 +1925,8 @@ static int get_cache_full_size(struct lscpu_desc *desc, - /* Correction for CPU threads */ - if (desc->nthreads > desc->ncores) - nshares /= (desc->nthreads / desc->ncores); -+ if (nshares < 1) -+ nshares = 1; - - *res = (desc->ncores / nshares) * ca->size; - return 0; diff --git a/sys-apps/util-linux/util-linux-2.34_rc1.ebuild b/sys-apps/util-linux/util-linux-2.34_rc2.ebuild similarity index 96% rename from sys-apps/util-linux/util-linux-2.34_rc1.ebuild rename to sys-apps/util-linux/util-linux-2.34_rc2.ebuild index e45b41732ad..9aefa220794 100644 --- a/sys-apps/util-linux/util-linux-2.34_rc1.ebuild +++ b/sys-apps/util-linux/util-linux-2.34_rc2.ebuild @@ -2,7 +2,7 @@ # Copyright 2018 Sony Interactive Entertainment Inc. # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) @@ -30,7 +30,9 @@ IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. -RDEPEND="caps? ( sys-libs/libcap-ng ) +DEPEND=" + virtual/os-headers + caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) @@ -41,12 +43,12 @@ RDEPEND="caps? ( sys-libs/libcap-ng ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= )" -DEPEND="${RDEPEND} +BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) - virtual/os-headers" -RDEPEND+=" +" +RDEPEND="${DEPEND} kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] @@ -63,11 +65,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}/${MY_P}" -PATCHES=( - "${FILESDIR}"/${P}-lsblk_fix_heap_use_after_free.patch - "${FILESDIR}"/${P}-lscpu_floating_point_exception_fix.patch -) - src_prepare() { default @@ -264,7 +261,7 @@ multilib_src_install_all() { if ! use userland_GNU; then # manpage collisions # TODO: figure out a good way to keep them - rm "${ED%/}"/usr/share/man/man3/uuid* || die + rm "${ED}"/usr/share/man/man3/uuid* || die fi if use pam; then
