# HG changeset patch # User Rich Burridge # Date 1487902012 28800 # Node ID 72c18d63696dfb6d32f752aad222a462a377b3ef # Parent 3b2a3df0423eaa3c6bd86c1a43a8bc98901e940b 25599459 Update text-utilities to version 2.29 diff -r 3b2a3df0423e -r 72c18d63696d components/text-utilities/Makefile --- a/components/text-utilities/Makefile Thu Feb 23 14:26:42 2017 -0800 +++ b/components/text-utilities/Makefile Thu Feb 23 18:06:52 2017 -0800 @@ -27,16 +27,16 @@ include ../../make-rules/shared-macros.mk COMPONENT_NAME= text-utilities -COMPONENT_VERSION= 2.28 +COMPONENT_VERSION= 2.29 COMPONENT_PROJECT_URL= https://www.kernel.org/pub/linux/utils/util-linux COMPONENT_SRC= util-linux-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= \ - sha256:395847e2a18a2c317170f238892751e73a57104565344f8644090c8b091014bb + sha256:2c59ea67cc7b564104f60532f6e0a95fe17a91acb870ba8fd7e986f273abf9e7 COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_ANITYA_ID= 8179 -TPNO= 29447 +TPNO= 33879 TEST_TARGET= install $(TEST_64) SYSTEM_TEST_TARGET= configure $(SYSTEM_TEST_64) diff -r 3b2a3df0423e -r 72c18d63696d components/text-utilities/patches/localization-changes.patch --- a/components/text-utilities/patches/localization-changes.patch Thu Feb 23 14:26:42 2017 -0800 +++ b/components/text-utilities/patches/localization-changes.patch Thu Feb 23 18:06:52 2017 -0800 @@ -3,8 +3,8 @@ These changes will not be submitted upstream. ---- util-linux-2.28/po/POTFILES.in.orig 2016-06-09 14:25:26.035456587 -0700 -+++ util-linux-2.28/po/POTFILES.in 2016-06-09 14:33:37.556681233 -0700 +--- util-linux-2.29/po/POTFILES.in.orig 2017-02-22 13:17:55.125111218 +0000 ++++ util-linux-2.29/po/POTFILES.in 2017-02-22 13:20:20.116666694 +0000 @@ -1,31 +1,3 @@ -disk-utils/addpart.c -disk-utils/blockdev.c @@ -37,7 +37,7 @@ include/all-io.h include/bitops.h include/blkdev.h -@@ -81,97 +53,6 @@ +@@ -82,97 +54,6 @@ include/widechar.h include/xalloc.h lib/blkdev.c @@ -135,7 +135,7 @@ lib/canonicalize.c lib/color-names.c lib/colors.c -@@ -179,25 +60,6 @@ +@@ -180,28 +61,6 @@ lib/crc32.c lib/env.c lib/exec_shell.c @@ -145,8 +145,10 @@ -libfdisk/src/context.c -libfdisk/src/dos.c -libfdisk/src/fdiskP.h +-libfdisk/src/field.c -libfdisk/src/gpt.c -libfdisk/src/init.c +-libfdisk/src/item.c -libfdisk/src/iter.c -libfdisk/src/label.c -libfdisk/src/partition.c @@ -158,10 +160,11 @@ -libfdisk/src/test.c -libfdisk/src/utils.c -libfdisk/src/version.c +-libfdisk/src/wipe.c lib/fileutils.c lib/idcache.c lib/ismounted.c -@@ -209,32 +71,6 @@ +@@ -213,32 +72,6 @@ lib/mbsalign.c lib/md5.c lib/monotonic.c @@ -193,8 +196,8 @@ -libmount/src/version.c lib/pager.c lib/path.c - lib/procutils.c -@@ -257,118 +93,6 @@ + lib/plymouth-ctrl.c +@@ -262,120 +95,6 @@ lib/timer.c lib/timeutils.c lib/ttyutils.c @@ -246,6 +249,8 @@ -misc-utils/cal.c -misc-utils/findfs.c -misc-utils/findmnt.c +-misc-utils/findmnt.h +-misc-utils/findmnt-verify.c -misc-utils/getopt.c -misc-utils/kill.c -misc-utils/logger.c @@ -313,14 +318,14 @@ term-utils/agetty.c term-utils/mesg.c term-utils/script.c ---- util-linux-2.28/configure.orig 2016-06-09 14:34:48.346013558 -0700 -+++ util-linux-2.28/configure 2016-06-09 14:35:28.581050910 -0700 -@@ -4996,7 +4996,7 @@ +--- util-linux-2.29/configure.orig 2017-02-22 13:21:19.807273753 +0000 ++++ util-linux-2.29/configure 2017-02-22 13:23:38.473765855 +0000 +@@ -5002,7 +5002,7 @@ # Define the identity of the package. - PACKAGE='util-linux' + PACKAGE='text-utilities' - VERSION='2.28' + VERSION='2.29' diff -r 3b2a3df0423e -r 72c18d63696d components/text-utilities/test/results-64.master --- a/components/text-utilities/test/results-64.master Thu Feb 23 14:26:42 2017 -0800 +++ b/components/text-utilities/test/results-64.master Thu Feb 23 18:06:52 2017 -0800 @@ -4,6 +4,8 @@ For development purpose only. Don't execute on production system! + kernel: 5.12 + script: $(SOURCE_DIR)/tests/ts/colrm/rm2-2 sub dir: $(SOURCE_DIR)/tests/ts/colrm