# HG changeset patch # User Rich Burridge # Date 1412344164 25200 # Node ID bf833e1aa881ea83962558329952123d19349ff1 # Parent ea2364416471a20f9948e9ad1137269df16fbd89 PSARC 2014/170 text-utilities version 2.24.2 18307792 request for "column" utility in Userland diff -r ea2364416471 -r bf833e1aa881 components/text-utilities/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/Makefile Fri Oct 03 06:49:24 2014 -0700 @@ -0,0 +1,102 @@ +# +# 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, Oracle and/or its affiliates. All rights reserved. +# +include ../../make-rules/shared-macros.mk + +COMPONENT_NAME= text-utilities +COMPONENT_VERSION= 2.24.2 +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:1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 +COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/v2.24/$(COMPONENT_ARCHIVE) +COMPONENT_BUGDB= utility/text-utilities + +TPNO= 17825 + +include ../../make-rules/prep.mk +include ../../make-rules/configure.mk +include ../../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 rev tailf + +# Limit translations to the text utilities (and lib/* and include/* ) only. +COMPONENT_PRE_INSTALL_ACTION = \ + (cd $(@D)/po ; $(GMAKE) text-utilities.pot-update) + +CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" +CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.32) + +# Makefile incorrectly includes gcc(1) '-fsigned-char' in AM_CFLAGS, so we +# override it. +COMPONENT_BUILD_ARGS += AM_CFLAGS="" + +# 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 + +# Install the message files. +COMPONENT_POST_INSTALL_ACTION = \ + (cd $(@D)/po ; $(GMAKE) $(COMPONENT_INSTALL_ARGS) install) + +ASLR_MODE = $(ASLR_ENABLE) + +COMPONENT_TEST_ENV += TS_CMD_COLRM=$(PROTO_DIR)/usr/bin/colrm +COMPONENT_TEST_ENV += TS_CMD_COLUMN=$(PROTO_DIR)/usr/bin/column +COMPONENT_TEST_ENV += TS_CMD_HEXDUMP=$(PROTO_DIR)/usr/bin/hexdump +COMPONENT_TEST_ENV += TS_CMD_TAILF=$(PROTO_DIR)/usr/bin/tailf +COMPONENT_TEST_ENV += PATH="$(GNUBIN):$(PATH)" +COMPONENT_TEST_DIR = $(COMPONENT_SRC)/tests + +# The given hexdump tests are little-endian specific, so the test script +# has been adjusted to do some endian-neutral ones. Copy the input and +# the expected results to where they are needed. +COMPONENT_PRE_TEST_ACTION = ( \ + $(CP) $(COMPONENT_DIR)/files/hexdump-input \ + $(COMPONENT_SRC)/tests/ts/hexdump/; \ + $(CP) $(COMPONENT_DIR)/files/hexdump-expected \ + $(COMPONENT_SRC)/tests/expected/hexdump/empty-format; ) + +# common targets +build: $(BUILD_64) + +install: $(INSTALL_64) + +test: install + $(COMPONENT_PRE_TEST_ACTION) + (cd $(COMPONENT_TEST_DIR) ; $(ENV) $(COMPONENT_TEST_ENV) \ + ./run.sh --verbose colrm column hexdump tailf) + +BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + +include ../../make-rules/depend.mk diff -r ea2364416471 -r bf833e1aa881 components/text-utilities/files/hexdump-expected --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/files/hexdump-expected Fri Oct 03 06:49:24 2014 -0700 @@ -0,0 +1,123 @@ +0000000 000 040 001 040 002 040 003 040 004 040 005 040 006 040 007 040 +0000010 010 040 011 040 012 040 013 040 014 040 015 040 016 040 017 040 +0000020 020 040 021 040 022 040 023 040 024 040 025 040 026 040 027 040 +0000030 030 040 031 040 032 040 033 040 034 040 035 040 036 040 037 040 +0000040 040 040 041 040 042 040 043 040 044 040 045 040 046 040 047 040 +0000050 050 040 051 040 052 040 053 040 054 040 055 040 056 040 057 040 +0000060 060 040 061 040 062 040 063 040 064 040 065 040 066 040 067 040 +0000070 070 040 071 040 072 040 073 040 074 040 075 040 076 040 077 040 +0000080 100 040 101 040 102 040 103 040 104 040 105 040 106 040 107 040 +0000090 110 040 111 040 112 040 113 040 114 040 115 040 116 040 117 040 +00000a0 120 040 121 040 122 040 123 040 124 040 125 040 126 040 127 040 +00000b0 130 040 131 040 132 040 133 040 134 040 135 040 136 040 137 040 +00000c0 140 040 141 040 142 040 143 040 144 040 145 040 146 040 147 040 +00000d0 150 040 151 040 152 040 153 040 154 040 155 040 156 040 157 040 +00000e0 160 040 161 040 162 040 163 040 164 040 165 040 166 040 167 040 +00000f0 170 040 171 040 172 040 173 040 174 040 175 040 176 040 177 040 +0000100 302 200 040 302 201 040 302 202 040 302 203 040 302 204 040 302 +0000110 205 040 302 206 040 302 207 040 302 210 040 302 211 040 302 212 +0000120 040 302 213 040 302 214 040 302 215 040 302 216 040 302 217 040 +0000130 302 220 040 302 221 040 302 222 040 302 223 040 302 224 040 302 +0000140 225 040 302 226 040 302 227 040 302 230 040 302 231 040 302 232 +0000150 040 302 233 040 302 234 040 302 235 040 302 236 040 302 237 040 +0000160 302 240 040 302 241 040 302 242 040 302 243 040 302 244 040 302 +0000170 245 040 302 246 040 302 247 040 302 250 040 302 251 040 302 252 +0000180 040 302 253 040 302 254 040 302 255 040 302 256 040 302 257 040 +0000190 302 260 040 302 261 040 302 262 040 302 263 040 302 264 040 302 +00001a0 265 040 302 266 040 302 267 040 302 270 040 302 271 040 302 272 +00001b0 040 302 273 040 302 274 040 302 275 040 302 276 040 302 277 040 +00001c0 303 200 040 303 201 040 303 202 040 303 203 040 303 204 040 303 +00001d0 205 040 303 206 040 303 207 040 303 210 040 303 211 040 303 212 +00001e0 040 303 213 040 303 214 040 303 215 040 303 216 040 303 217 040 +00001f0 303 220 040 303 221 040 303 222 040 303 223 040 303 224 040 303 +0000200 225 040 303 226 040 303 227 040 303 230 040 303 231 040 303 232 +0000210 040 303 233 040 303 234 040 303 235 040 303 236 040 303 237 040 +0000220 303 240 040 303 241 040 303 242 040 303 243 040 303 244 040 303 +0000230 245 040 303 246 040 303 247 040 303 250 040 303 251 040 303 252 +0000240 040 303 253 040 303 254 040 303 255 040 303 256 040 303 257 040 +0000250 303 260 040 303 261 040 303 262 040 303 263 040 303 264 040 303 +0000260 265 040 303 266 040 303 267 040 303 270 040 303 271 040 303 272 +0000270 040 303 273 040 303 274 040 303 275 040 303 276 040 303 277 040 +0000280 +0000000 \0 001 002 003 004 005 006 \a +0000010 \b \t \n \v \f \r 016 017 +0000020 020 021 022 023 024 025 026 027 +0000030 030 031 032 033 034 035 036 037 +0000040 ! " # $ % & ' +0000050 ( ) * + , - . / +0000060 0 1 2 3 4 5 6 7 +0000070 8 9 : ; < = > ? +0000080 @ A B C D E F G +0000090 H I J K L M N O +00000a0 P Q R S T U V W +00000b0 X Y Z [ \ ] ^ _ +00000c0 ` a b c d e f g +00000d0 h i j k l m n o +00000e0 p q r s t u v w +00000f0 x y z { | } ~ 177 +0000100 302 200 302 201 302 202 302 203 302 204 302 +0000110 205 302 206 302 207 302 210 302 211 302 212 +0000120 302 213 302 214 302 215 302 216 302 217 +0000130 302 220 302 221 302 222 302 223 302 224 302 +0000140 225 302 226 302 227 302 230 302 231 302 232 +0000150 302 233 302 234 302 235 302 236 302 237 +0000160 302 240 302 241 302 242 302 243 302 244 302 +0000170 245 302 246 302 247 302 250 302 251 302 252 +0000180 302 253 302 254 302 255 302 256 302 257 +0000190 302 260 302 261 302 262 302 263 302 264 302 +00001a0 265 302 266 302 267 302 270 302 271 302 272 +00001b0 302 273 302 274 302 275 302 276 302 277 +00001c0 303 200 303 201 303 202 303 203 303 204 303 +00001d0 205 303 206 303 207 303 210 303 211 303 212 +00001e0 303 213 303 214 303 215 303 216 303 217 +00001f0 303 220 303 221 303 222 303 223 303 224 303 +0000200 225 303 226 303 227 303 230 303 231 303 232 +0000210 303 233 303 234 303 235 303 236 303 237 +0000220 303 240 303 241 303 242 303 243 303 244 303 +0000230 245 303 246 303 247 303 250 303 251 303 252 +0000240 303 253 303 254 303 255 303 256 303 257 +0000250 303 260 303 261 303 262 303 263 303 264 303 +0000260 265 303 266 303 267 303 270 303 271 303 272 +0000270 303 273 303 274 303 275 303 276 303 277 +0000280 +00000000 00 20 01 20 02 20 03 20 04 20 05 20 06 20 07 20 |. . . . . . . . | +00000010 08 20 09 20 0a 20 0b 20 0c 20 0d 20 0e 20 0f 20 |. . . . . . . . | +00000020 10 20 11 20 12 20 13 20 14 20 15 20 16 20 17 20 |. . . . . . . . | +00000030 18 20 19 20 1a 20 1b 20 1c 20 1d 20 1e 20 1f 20 |. . . . . . . . | +00000040 20 20 21 20 22 20 23 20 24 20 25 20 26 20 27 20 | ! " # $ % & ' | +00000050 28 20 29 20 2a 20 2b 20 2c 20 2d 20 2e 20 2f 20 |( ) * + , - . / | +00000060 30 20 31 20 32 20 33 20 34 20 35 20 36 20 37 20 |0 1 2 3 4 5 6 7 | +00000070 38 20 39 20 3a 20 3b 20 3c 20 3d 20 3e 20 3f 20 |8 9 : ; < = > ? | +00000080 40 20 41 20 42 20 43 20 44 20 45 20 46 20 47 20 |@ A B C D E F G | +00000090 48 20 49 20 4a 20 4b 20 4c 20 4d 20 4e 20 4f 20 |H I J K L M N O | +000000a0 50 20 51 20 52 20 53 20 54 20 55 20 56 20 57 20 |P Q R S T U V W | +000000b0 58 20 59 20 5a 20 5b 20 5c 20 5d 20 5e 20 5f 20 |X Y Z [ \ ] ^ _ | +000000c0 60 20 61 20 62 20 63 20 64 20 65 20 66 20 67 20 |` a b c d e f g | +000000d0 68 20 69 20 6a 20 6b 20 6c 20 6d 20 6e 20 6f 20 |h i j k l m n o | +000000e0 70 20 71 20 72 20 73 20 74 20 75 20 76 20 77 20 |p q r s t u v w | +000000f0 78 20 79 20 7a 20 7b 20 7c 20 7d 20 7e 20 7f 20 |x y z { | } ~ . | +00000100 c2 80 20 c2 81 20 c2 82 20 c2 83 20 c2 84 20 c2 |.. .. .. .. .. .| +00000110 85 20 c2 86 20 c2 87 20 c2 88 20 c2 89 20 c2 8a |. .. .. .. .. ..| +00000120 20 c2 8b 20 c2 8c 20 c2 8d 20 c2 8e 20 c2 8f 20 | .. .. .. .. .. | +00000130 c2 90 20 c2 91 20 c2 92 20 c2 93 20 c2 94 20 c2 |.. .. .. .. .. .| +00000140 95 20 c2 96 20 c2 97 20 c2 98 20 c2 99 20 c2 9a |. .. .. .. .. ..| +00000150 20 c2 9b 20 c2 9c 20 c2 9d 20 c2 9e 20 c2 9f 20 | .. .. .. .. .. | +00000160 c2 a0 20 c2 a1 20 c2 a2 20 c2 a3 20 c2 a4 20 c2 |.. .. .. .. .. .| +00000170 a5 20 c2 a6 20 c2 a7 20 c2 a8 20 c2 a9 20 c2 aa |. .. .. .. .. ..| +00000180 20 c2 ab 20 c2 ac 20 c2 ad 20 c2 ae 20 c2 af 20 | .. .. .. .. .. | +00000190 c2 b0 20 c2 b1 20 c2 b2 20 c2 b3 20 c2 b4 20 c2 |.. .. .. .. .. .| +000001a0 b5 20 c2 b6 20 c2 b7 20 c2 b8 20 c2 b9 20 c2 ba |. .. .. .. .. ..| +000001b0 20 c2 bb 20 c2 bc 20 c2 bd 20 c2 be 20 c2 bf 20 | .. .. .. .. .. | +000001c0 c3 80 20 c3 81 20 c3 82 20 c3 83 20 c3 84 20 c3 |.. .. .. .. .. .| +000001d0 85 20 c3 86 20 c3 87 20 c3 88 20 c3 89 20 c3 8a |. .. .. .. .. ..| +000001e0 20 c3 8b 20 c3 8c 20 c3 8d 20 c3 8e 20 c3 8f 20 | .. .. .. .. .. | +000001f0 c3 90 20 c3 91 20 c3 92 20 c3 93 20 c3 94 20 c3 |.. .. .. .. .. .| +00000200 95 20 c3 96 20 c3 97 20 c3 98 20 c3 99 20 c3 9a |. .. .. .. .. ..| +00000210 20 c3 9b 20 c3 9c 20 c3 9d 20 c3 9e 20 c3 9f 20 | .. .. .. .. .. | +00000220 c3 a0 20 c3 a1 20 c3 a2 20 c3 a3 20 c3 a4 20 c3 |.. .. .. .. .. .| +00000230 a5 20 c3 a6 20 c3 a7 20 c3 a8 20 c3 a9 20 c3 aa |. .. .. .. .. ..| +00000240 20 c3 ab 20 c3 ac 20 c3 ad 20 c3 ae 20 c3 af 20 | .. .. .. .. .. | +00000250 c3 b0 20 c3 b1 20 c3 b2 20 c3 b3 20 c3 b4 20 c3 |.. .. .. .. .. .| +00000260 b5 20 c3 b6 20 c3 b7 20 c3 b8 20 c3 b9 20 c3 ba |. .. .. .. .. ..| +00000270 20 c3 bb 20 c3 bc 20 c3 bd 20 c3 be 20 c3 bf 20 | .. .. .. .. .. | +00000280 diff -r ea2364416471 -r bf833e1aa881 components/text-utilities/files/hexdump-input Binary file components/text-utilities/files/hexdump-input has changed diff -r ea2364416471 -r bf833e1aa881 components/text-utilities/patches/localization-changes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/patches/localization-changes.patch Fri Oct 03 06:49:24 2014 -0700 @@ -0,0 +1,345 @@ +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.24.2/po/POTFILES.in.orig 2014-05-23 07:41:42.724934785 -0700 ++++ util-linux-2.24.2/po/POTFILES.in 2014-05-27 11:29:30.593217166 -0700 +@@ -1,32 +1,3 @@ +-disk-utils/addpart.c +-disk-utils/blockdev.c +-disk-utils/cramfs_common.c +-disk-utils/cramfs.h +-disk-utils/delpart.c +-disk-utils/fdformat.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/partx.h +-disk-utils/raw.c +-disk-utils/resizepart.c +-disk-utils/swaplabel.c +-fdisks/cfdisk.c +-fdisks/fdisk-ask.c +-fdisks/fdisk.c +-fdisks/fdisk.h +-fdisks/fdisk-menu.c +-fdisks/partname.c +-fdisks/partname.h +-fdisks/sfdisk.c + include/all-io.h + include/at.h + include/bitops.h +@@ -82,96 +53,6 @@ + include/xgetpass.h + lib/at.c + 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/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/bcache.c +-libblkid/src/superblocks/befs.c +-libblkid/src/superblocks/bfs.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/drbdproxy_datalog.c +-libblkid/src/superblocks/exfat.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/iso9660.h +-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/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/superblocks.c +-libblkid/src/superblocks/superblocks.h +-libblkid/src/superblocks/swap.c +-libblkid/src/superblocks/sysv.c +-libblkid/src/superblocks/ubifs.c +-libblkid/src/superblocks/udf.c +-libblkid/src/superblocks/ufs.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/colors.c + lib/cpuset.c +@@ -179,21 +60,6 @@ + lib/crc64.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/gpt.c +-libfdisk/src/init.c +-libfdisk/src/label.c +-libfdisk/src/libfdisk.h +-libfdisk/src/parttype.c +-libfdisk/src/sgi.c +-libfdisk/src/sun.c +-libfdisk/src/test.c +-libfdisk/src/utils.c + lib/fileutils.c + lib/ismounted.c + lib/langinfo.c +@@ -203,30 +69,6 @@ + lib/match.c + lib/mbsalign.c + lib/md5.c +-libmount/python/context.c +-libmount/python/fs.c +-libmount/python/pylibmount.c +-libmount/python/pylibmount.h +-libmount/python/tab.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/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/procutils.c +@@ -237,143 +79,8 @@ + lib/timeutils.c + lib/tt.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/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 + lib/wholedisk.c + lib/xgetpass.c +-login-utils/auth.c +-login-utils/auth.h +-login-utils/chfn.c +-login-utils/chsh.c +-login-utils/islocal.c +-login-utils/islocal.h +-login-utils/last.c +-login-utils/last-deprecated.c +-login-utils/libuser.c +-login-utils/libuser.h +-login-utils/login.c +-login-utils/logindefs.c +-login-utils/logindefs.h +-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/findfs.c +-misc-utils/findmnt.c +-misc-utils/getopt.c +-misc-utils/kill.c +-misc-utils/logger.c +-misc-utils/look.c +-misc-utils/lsblk.c +-misc-utils/lslocks.c +-misc-utils/mcookie.c +-misc-utils/namei.c +-misc-utils/rename.c +-misc-utils/sd-daemon.c +-misc-utils/sd-daemon.h +-misc-utils/uuidd.c +-misc-utils/uuidgen.c +-misc-utils/whereis.c +-misc-utils/wipefs.c +-mount-deprecated/devname.c +-mount-deprecated/devname.h +-mount-deprecated/fsprobe.c +-mount-deprecated/fsprobe.h +-mount-deprecated/fstab.c +-mount-deprecated/fstab.h +-mount-deprecated/getusername.c +-mount-deprecated/getusername.h +-mount-deprecated/mount.c +-mount-deprecated/mount_constants.h +-mount-deprecated/mount_mntent.c +-mount-deprecated/mount_mntent.h +-mount-deprecated/sundries.c +-mount-deprecated/sundries.h +-mount-deprecated/umount.c +-schedutils/chrt.c +-schedutils/ionice.c +-schedutils/taskset.c +-sys-utils/blkdiscard.c +-sys-utils/chcpu.c +-sys-utils/ctrlaltdel.c +-sys-utils/cyclades.h +-sys-utils/cytune.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-kd.c +-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/lp.h +-sys-utils/lscpu.c +-sys-utils/lscpu-dmi.c +-sys-utils/lscpu.h +-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/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 +-term-utils/agetty.c +-term-utils/mesg.c +-term-utils/script.c +-term-utils/scriptreplay.c +-term-utils/setterm.c +-term-utils/ttymsg.c +-term-utils/ttymsg.h +-term-utils/wall.c +-term-utils/write.c + text-utils/col.c + text-utils/colcrt.c + text-utils/colrm.c +--- util-linux-2.24.2/configure.orig 2014-05-28 13:48:57.232230984 -0700 ++++ util-linux-2.24.2/configure 2014-05-28 13:49:47.706174376 -0700 +@@ -4730,7 +4730,7 @@ + + + # Define the identity of the package. +- PACKAGE='util-linux' ++ PACKAGE='text-utilities' + VERSION='2.24.2' + + diff -r ea2364416471 -r bf833e1aa881 components/text-utilities/patches/parse.c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/patches/parse.c.patch Fri Oct 03 06:49:24 2014 -0700 @@ -0,0 +1,48 @@ +A printf format specifier of "qx" isn't supported on Solaris. + +http://man7.org/linux/man-pages/man3/printf.3.html says: + + q ("quad". 4.4BSD and Linux libc5 only. Don't use.) This is a + synonym for ll. + +This change will be sent upstream. + +--- util-linux-2.24.2/text-utils/parse.c.orig 2014-06-04 13:04:47.338346633 -0700 ++++ util-linux-2.24.2/text-utils/parse.c 2014-06-04 14:15:15.476415780 -0700 +@@ -208,7 +208,7 @@ + PR *pr, **nextpr; + FU *fu; + char *p1, *p2; +- char savech, *fmtp, cs[3]; ++ char savech, *fmtp, cs[4]; + int nconv, prec; + + nextpr = NULL; +@@ -282,9 +282,10 @@ + goto isint; + case 'o': case 'u': case 'x': case 'X': + pr->flags = F_UINT; +-isint: cs[2] = '\0'; +- cs[1] = cs[0]; +- cs[0] = 'q'; ++isint: cs[3] = '\0'; ++ cs[2] = cs[0]; ++ cs[1] = 'l'; ++ cs[0] = 'l'; + switch(fu->bcnt) { + case 0: case 4: + pr->bcnt = 4; +@@ -342,9 +343,10 @@ + ++p2; + switch(p1[2]) { + case 'd': case 'o': case'x': +- cs[0] = 'q'; +- cs[1] = p1[2]; +- cs[2] = '\0'; ++ cs[0] = 'l'; ++ cs[1] = 'l'; ++ cs[2] = p1[2]; ++ cs[3] = '\0'; + break; + default: + p1[3] = '\0'; diff -r ea2364416471 -r bf833e1aa881 components/text-utilities/patches/tests.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/patches/tests.patch Fri Oct 03 06:49:24 2014 -0700 @@ -0,0 +1,31 @@ +Changes needed to make the hexdump and tailf tests work correctly. + +These will be passed upstream. + +--- util-linux-2.24.2/tests/ts/hexdump/empty-format.orig 2014-06-06 08:21:49.459889429 -0700 ++++ util-linux-2.24.2/tests/ts/hexdump/empty-format 2014-06-06 08:31:18.548924420 -0700 +@@ -18,9 +18,10 @@ + . $TS_TOPDIR/functions.sh + ts_init "$*" + +-INPUT=$(printf \\1) +-$TS_CMD_HEXDUMP -n1 -ve '2 "" "%x"' <<< $INPUT 2>&1 >> $TS_OUTPUT ++$TS_CMD_HEXDUMP -b $TS_SELF/hexdump-input >> $TS_OUTPUT + +-$TS_CMD_HEXDUMP -n1 -ve '4 "%x"' -e '2 ""' <<< $INPUT 2>&1 >> $TS_OUTPUT ++$TS_CMD_HEXDUMP -c $TS_SELF/hexdump-input >> $TS_OUTPUT ++ ++$TS_CMD_HEXDUMP -C $TS_SELF/hexdump-input >> $TS_OUTPUT + + ts_finalize +--- util-linux-2.24.2/tests/ts/tailf/simple.orig 2014-06-04 07:52:07.774218747 -0700 ++++ util-linux-2.24.2/tests/ts/tailf/simple 2014-06-04 07:51:51.126976578 -0700 +@@ -27,7 +27,7 @@ + + sleep 0.1 + echo {0..9} >> $INPUT +-sleep 0.1 ++sleep 0.2 + + rm -f $INPUT + diff -r ea2364416471 -r bf833e1aa881 components/text-utilities/patches/ttyutils.h.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/patches/ttyutils.h.patch Fri Oct 03 06:49:24 2014 -0700 @@ -0,0 +1,36 @@ +Changes needed to get column to build on Solaris + +These changes will be sent upstream. + +--- util-linux-2.24.2/include/ttyutils.h.orig 2014-05-13 10:55:05.789258799 -0700 ++++ util-linux-2.24.2/include/ttyutils.h 2014-05-13 11:05:20.943543261 -0700 +@@ -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 for base settings */ diff -r ea2364416471 -r bf833e1aa881 components/text-utilities/resolve.deps --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/resolve.deps Fri Oct 03 06:49:24 2014 -0700 @@ -0,0 +1,1 @@ +system/library diff -r ea2364416471 -r bf833e1aa881 components/text-utilities/text-utilities.license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/text-utilities.license Fri Oct 03 06:49:24 2014 -0700 @@ -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 -r ea2364416471 -r bf833e1aa881 components/text-utilities/text-utilities.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/text-utilities.p5m Fri Oct 03 06:49:24 2014 -0700 @@ -0,0 +1,76 @@ +# +# 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, Oracle and/or its affiliates. All rights reserved. +# + + default mangler.man.stability uncommitted> +set name=pkg.fmri \ + value=pkg:/text/text-utilities@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Additional text utilities" +set name=pkg.description \ + value="This package contains several additional text utilities originally found in the BSD distribution." +set name=com.oracle.info.description value="additional text utilities originally from BSD" +set name=com.oracle.info.tpno value=$(TPNO) +set name=info.classification \ + value="org.opensolaris.category.2008:System/Text Tools" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2014/170 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file path=usr/bin/colcrt +file path=usr/bin/colrm +file path=usr/bin/column +file path=usr/bin/hexdump +file path=usr/bin/rev +file path=usr/bin/tailf +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/rev.1 +file path=usr/share/man/man1/tailf.1 +license text-utilities.license license=BSD