From c14b1486181a4159f801e73bf5275877c068fedd Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@startmail.com>
Date: Thu, 23 May 2019 15:38:32 +0200
Subject: [PATCH] Replace 'rename' with 'text-utilities'
---
components/meta-packages/history/history | 1
components/meta-packages/install-types/Makefile | 2
/dev/null | 54 --
components/text/text-utilities/text-utilities.p5m | 73 +++
components/text/text-utilities/test/results-64.master | 325 +++++++++++++++++
components/text/text-utilities/patches/ttyutils.h.patch | 36 +
components/meta-packages/install-types/includes/server_desktop | 2
components/text/text-utilities/manifests/sample-manifest.p5m | 128 ++++++
components/text/text-utilities/patches/build.patch | 22 +
components/text/text-utilities/patches/localization-changes.patch | 348 ++++++++++++++++++
components/text/text-utilities/text-utilities.license | 30 +
components/text/text-utilities/Makefile | 118 ++++++
12 files changed, 1,083 insertions(+), 56 deletions(-)
diff --git a/components/meta-packages/history/history b/components/meta-packages/history/history
index 216ceb3..523b294 100644
--- a/components/meta-packages/history/history
+++ b/components/meta-packages/history/history
@@ -578,6 +578,7 @@
editor/gedit/gedit-plugins@2.32.0,5.11-2017.0.0.2
editor/ghex@2.30.0,5.11-2014.0.0.0
editor/gobby@0.4.94,5.11-2017.0.0.3
+file/rename@2.33.1-2018.0.0.1 text/text-utilities
file/slocate@0.5.11,5.11-2015.0.2.0 file/mlocate@0.25-0.151.1.8.1
games/gnome-games@2.32.1,5.11-2017.0.0.2
gnome/accessibility/accerciser@2.30.1,5.11-2016.0.0.0
diff --git a/components/meta-packages/install-types/Makefile b/components/meta-packages/install-types/Makefile
index 30d672b..537b4e7 100644
--- a/components/meta-packages/install-types/Makefile
+++ b/components/meta-packages/install-types/Makefile
@@ -16,7 +16,7 @@
COMPONENT_NAME= install-types
COMPONENT_VERSION= 0.1
-COMPONENT_REVISION= 33
+COMPONENT_REVISION= 34
COMPONENT_SUMMARY= A meta-packages that install common applications for ISOs
include $(WS_MAKE_RULES)/ips.mk
diff --git a/components/meta-packages/install-types/includes/server_desktop b/components/meta-packages/install-types/includes/server_desktop
index 529c8e6..33d52ff 100644
--- a/components/meta-packages/install-types/includes/server_desktop
+++ b/components/meta-packages/install-types/includes/server_desktop
@@ -16,7 +16,7 @@
depend type=require fmri=file/gnu-coreutils
depend type=require fmri=file/gnu-findutils
depend type=require fmri=file/slocate
-depend type=require fmri=file/rename
+depend type=require fmri=text/text-utilities
depend type=require fmri=library/perl-5/authen-pam
depend type=require fmri=library/perl-5/xml-parser
depend type=require fmri=locale/af
diff --git a/components/sysutils/rename/Makefile b/components/sysutils/rename/Makefile
deleted file mode 100644
index e2e4dbc..0000000
--- a/components/sysutils/rename/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"). You may
-# only use this file in accordance with the terms of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2019 Michal Nowak
-#
-
-PREFERRED_BITS= 64
-
-include ../../../make-rules/shared-macros.mk
-
-COMPONENT_NAME= rename
-COMPONENT_MAJOR_VERSION=2.33
-COMPONENT_MINOR_VERSION=1
-COMPONENT_VERSION= $(COMPONENT_MAJOR_VERSION).$(COMPONENT_MINOR_VERSION)
-COMPONENT_SUMMARY= Various Linux utilities
-COMPONENT_PROJECT_URL= https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
-COMPONENT_FMRI= file/rename
-COMPONENT_CLASSIFICATION=Applications/System Utilities
-COMPONENT_SRC= util-linux-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
-COMPONENT_ARCHIVE_URL= https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v$(COMPONENT_MAJOR_VERSION)/$(COMPONENT_ARCHIVE)
-COMPONENT_ARCHIVE_HASH= sha256:c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21
-COMPONENT_LICENSE_FILE= README.licensing
-COMPONENT_LICENSE= GPL-2.0-or-later, GPL-2.0, LGPL-2.1-or-later, BSD-3-Clause, BSD-4-Clause-UC, Public Domain
-
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
-
-PATH = $(PATH.gnu)
-
-# Handpick stuff we want as most stuff won't build
-CONFIGURE_OPTIONS += --disable-all-programs
-CONFIGURE_OPTIONS += --enable-rename
-
-build: $(BUILD_64)
-
-install: $(INSTALL_64)
-
-test: $(NO_TESTS)
-
-# Auto-generated dependencies
-REQUIRED_PACKAGES += system/library
diff --git a/components/sysutils/rename/manifests/sample-manifest.p5m b/components/sysutils/rename/manifests/sample-manifest.p5m
deleted file mode 100644
index 105c79d..0000000
--- a/components/sysutils/rename/manifests/sample-manifest.p5m
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2018 <contributor>
-#
-
-set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="$(COMPONENT_SUMMARY)"
-set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-
-file path=usr/bin/rename
-file path=usr/share/bash-completion/completions/rename
-file path=usr/share/locale/ca/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/cs/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/da/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/de/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/es/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/et/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/eu/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/fi/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/fr/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/gl/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/hr/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/hu/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/id/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/it/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/ja/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/nl/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/pl/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/ru/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/sl/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/sv/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/tr/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/uk/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/vi/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/zh_CN/LC_MESSAGES/util-linux.mo
-file path=usr/share/locale/zh_TW/LC_MESSAGES/util-linux.mo
-file path=usr/share/man/man1/rename.1
-file path=usr/share/man/man5/terminal-colors.d.5
diff --git a/components/sysutils/rename/util-linux.p5m b/components/sysutils/rename/util-linux.p5m
deleted file mode 100644
index 731e172..0000000
--- a/components/sysutils/rename/util-linux.p5m
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2019 Michal Nowak
-#
-
-set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="$(COMPONENT_SUMMARY)"
-set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-
-file path=usr/bin/rename
-file path=usr/share/bash-completion/completions/rename
-#file path=usr/share/locale/ca/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/cs/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/da/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/de/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/es/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/et/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/eu/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/fi/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/fr/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/gl/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/hr/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/hu/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/id/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/it/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/ja/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/nl/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/pl/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/ru/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/sl/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/sv/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/tr/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/uk/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/vi/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/zh_CN/LC_MESSAGES/util-linux.mo
-#file path=usr/share/locale/zh_TW/LC_MESSAGES/util-linux.mo
-file path=usr/share/man/man1/rename.1
-#file path=usr/share/man/man5/terminal-colors.d.5
diff --git a/components/text/text-utilities/Makefile b/components/text/text-utilities/Makefile
new file mode 100644
index 0000000..afb5787
--- /dev/null
+++ b/components/text/text-utilities/Makefile
@@ -0,0 +1,118 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, Michal Nowak
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME= text-utilities
+COMPONENT_MAJOR_VERSION=2.33
+COMPONENT_MINOR_VERSION=2
+COMPONENT_VERSION= $(COMPONENT_MAJOR_VERSION).$(COMPONENT_MINOR_VERSION)
+COMPONENT_SUMMARY= Various Linux utilities
+COMPONENT_FMRI= text/text-utilities
+COMPONENT_CLASSIFICATION=Applications/System Utilities
+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:631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97
+COMPONENT_ARCHIVE_URL= https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v$(COMPONENT_MAJOR_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_LICENSE_FILE= README.licensing
+COMPONENT_LICENSE= GPL-2.0-or-later, GPL-2.0, LGPL-2.1-or-later, BSD-3-Clause, BSD-4-Clause-UC, Public Domain
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+# We currently only want some of the text-utils text utilities from this
+# component, so enumerate it in a macro that we can use for build and install.
+# Anything else that we want should be added to this macro in the future.
+PROGRAMS = colcrt colrm column hexdump rename
+
+# Build a utility program used by one of the hexdump tests.
+PROGRAMS += test_sysinfo
+
+# We don't need the Python bindings built.
+CONFIGURE_OPTIONS = --prefix=/usr
+CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.32)
+CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)
+CONFIGURE_OPTIONS += --without-python
+
+# Always show the build and link lines for easier debugging.
+COMPONENT_BUILD_ARGS += V=1
+
+# Only build the programs that we want.
+COMPONENT_BUILD_ARGS += bin_PROGRAMS="$(PROGRAMS)"
+COMPONENT_BUILD_TARGETS = $(PROGRAMS)
+
+# Only install the bits we want.
+COMPONENT_INSTALL_ARGS += bin_PROGRAMS="$(PROGRAMS)"
+COMPONENT_INSTALL_TARGETS = install-man install-binPROGRAMS
+
+# Limit translations to the text utilities (and lib/* and include/* ) only.
+COMPONENT_PRE_INSTALL_ACTION = \
+ (cd $(@D)/po ; $(GMAKE) text-utilities.pot-update)
+
+# Install the message files.
+COMPONENT_POST_INSTALL_ACTION = \
+ (cd $(@D)/po ; $(GMAKE) $(COMPONENT_INSTALL_ARGS) install ;\
+ $(RM) -rf $(PROTOUSRLIBDIR64)/libsmartcols.so* ;\
+ $(MKDIR) $(PROTOUSRLIBDIR64) ;\
+ $(CP) -a $(@D)/.libs/libsmartcols.so* $(PROTOUSRLIBDIR64) ;\
+ $(STRIP) $(PROTOUSRLIBDIR64)/libsmartcols.so.1.1.0 ; )
+
+COMPONENT_TEST_ENV += TS_CMD_COLRM=$(PROTOUSRBINDIR)/colrm
+COMPONENT_TEST_ENV += TS_CMD_COLCRT=$(PROTOUSRBINDIR)/colcrt
+COMPONENT_TEST_ENV += TS_CMD_COLUMN=$(PROTOUSRBINDIR)/column
+COMPONENT_TEST_ENV += TS_CMD_HEXDUMP=$(PROTOUSRBINDIR)/hexdump
+COMPONENT_TEST_ENV += TS_CMD_RENAME=$(PROTOUSRBINDIR)/rename
+COMPONENT_TEST_ENV += PATH="$(PATH.gnu)"
+# Needed for the libsmartcols.so library
+COMPONENT_TEST_ENV += LD_LIBRARY_PATH=$(PROTOUSRLIBDIR64)
+COMPONENT_TEST_DIR = $(COMPONENT_SRC)/tests
+
+# The hexdump tests expect the test_sysinfo program in a different location
+# than where it's built.
+COMPONENT_PRE_TEST_ACTION = $(CP) $(@D)/test_sysinfo $(COMPONENT_SRC)/
+
+COMPONENT_TEST_CMD = ./run.sh
+COMPONENT_TEST_ARGS = --verbose --show-diff
+COMPONENT_TEST_TARGETS = colrm colcrt column hexdump rename
+
+# Remove date from diff
+COMPONENT_TEST_TRANSFORMS += \
+ '-e "s/ *20[12][0-9].*//"'
+
+TEST_TARGET= install $(TEST_64)
+
+build: $(BUILD_64)
+
+install: $(INSTALL_64)
+
+test: $(TEST_64)
+
+# Auto-generated dependencies
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += system/library
diff --git a/components/text/text-utilities/manifests/sample-manifest.p5m b/components/text/text-utilities/manifests/sample-manifest.p5m
new file mode 100644
index 0000000..c687027
--- /dev/null
+++ b/components/text/text-utilities/manifests/sample-manifest.p5m
@@ -0,0 +1,128 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2018 <contributor>
+#
+
+set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="$(COMPONENT_SUMMARY)"
+set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
+
+file path=usr/bin/colcrt
+file path=usr/bin/colrm
+file path=usr/bin/column
+file path=usr/bin/hexdump
+file path=usr/bin/rename
+file path=usr/bin/test_sysinfo
+link path=usr/lib/$(MACH64)/libsmartcols.so target=libsmartcols.so.1.1.0
+link path=usr/lib/$(MACH64)/libsmartcols.so.1 target=libsmartcols.so.1.1.0
+file path=usr/lib/$(MACH64)/libsmartcols.so.1.1.0
+file path=usr/share/locale/ca/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/cs/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/da/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/de/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/es/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/et/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/eu/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/fi/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/fr/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/gl/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/hr/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/hu/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/id/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/it/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/ja/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/nl/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/pl/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/ru/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/sl/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/sv/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/tr/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/uk/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/vi/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/text-utilities.mo
+file path=usr/share/man/man1/cal.1
+file path=usr/share/man/man1/chfn.1
+file path=usr/share/man/man1/chrt.1
+file path=usr/share/man/man1/chsh.1
+file path=usr/share/man/man1/col.1
+file path=usr/share/man/man1/colcrt.1
+file path=usr/share/man/man1/colrm.1
+file path=usr/share/man/man1/column.1
+file path=usr/share/man/man1/flock.1
+file path=usr/share/man/man1/getopt.1
+file path=usr/share/man/man1/hexdump.1
+file path=usr/share/man/man1/ipcmk.1
+file path=usr/share/man/man1/ipcrm.1
+file path=usr/share/man/man1/ipcs.1
+file path=usr/share/man/man1/last.1
+file path=usr/share/man/man1/lastb.1
+file path=usr/share/man/man1/logger.1
+file path=usr/share/man/man1/look.1
+file path=usr/share/man/man1/lslogins.1
+file path=usr/share/man/man1/mcookie.1
+file path=usr/share/man/man1/mesg.1
+file path=usr/share/man/man1/more.1
+file path=usr/share/man/man1/namei.1
+file path=usr/share/man/man1/rename.1
+file path=usr/share/man/man1/renice.1
+file path=usr/share/man/man1/rev.1
+file path=usr/share/man/man1/runuser.1
+file path=usr/share/man/man1/script.1
+file path=usr/share/man/man1/scriptreplay.1
+file path=usr/share/man/man1/setsid.1
+file path=usr/share/man/man1/su.1
+file path=usr/share/man/man1/ul.1
+file path=usr/share/man/man1/utmpdump.1
+file path=usr/share/man/man1/uuidgen.1
+file path=usr/share/man/man1/uuidparse.1
+file path=usr/share/man/man1/wall.1
+file path=usr/share/man/man1/whereis.1
+file path=usr/share/man/man3/libblkid.3
+file path=usr/share/man/man3/uuid.3
+file path=usr/share/man/man3/uuid_clear.3
+file path=usr/share/man/man3/uuid_compare.3
+file path=usr/share/man/man3/uuid_copy.3
+file path=usr/share/man/man3/uuid_generate.3
+file path=usr/share/man/man3/uuid_generate_random.3
+file path=usr/share/man/man3/uuid_generate_time.3
+file path=usr/share/man/man3/uuid_generate_time_safe.3
+file path=usr/share/man/man3/uuid_is_null.3
+file path=usr/share/man/man3/uuid_parse.3
+file path=usr/share/man/man3/uuid_time.3
+file path=usr/share/man/man3/uuid_unparse.3
+file path=usr/share/man/man5/terminal-colors.d.5
+file path=usr/share/man/man8/agetty.8
+file path=usr/share/man/man8/blkid.8
+file path=usr/share/man/man8/fdisk.8
+file path=usr/share/man/man8/findfs.8
+file path=usr/share/man/man8/fsck.cramfs.8
+file path=usr/share/man/man8/fsck.minix.8
+file path=usr/share/man/man8/isosize.8
+file path=usr/share/man/man8/mkfs.8
+file path=usr/share/man/man8/mkfs.bfs.8
+file path=usr/share/man/man8/mkfs.cramfs.8
+file path=usr/share/man/man8/mkfs.minix.8
+file path=usr/share/man/man8/mkswap.8
+file path=usr/share/man/man8/nologin.8
+file path=usr/share/man/man8/sfdisk.8
+file path=usr/share/man/man8/sulogin.8
+file path=usr/share/man/man8/swaplabel.8
+file path=usr/share/man/man8/uuidd.8
+file path=usr/share/man/man8/wipefs.8
diff --git a/components/text/text-utilities/patches/build.patch b/components/text/text-utilities/patches/build.patch
new file mode 100644
index 0000000..4820940
--- /dev/null
+++ b/components/text/text-utilities/patches/build.patch
@@ -0,0 +1,22 @@
+--- util-linux-2.33.2/Makefile.in 2019-04-09 15:02:11.266936132 +0000
++++ util-linux-2.33.2/Makefile.in.new 2019-05-16 08:52:01.147843878 +0000
+@@ -279,9 +279,7 @@ check_PROGRAMS = test_blkdev$(EXEEXT) te
+ @BUILD_LIBMOUNT_TRUE@am__append_54 = libmount/mount.pc
+ @BUILD_LIBMOUNT_TRUE@am__append_55 = libmount/mount.pc
+ @BUILD_LIBSMARTCOLS_TRUE@am__append_56 = libsmartcols.la
+-@BUILD_LIBSMARTCOLS_TRUE@@HAVE_VSCRIPT_TRUE@am__append_57 = $(VSCRIPT_LDFLAGS),$(top_srcdir)/libsmartcols/src/libsmartcols.sym
+ @BUILD_LIBSMARTCOLS_TRUE@am__append_58 = \
+-@BUILD_LIBSMARTCOLS_TRUE@ libsmartcols/src/libsmartcols.sym \
+ @BUILD_LIBSMARTCOLS_TRUE@ libsmartcols/COPYING
+ @BUILD_LIBSMARTCOLS_TRUE@am__append_59 = install-exec-hook-libsmartcols
+ @BUILD_LIBSMARTCOLS_TRUE@am__append_60 = uninstall-hook-libsmartcols
+@@ -4818,9 +4816,6 @@ test_pwdutils_CFLAGS = $(AM_CFLAGS) -DTE
+ @BUILD_LIBSMARTCOLS_TRUE@ -I$(ul_libsmartcols_incdir) \
+ @BUILD_LIBSMARTCOLS_TRUE@ -I$(top_srcdir)/libsmartcols/src
+
+-@BUILD_LIBSMARTCOLS_TRUE@EXTRA_libsmartcols_la_DEPENDENCIES = \
+-@BUILD_LIBSMARTCOLS_TRUE@ libsmartcols/src/libsmartcols.sym
+-
+ @BUILD_LIBSMARTCOLS_TRUE@libsmartcols_la_LDFLAGS = $(SOLIB_LDFLAGS) \
+ @BUILD_LIBSMARTCOLS_TRUE@ $(am__append_57) -version-info \
+ @BUILD_LIBSMARTCOLS_TRUE@ $(LIBSMARTCOLS_VERSION_INFO)
diff --git a/components/text/text-utilities/patches/localization-changes.patch b/components/text/text-utilities/patches/localization-changes.patch
new file mode 100644
index 0000000..88849dd
--- /dev/null
+++ b/components/text/text-utilities/patches/localization-changes.patch
@@ -0,0 +1,348 @@
+Limit translations to the text utilities (and lib/* and include/* ) only.
+Set the message domain to text-utilities.
+
+These changes will not be submitted upstream.
+
+--- util-linux-2.33.2/po/POTFILES.in 2019-04-09 15:02:03.543017224 +0000
++++ util-linux-2.33.2/po/POTFILES.in.new 2019-05-16 08:40:25.696604939 +0000
+@@ -1,30 +1,3 @@
+-disk-utils/addpart.c
+-disk-utils/blockdev.c
+-disk-utils/cfdisk.c
+-disk-utils/cramfs_common.c
+-disk-utils/cramfs.h
+-disk-utils/delpart.c
+-disk-utils/fdformat.c
+-disk-utils/fdisk.c
+-disk-utils/fdisk.h
+-disk-utils/fdisk-list.c
+-disk-utils/fdisk-list.h
+-disk-utils/fdisk-menu.c
+-disk-utils/fsck.c
+-disk-utils/fsck.cramfs.c
+-disk-utils/fsck.minix.c
+-disk-utils/isosize.c
+-disk-utils/minix_programs.h
+-disk-utils/mkfs.bfs.c
+-disk-utils/mkfs.c
+-disk-utils/mkfs.cramfs.c
+-disk-utils/mkfs.minix.c
+-disk-utils/mkswap.c
+-disk-utils/partx.c
+-disk-utils/raw.c
+-disk-utils/resizepart.c
+-disk-utils/sfdisk.c
+-disk-utils/swaplabel.c
+ include/all-io.h
+ include/bitops.h
+ include/blkdev.h
+@@ -88,104 +61,6 @@ include/ttyutils.h
+ include/widechar.h
+ include/xalloc.h
+ lib/blkdev.c
+-libblkid/src/blkidP.h
+-libblkid/src/cache.c
+-libblkid/src/config.c
+-libblkid/src/dev.c
+-libblkid/src/devname.c
+-libblkid/src/devno.c
+-libblkid/src/encode.c
+-libblkid/src/evaluate.c
+-libblkid/src/getsize.c
+-libblkid/src/init.c
+-libblkid/src/llseek.c
+-libblkid/src/partitions/aix.c
+-libblkid/src/partitions/aix.h
+-libblkid/src/partitions/atari.c
+-libblkid/src/partitions/bsd.c
+-libblkid/src/partitions/dos.c
+-libblkid/src/partitions/gpt.c
+-libblkid/src/partitions/mac.c
+-libblkid/src/partitions/minix.c
+-libblkid/src/partitions/partitions.c
+-libblkid/src/partitions/partitions.h
+-libblkid/src/partitions/sgi.c
+-libblkid/src/partitions/solaris_x86.c
+-libblkid/src/partitions/sun.c
+-libblkid/src/partitions/ultrix.c
+-libblkid/src/partitions/unixware.c
+-libblkid/src/probe.c
+-libblkid/src/read.c
+-libblkid/src/resolve.c
+-libblkid/src/save.c
+-libblkid/src/superblocks/adaptec_raid.c
+-libblkid/src/superblocks/apfs.c
+-libblkid/src/superblocks/bcache.c
+-libblkid/src/superblocks/befs.c
+-libblkid/src/superblocks/bfs.c
+-libblkid/src/superblocks/bitlocker.c
+-libblkid/src/superblocks/btrfs.c
+-libblkid/src/superblocks/cramfs.c
+-libblkid/src/superblocks/ddf_raid.c
+-libblkid/src/superblocks/drbd.c
+-libblkid/src/superblocks/drbdmanage.c
+-libblkid/src/superblocks/drbdproxy_datalog.c
+-libblkid/src/superblocks/exfat.c
+-libblkid/src/superblocks/exfs.c
+-libblkid/src/superblocks/ext.c
+-libblkid/src/superblocks/f2fs.c
+-libblkid/src/superblocks/gfs.c
+-libblkid/src/superblocks/hfs.c
+-libblkid/src/superblocks/highpoint_raid.c
+-libblkid/src/superblocks/hpfs.c
+-libblkid/src/superblocks/iso9660.c
+-libblkid/src/superblocks/isw_raid.c
+-libblkid/src/superblocks/jfs.c
+-libblkid/src/superblocks/jmicron_raid.c
+-libblkid/src/superblocks/linux_raid.c
+-libblkid/src/superblocks/lsi_raid.c
+-libblkid/src/superblocks/luks.c
+-libblkid/src/superblocks/lvm.c
+-libblkid/src/superblocks/minix.c
+-libblkid/src/superblocks/mpool.c
+-libblkid/src/superblocks/netware.c
+-libblkid/src/superblocks/nilfs.c
+-libblkid/src/superblocks/ntfs.c
+-libblkid/src/superblocks/nvidia_raid.c
+-libblkid/src/superblocks/ocfs.c
+-libblkid/src/superblocks/promise_raid.c
+-libblkid/src/superblocks/refs.c
+-libblkid/src/superblocks/reiserfs.c
+-libblkid/src/superblocks/romfs.c
+-libblkid/src/superblocks/silicon_raid.c
+-libblkid/src/superblocks/squashfs.c
+-libblkid/src/superblocks/stratis.c
+-libblkid/src/superblocks/superblocks.c
+-libblkid/src/superblocks/superblocks.h
+-libblkid/src/superblocks/swap.c
+-libblkid/src/superblocks/sysv.c
+-libblkid/src/superblocks/ubi.c
+-libblkid/src/superblocks/ubifs.c
+-libblkid/src/superblocks/udf.c
+-libblkid/src/superblocks/ufs.c
+-libblkid/src/superblocks/vdo.c
+-libblkid/src/superblocks/vfat.c
+-libblkid/src/superblocks/via_raid.c
+-libblkid/src/superblocks/vmfs.c
+-libblkid/src/superblocks/vxfs.c
+-libblkid/src/superblocks/xfs.c
+-libblkid/src/superblocks/zfs.c
+-libblkid/src/tag.c
+-libblkid/src/topology/dm.c
+-libblkid/src/topology/evms.c
+-libblkid/src/topology/ioctl.c
+-libblkid/src/topology/lvm.c
+-libblkid/src/topology/md.c
+-libblkid/src/topology/sysfs.c
+-libblkid/src/topology/topology.c
+-libblkid/src/topology/topology.h
+-libblkid/src/verify.c
+-libblkid/src/version.c
+ lib/canonicalize.c
+ lib/color-names.c
+ lib/colors.c
+@@ -194,28 +69,6 @@ lib/crc32.c
+ lib/crc32c.c
+ lib/env.c
+ lib/exec_shell.c
+-libfdisk/src/alignment.c
+-libfdisk/src/ask.c
+-libfdisk/src/bsd.c
+-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
+-libfdisk/src/parttype.c
+-libfdisk/src/script.c
+-libfdisk/src/sgi.c
+-libfdisk/src/sun.c
+-libfdisk/src/table.c
+-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
+@@ -228,32 +81,6 @@ lib/mbsalign.c
+ lib/mbsedit.c
+ lib/md5.c
+ lib/monotonic.c
+-libmount/python/context.c
+-libmount/python/fs.c
+-libmount/python/pylibmount.c
+-libmount/python/pylibmount.h
+-libmount/python/tab.c
+-libmount/src/btrfs.c
+-libmount/src/cache.c
+-libmount/src/context.c
+-libmount/src/context_loopdev.c
+-libmount/src/context_mount.c
+-libmount/src/context_umount.c
+-libmount/src/fs.c
+-libmount/src/init.c
+-libmount/src/iter.c
+-libmount/src/lock.c
+-libmount/src/monitor.c
+-libmount/src/mountP.h
+-libmount/src/optmap.c
+-libmount/src/optstr.c
+-libmount/src/tab.c
+-libmount/src/tab_diff.c
+-libmount/src/tab_parse.c
+-libmount/src/tab_update.c
+-libmount/src/test.c
+-libmount/src/utils.c
+-libmount/src/version.c
+ lib/pager.c
+ lib/path.c
+ lib/plymouth-ctrl.c
+@@ -280,131 +107,7 @@ lib/sysfs.c
+ lib/timer.c
+ lib/timeutils.c
+ lib/ttyutils.c
+-libuuid/src/clear.c
+-libuuid/src/compare.c
+-libuuid/src/copy.c
+-libuuid/src/gen_uuid.c
+-libuuid/src/isnull.c
+-libuuid/src/pack.c
+-libuuid/src/parse.c
+-libuuid/src/predefined.c
+-libuuid/src/test_uuid.c
+-libuuid/src/unpack.c
+-libuuid/src/unparse.c
+-libuuid/src/uuidd.h
+-libuuid/src/uuid.h
+-libuuid/src/uuidP.h
+-libuuid/src/uuid_time.c
+-login-utils/auth.c
+-login-utils/auth.h
+-login-utils/ch-common.c
+-login-utils/ch-common.h
+-login-utils/chfn.c
+-login-utils/chsh.c
+-login-utils/islocal.c
+-login-utils/islocal.h
+-login-utils/last.c
+-login-utils/libuser.c
+-login-utils/libuser.h
+-login-utils/login.c
+-login-utils/logindefs.c
+-login-utils/logindefs.h
+-login-utils/lslogins.c
+-login-utils/newgrp.c
+-login-utils/nologin.c
+-login-utils/runuser.c
+-login-utils/selinux_utils.c
+-login-utils/selinux_utils.h
+-login-utils/setpwnam.c
+-login-utils/setpwnam.h
+-login-utils/su.c
+-login-utils/su-common.c
+-login-utils/su-common.h
+-login-utils/sulogin.c
+-login-utils/sulogin-consoles.c
+-login-utils/sulogin-consoles.h
+-login-utils/utmpdump.c
+-login-utils/vipw.c
+-misc-utils/blkid.c
+-misc-utils/cal.c
+-misc-utils/fincore.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
+-misc-utils/look.c
+-misc-utils/lsblk.c
+-misc-utils/lsblk.h
+-misc-utils/lsblk-mnt.c
+-misc-utils/lsblk-properties.c
+-misc-utils/lslocks.c
+-misc-utils/mcookie.c
+-misc-utils/namei.c
+ misc-utils/rename.c
+-misc-utils/test_uuidd.c
+-misc-utils/uuidd.c
+-misc-utils/uuidgen.c
+-misc-utils/uuidparse.c
+-misc-utils/whereis.c
+-misc-utils/wipefs.c
+-schedutils/chrt.c
+-schedutils/ionice.c
+-schedutils/taskset.c
+-sys-utils/blkdiscard.c
+-sys-utils/blkzone.c
+-sys-utils/chcpu.c
+-sys-utils/chmem.c
+-sys-utils/choom.c
+-sys-utils/ctrlaltdel.c
+-sys-utils/dmesg.c
+-sys-utils/eject.c
+-sys-utils/fallocate.c
+-sys-utils/flock.c
+-sys-utils/fsfreeze.c
+-sys-utils/fstrim.c
+-sys-utils/hwclock.c
+-sys-utils/hwclock-cmos.c
+-sys-utils/hwclock.h
+-sys-utils/hwclock-rtc.c
+-sys-utils/ipcmk.c
+-sys-utils/ipcrm.c
+-sys-utils/ipcs.c
+-sys-utils/ipcutils.c
+-sys-utils/ipcutils.h
+-sys-utils/ldattach.c
+-sys-utils/losetup.c
+-sys-utils/lscpu-arm.c
+-sys-utils/lscpu.c
+-sys-utils/lscpu-dmi.c
+-sys-utils/lscpu.h
+-sys-utils/lsipc.c
+-sys-utils/lsmem.c
+-sys-utils/lsns.c
+-sys-utils/mount.c
+-sys-utils/mountpoint.c
+-sys-utils/nsenter.c
+-sys-utils/pivot_root.c
+-sys-utils/prlimit.c
+-sys-utils/readprofile.c
+-sys-utils/renice.c
+-sys-utils/rfkill.c
+-sys-utils/rtcwake.c
+-sys-utils/setarch.c
+-sys-utils/setpriv.c
+-sys-utils/setsid.c
+-sys-utils/swapoff.c
+-sys-utils/swapon.c
+-sys-utils/swapon-common.c
+-sys-utils/swapon-common.h
+-sys-utils/switch_root.c
+-sys-utils/tunelp.c
+-sys-utils/umount.c
+-sys-utils/unshare.c
+-sys-utils/wdctl.c
+-sys-utils/zramctl.c
+ term-utils/agetty.c
+ term-utils/mesg.c
+ term-utils/script.c
+--- util-linux-2.33.2/configure 2019-04-09 15:02:09.715952416 +0000
++++ util-linux-2.33.2/configure.new 2019-05-16 08:42:10.403956353 +0000
+@@ -5064,7 +5064,7 @@ fi
+
+
+ # Define the identity of the package.
+- PACKAGE='util-linux'
++ PACKAGE='text-utilities'
+ VERSION='2.33.2'
+
+
diff --git a/components/text/text-utilities/patches/ttyutils.h.patch b/components/text/text-utilities/patches/ttyutils.h.patch
new file mode 100644
index 0000000..51b6011
--- /dev/null
+++ b/components/text/text-utilities/patches/ttyutils.h.patch
@@ -0,0 +1,36 @@
+Changes needed to get column to build on Solaris
+
+These changes will be sent upstream.
+
+--- util-linux-2.25.2/include/ttyutils.h.orig 2015-02-16 18:20:41.448705202 -0800
++++ util-linux-2.25.2/include/ttyutils.h 2015-02-16 18:21:05.533124857 -0800
+@@ -57,6 +57,29 @@
+ #define UL_TTY_KEEPCFLAGS (1 << 1)
+ #define UL_TTY_UTF8 (1 << 2)
+
++/* These are not defined in Solaris. Taken from tmux compat/ttydefaults.h */
++#ifndef OXTABS
++#define OXTABS 0
++#endif
++#ifndef TTYDEF_IFLAG
++#define TTYDEF_IFLAG (BRKINT | ICRNL | IMAXBEL | IXON | IXANY)
++#endif
++#ifndef TTYDEF_OFLAG
++#define TTYDEF_OFLAG (OPOST | ONLCR | OXTABS)
++#endif
++#ifndef TTYDEF_LFLAG
++#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
++#endif
++#ifndef TTYDEF_CFLAG
++#define TTYDEF_CFLAG (CREAD | CS8 | HUPCL)
++#endif
++#ifndef CREPRINT
++#define CREPRINT CTRL('r')
++#endif
++#ifndef CDISCARD
++#define CDISCARD CTRL('o')
++#endif
++
+ static inline void reset_virtual_console(struct termios *tp, int flags)
+ {
+ /* Use defaults of <sys/ttydefaults.h> for base settings */
diff --git a/components/text/text-utilities/test/results-64.master b/components/text/text-utilities/test/results-64.master
new file mode 100644
index 0000000..8e7c254
--- /dev/null
+++ b/components/text/text-utilities/test/results-64.master
@@ -0,0 +1,325 @@
+
+-------------------- util-linux regression tests --------------------
+
+ For development purpose only.
+ Don't execute on production system!
+
+ kernel: 5.11
+
+
+ script: $(SOURCE_DIR)/tests/ts/colcrt/functional
+ sub dir: $(SOURCE_DIR)/tests/ts/colcrt
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/colcrt
+ test name: functional
+ test desc: functional
+ component: colcrt
+ namespace: colcrt/functional
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/colcrt/functional
+ valgrind: $(SOURCE_DIR)/tests/output/colcrt/functional.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/colcrt/functional
+ mountpoint: $(SOURCE_DIR)/tests/output/colcrt/functional-mnt
+
+ colcrt: functional ...
+ : no-options ... OK
+ : no-underlining ... OK
+ : half-lines ... OK
+ : short-options ... OK
+ ... OK (all 4 sub-tests PASSED)
+
+ script: $(SOURCE_DIR)/tests/ts/colcrt/regressions
+ sub dir: $(SOURCE_DIR)/tests/ts/colcrt
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/colcrt
+ test name: regressions
+ test desc: regressions
+ component: colcrt
+ namespace: colcrt/regressions
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/colcrt/regressions
+ valgrind: $(SOURCE_DIR)/tests/output/colcrt/regressions.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/colcrt/regressions
+ mountpoint: $(SOURCE_DIR)/tests/output/colcrt/regressions-mnt
+
+ colcrt: regressions ...
+ : crash1 ...
+diff-{{{
+--- $(SOURCE_DIR)/tests/expected/colcrt/regressions-crash1
++++ $(SOURCE_DIR)/tests/output/colcrt/regressions-crash1
+@@ -1,2 +1,2 @@
+- W U; U; D f U; D f D f > @W ]~ K- - ---- -- -- - -- -- ---- -- ---- -- - -- --- --
++ W U; U; D f U; D f D f > @W ]~ K ~- - ---- -- -- - -- -- ---- -- ---- -- - -- --- --
+ return value: 0
+}}}-diff
+
+ FAILED (colcrt/regressions-crash1)
+ : crash2 ... OK
+ : hang1 ... OK
+ ... FAILED (1 from 3 sub-tests)
+
+ script: $(SOURCE_DIR)/tests/ts/colrm/rm2-2
+ sub dir: $(SOURCE_DIR)/tests/ts/colrm
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/colrm
+ test name: rm2-2
+ test desc: basic check
+ component: colrm
+ namespace: colrm/rm2-2
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/colrm/rm2-2
+ valgrind: $(SOURCE_DIR)/tests/output/colrm/rm2-2.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/colrm/rm2-2
+ mountpoint: $(SOURCE_DIR)/tests/output/colrm/rm2-2-mnt
+
+ colrm: basic check ... OK
+
+ script: $(SOURCE_DIR)/tests/ts/column/columnate
+ sub dir: $(SOURCE_DIR)/tests/ts/column
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/column
+ test name: columnate
+ test desc: columnate
+ component: column
+ namespace: column/columnate
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/column/columnate
+ valgrind: $(SOURCE_DIR)/tests/output/column/columnate.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/column/columnate
+ mountpoint: $(SOURCE_DIR)/tests/output/column/columnate-mnt
+
+ column: columnate ...
+ : fill-cols-80 ... OK
+ : fill-cols-50 ... OK
+ : fill-cols-250 ... OK
+ : fill-rows-80 ... OK
+ : fill-rows-50 ... OK
+ : fill-rows-250 ... OK
+ ... OK (all 6 sub-tests PASSED)
+
+ script: $(SOURCE_DIR)/tests/ts/column/invalid-multibyte
+ sub dir: $(SOURCE_DIR)/tests/ts/column
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/column
+ test name: invalid-multibyte
+ test desc: invalid multibyte
+ component: column
+ namespace: column/invalid-multibyte
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/column/invalid-multibyte
+ valgrind: $(SOURCE_DIR)/tests/output/column/invalid-multibyte.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/column/invalid-multibyte
+ mountpoint: $(SOURCE_DIR)/tests/output/column/invalid-multibyte-mnt
+
+ column: invalid multibyte ...
+diff-{{{
+--- $(SOURCE_DIR)/tests/expected/column/invalid-multibyte
++++ $(SOURCE_DIR)/tests/output/column/invalid-multibyte
+@@ -1 +1 @@
+-\xa3
++�
+}}}-diff
+
+ FAILED (column/invalid-multibyte)
+
+ script: $(SOURCE_DIR)/tests/ts/column/multi-file
+ sub dir: $(SOURCE_DIR)/tests/ts/column
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/column
+ test name: multi-file
+ test desc: multiple files
+ component: column
+ namespace: column/multi-file
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/column/multi-file
+ valgrind: $(SOURCE_DIR)/tests/output/column/multi-file.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/column/multi-file
+ mountpoint: $(SOURCE_DIR)/tests/output/column/multi-file-mnt
+
+ column: multiple files ... OK
+
+ script: $(SOURCE_DIR)/tests/ts/column/table
+ sub dir: $(SOURCE_DIR)/tests/ts/column
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/column
+ test name: table
+ test desc: table
+ component: column
+ namespace: column/table
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/column/table
+ valgrind: $(SOURCE_DIR)/tests/output/column/table.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/column/table
+ mountpoint: $(SOURCE_DIR)/tests/output/column/table-mnt
+
+ column: table ...
+ : default ... OK
+ : output-separator ... OK
+ : input-separator ... OK
+ : input-separator-space ... OK
+ : empty-lines ... OK
+ : noempty-lines ... OK
+ : long ... OK
+ : hide ... OK
+ : headers ... OK
+ : truncate ... OK
+ : right ... OK
+ : wrap ... OK
+ : order ... OK
+ : tree ... OK
+ : empty-column ... OK
+ ... OK (all 15 sub-tests PASSED)
+
+ script: $(SOURCE_DIR)/tests/ts/hexdump/format-strings
+ sub dir: $(SOURCE_DIR)/tests/ts/hexdump
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/hexdump
+ test name: format-strings
+ test desc: format-strings
+ component: hexdump
+ namespace: hexdump/format-strings
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/hexdump/format-strings
+ valgrind: $(SOURCE_DIR)/tests/output/hexdump/format-strings.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/hexdump/format-strings
+ mountpoint: $(SOURCE_DIR)/tests/output/hexdump/format-strings-mnt
+
+ hexdump: format-strings ...
+ : empty-format ... OK
+ : 1b_octal ... OK
+ : 1b_char ... OK
+ : canon ... OK
+ : 2b_dec ... OK
+ : 2b_octal ... OK
+ : 2b_hex ... OK
+ ... OK (all 7 sub-tests PASSED)
+
+ script: $(SOURCE_DIR)/tests/ts/hexdump/highlighting
+ sub dir: $(SOURCE_DIR)/tests/ts/hexdump
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/hexdump
+ test name: highlighting
+ test desc: highlighting
+ component: hexdump
+ namespace: hexdump/highlighting
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/hexdump/highlighting
+ valgrind: $(SOURCE_DIR)/tests/output/hexdump/highlighting.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/hexdump/highlighting
+ mountpoint: $(SOURCE_DIR)/tests/output/hexdump/highlighting-mnt
+
+ hexdump: highlighting ...
+ : 1b_octal-1 ... OK
+ : 1b_octal-2 ... OK
+ : 1b_octal-3 ... OK
+ : 1b_octal-4 ... OK
+ : 1b_octal-5 ... OK
+ : 1b_octal-6 ... OK
+ : 1b_octal-7 ... OK
+ : 1b_octal-8 ... OK
+ : 1b_octal-9 ... OK
+ : 1b_char-1 ... OK
+ : 1b_char-2 ... OK
+ : 1b_char-3 ... OK
+ : canon-1 ... OK
+ : canon-2 ... OK
+ : 2b_dec-1 ... OK
+ : 2b_dec-2 ... OK
+ : 2b_dec-3 ... OK
+ : 2b_dec-4 ... OK
+ : 2b_dec-5 ... OK
+ : 2b_dec-6 ... OK
+ : 2b_dec-7 ... OK
+ : 2b_dec-8 ... OK
+ : 4b_dec-1 ... OK
+ : 4b_dec-2 ... OK
+ : 4b_dec-3 ... OK
+ : 4b_dec-4 ... OK
+ : 4b_dec-5 ... OK
+ : 4b_dec-6 ... OK
+ : 4b_dec-7 ... OK
+ ... OK (all 29 sub-tests PASSED)
+
+ script: $(SOURCE_DIR)/tests/ts/rename/basic
+ sub dir: $(SOURCE_DIR)/tests/ts/rename
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/rename
+ test name: basic
+ test desc: basic check
+ component: rename
+ namespace: rename/basic
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/rename/basic
+ valgrind: $(SOURCE_DIR)/tests/output/rename/basic.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/rename/basic
+ mountpoint: $(SOURCE_DIR)/tests/output/rename/basic-mnt
+
+ rename: basic check ... OK
+
+ script: $(SOURCE_DIR)/tests/ts/rename/exit_codes
+ sub dir: $(SOURCE_DIR)/tests/ts/rename
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/rename
+ test name: exit_codes
+ test desc: exit codes
+ component: rename
+ namespace: rename/exit_codes
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/rename/exit_codes
+ valgrind: $(SOURCE_DIR)/tests/output/rename/exit_codes.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/rename/exit_codes
+ mountpoint: $(SOURCE_DIR)/tests/output/rename/exit_codes-mnt
+
+ rename: exit codes ... OK
+
+ script: $(SOURCE_DIR)/tests/ts/rename/overwrite
+ sub dir: $(SOURCE_DIR)/tests/ts/rename
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/rename
+ test name: overwrite
+ test desc: overwrite
+ component: rename
+ namespace: rename/overwrite
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/rename/overwrite
+ valgrind: $(SOURCE_DIR)/tests/output/rename/overwrite.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/rename/overwrite
+ mountpoint: $(SOURCE_DIR)/tests/output/rename/overwrite-mnt
+
+ rename: overwrite ... OK
+
+ script: $(SOURCE_DIR)/tests/ts/rename/subdir
+ sub dir: $(SOURCE_DIR)/tests/ts/rename
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/rename
+ test name: subdir
+ test desc: subdir check
+ component: rename
+ namespace: rename/subdir
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/rename/subdir
+ valgrind: $(SOURCE_DIR)/tests/output/rename/subdir.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/rename/subdir
+ mountpoint: $(SOURCE_DIR)/tests/output/rename/subdir-mnt
+
+ rename: subdir check ... OK
+
+ script: $(SOURCE_DIR)/tests/ts/rename/symlink
+ sub dir: $(SOURCE_DIR)/tests/ts/rename
+ top dir: $(SOURCE_DIR)/tests
+ self: $(SOURCE_DIR)/tests/ts/rename
+ test name: symlink
+ test desc: symlink check
+ component: rename
+ namespace: rename/symlink
+ verbose: yes
+ output: $(SOURCE_DIR)/tests/output/rename/symlink
+ valgrind: $(SOURCE_DIR)/tests/output/rename/symlink.vgdump
+ expected: $(SOURCE_DIR)/tests/expected/rename/symlink
+ mountpoint: $(SOURCE_DIR)/tests/output/rename/symlink-mnt
+
+ rename: symlink check ... OK
+
+---------------------------------------------------------------------
+ 2 tests of 14 FAILED
+---------------------------------------------------------------------
diff --git a/components/text/text-utilities/text-utilities.license b/components/text/text-utilities/text-utilities.license
new file mode 100644
index 0000000..ebfbdd9
--- /dev/null
+++ b/components/text/text-utilities/text-utilities.license
@@ -0,0 +1,30 @@
+Copyright (c) 1980, 1989, 1990, 1993, 1994
+ The Regents of the University of California. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by the University of
+ California, Berkeley and its contributors.
+4. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/components/text/text-utilities/text-utilities.p5m b/components/text/text-utilities/text-utilities.p5m
new file mode 100644
index 0000000..d749997
--- /dev/null
+++ b/components/text/text-utilities/text-utilities.p5m
@@ -0,0 +1,73 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, Michal Nowak
+#
+
+set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="$(COMPONENT_SUMMARY)"
+set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
+
+file path=usr/bin/colcrt
+file path=usr/bin/colrm
+file path=usr/bin/column
+file path=usr/bin/hexdump
+file path=usr/bin/rename
+#file path=usr/bin/test_sysinfo
+link path=usr/lib/$(MACH64)/libsmartcols.so target=libsmartcols.so.1.1.0
+link path=usr/lib/$(MACH64)/libsmartcols.so.1 target=libsmartcols.so.1.1.0
+file path=usr/lib/$(MACH64)/libsmartcols.so.1.1.0
+file path=usr/share/locale/ca/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/cs/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/da/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/de/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/es/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/et/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/eu/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/fi/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/fr/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/gl/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/hr/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/hu/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/id/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/it/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/ja/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/nl/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/pl/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/ru/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/sl/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/sv/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/tr/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/uk/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/vi/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/text-utilities.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/text-utilities.mo
+file path=usr/share/man/man1/colcrt.1
+file path=usr/share/man/man1/colrm.1
+file path=usr/share/man/man1/column.1
+file path=usr/share/man/man1/hexdump.1
+file path=usr/share/man/man1/rename.1
--
Gitblit v1.9.3