# HG changeset patch # User Rich Burridge # Date 1425409266 28800 # Node ID cd126ba3fdda1c613aac6753b6a3510cd9d629b8 # Parent 9ac96ba60329478c5d50f44c8da9d573b59eeb5a 20623340 text-utilities should be updated to version 2.25.2 diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/Makefile --- a/components/text-utilities/Makefile Mon Mar 02 15:26:19 2015 -0800 +++ b/components/text-utilities/Makefile Tue Mar 03 11:01:06 2015 -0800 @@ -24,16 +24,16 @@ include ../../make-rules/shared-macros.mk COMPONENT_NAME= text-utilities -COMPONENT_VERSION= 2.24.2 +COMPONENT_VERSION= 2.25.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) + sha256:e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 +COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/v2.25/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/text-utilities -TPNO= 17825 +TPNO= 21750 include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/configure.mk @@ -44,6 +44,9 @@ # Anything else that we want should be added to this macro in the future. PROGRAMS = colcrt colrm column hexdump rev tailf +# Build a utility program used by one of the hexdump tests. +PROGRAMS += test_sysinfo + # Limit translations to the text utilities (and lib/* and include/* ) only. COMPONENT_PRE_INSTALL_ACTION = \ (cd $(@D)/po ; $(GMAKE) text-utilities.pot-update) @@ -51,6 +54,9 @@ CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.32) +# We don't need the Python bindings built. +CONFIGURE_OPTIONS += --without-python + # Makefile incorrectly includes gcc(1) '-fsigned-char' in AM_CFLAGS, so we # override it. COMPONENT_BUILD_ARGS += AM_CFLAGS="" @@ -79,20 +85,16 @@ 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; ) +# 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 COMPONENT_TEST_TARGETS = colrm column hexdump tailf -# common targets +COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH)-64.master + configure: $(CONFIGURE_64) build: $(BUILD_64) diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/files/hexdump-expected --- a/components/text-utilities/files/hexdump-expected Mon Mar 02 15:26:19 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -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 9ac96ba60329 -r cd126ba3fdda components/text-utilities/files/hexdump-input Binary file components/text-utilities/files/hexdump-input has changed diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/patches/colors.c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/patches/colors.c.patch Tue Mar 03 11:01:06 2015 -0800 @@ -0,0 +1,22 @@ +Fix "line 579: undefined symbol: UL_SCNsA" problem at compile time in +lib/colors.c + +Problem previously reported at: +http://www.spinics.net/lists/util-linux-ng/msg10496.html + +Change taken from upstream git repo: +https://github.com/karelzak/util-linux/blob/master/lib/colors.c + +--- util-linux-2.25.2/lib/colors.c.orig 2015-02-16 16:36:01.215073454 -0800 ++++ util-linux-2.25.2/lib/colors.c 2015-03-01 10:53:21.301521771 -0800 +@@ -576,9 +577,7 @@ + if (*p == '\0' || *p == '#') + continue; + +- rc = sscanf(p, UL_SCNsA" " /* name */ +- UL_SCNsA, /* color */ +- &cn, &seq); ++ rc = sscanf(p, "%128[^ ] %128[^\n ]", cn, seq); + if (rc == 2 && cn && seq) + rc = colors_add_scheme(cc, cn, seq); /* set rc=0 on success */ + if (rc) { diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/patches/fix-parfait.patch --- a/components/text-utilities/patches/fix-parfait.patch Mon Mar 02 15:26:19 2015 -0800 +++ b/components/text-utilities/patches/fix-parfait.patch Tue Mar 03 11:01:06 2015 -0800 @@ -11,9 +11,9 @@ These changes will not be sent upstream. ---- util-linux-2.24.2/Makefile.in.orig 2014-10-03 13:10:39.157296040 -0700 -+++ util-linux-2.24.2/Makefile.in 2014-10-03 13:10:56.518794681 -0700 -@@ -3267,7 +3267,6 @@ +--- util-linux-2.25.2/Makefile.in.orig 2015-03-01 12:09:46.664939865 -0800 ++++ util-linux-2.25.2/Makefile.in 2015-03-01 12:10:03.697835491 -0800 +@@ -3330,7 +3330,6 @@ usrlib_execdir = @usrlib_execdir@ usrsbin_execdir = @usrsbin_execdir@ AM_CPPFLAGS = \ @@ -21,8 +21,245 @@ -I$(top_srcdir)/include \ -DLOCALEDIR=\"$(localedir)\" \ -D_PATH_LOCALSTATEDIR=\"${localstatedir}\" ---- util-linux-2.24.2/text-utils/colcrt.c.orig 2014-10-03 12:57:37.229875653 -0700 -+++ util-linux-2.24.2/text-utils/colcrt.c 2014-10-03 13:04:07.012470027 -0700 +--- util-linux-2.25.2/lib/at.c.orig 2015-03-01 11:43:47.706048138 -0800 ++++ util-linux-2.25.2/lib/at.c 2015-03-01 11:53:01.995395571 -0800 +@@ -6,6 +6,7 @@ + * + * Written by Karel Zak + */ ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/blkdev.c.orig 2015-03-01 11:43:47.709782117 -0800 ++++ util-linux-2.25.2/lib/blkdev.c 2015-03-01 11:53:06.056900088 -0800 +@@ -4,6 +4,7 @@ + * + * Written by Karel Zak + */ ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/canonicalize.c.orig 2015-03-01 11:43:47.713318152 -0800 ++++ util-linux-2.25.2/lib/canonicalize.c 2015-03-01 11:53:10.025907134 -0800 +@@ -6,6 +6,7 @@ + * + * Copyright (C) 2009-2013 Karel Zak + */ ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/colors.c.orig 2015-03-01 11:43:47.716885436 -0800 ++++ util-linux-2.25.2/lib/colors.c 2015-03-01 11:53:14.164585667 -0800 +@@ -5,6 +5,7 @@ + * This file may be distributed under the terms of the + * GNU Lesser General Public License. + */ ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/crc32.c.orig 2015-03-01 11:43:47.719450124 -0800 ++++ util-linux-2.25.2/lib/crc32.c 2015-03-01 11:53:21.320244734 -0800 +@@ -38,6 +38,7 @@ + * + */ + ++#include "config.h" + #include + + #include "crc32.h" +--- util-linux-2.25.2/lib/crc64.c.orig 2015-03-01 11:43:47.721677562 -0800 ++++ util-linux-2.25.2/lib/crc64.c 2015-03-01 11:53:25.846172229 -0800 +@@ -1,3 +1,4 @@ ++#include "config.h" + #include "crc64.h" + + static const uint64_t crc64_tab[256] = { +--- util-linux-2.25.2/lib/env.c.orig 2015-03-01 11:43:47.723913257 -0800 ++++ util-linux-2.25.2/lib/env.c 2015-03-01 11:53:30.328287948 -0800 +@@ -5,6 +5,7 @@ + * + */ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/exec_shell.c.orig 2015-03-01 11:43:47.726160917 -0800 ++++ util-linux-2.25.2/lib/exec_shell.c 2015-03-01 11:53:34.945133416 -0800 +@@ -16,6 +16,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/fileutils.c.orig 2015-03-01 11:43:47.728419344 -0800 ++++ util-linux-2.25.2/lib/fileutils.c 2015-03-01 11:53:40.478569968 -0800 +@@ -2,6 +2,7 @@ + * Copyright (C) 2012 Sami Kerola + */ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/ismounted.c.orig 2015-03-01 11:43:47.730668003 -0800 ++++ util-linux-2.25.2/lib/ismounted.c 2015-03-01 11:53:45.712384297 -0800 +@@ -6,6 +6,7 @@ + * This file may be redistributed under the terms of the GNU Public + * License. + */ ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/mangle.c.orig 2015-03-01 11:43:47.732911742 -0800 ++++ util-linux-2.25.2/lib/mangle.c 2015-03-01 11:53:49.871293399 -0800 +@@ -5,6 +5,7 @@ + * + * Copyright (C) 2010 Karel Zak + */ ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/match.c.orig 2015-03-01 11:43:47.735095807 -0800 ++++ util-linux-2.25.2/lib/match.c 2015-03-01 11:53:56.163043602 -0800 +@@ -5,6 +5,7 @@ + * GNU Lesser General Public License. + */ + ++#include "config.h" + #include + + #include "match.h" +--- util-linux-2.25.2/lib/md5.c.orig 2015-03-01 11:43:47.739618639 -0800 ++++ util-linux-2.25.2/lib/md5.c 2015-03-01 11:54:17.671305500 -0800 +@@ -14,6 +14,7 @@ + * needed on buffers full of bytes, and then call MD5Final, which + * will fill a supplied 16-byte array with the digest. + */ ++#include "config.h" + #include /* for memcpy() */ + + #include "md5.h" +--- util-linux-2.25.2/lib/pager.c.orig 2015-03-01 11:43:47.741853543 -0800 ++++ util-linux-2.25.2/lib/pager.c 2015-03-01 11:54:23.396457844 -0800 +@@ -5,6 +5,7 @@ + * by Davidlohr Bueso - March 2012. + */ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/path.c.orig 2015-03-01 11:43:47.744084746 -0800 ++++ util-linux-2.25.2/lib/path.c 2015-03-01 11:54:28.896601001 -0800 +@@ -23,6 +23,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/procutils.c.orig 2015-03-01 11:43:47.746347088 -0800 ++++ util-linux-2.25.2/lib/procutils.c 2015-03-01 11:54:33.422225278 -0800 +@@ -14,6 +14,7 @@ + * GNU Library Public License for more details. + */ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/randutils.c.orig 2015-03-01 11:43:47.748566538 -0800 ++++ util-linux-2.25.2/lib/randutils.c 2015-03-01 11:54:37.272489749 -0800 +@@ -6,6 +6,7 @@ + * This file may be redistributed under the terms of the + * GNU Lesser General Public License. + */ ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/readutmp.c.orig 2015-03-01 11:43:47.750742501 -0800 ++++ util-linux-2.25.2/lib/readutmp.c 2015-03-01 11:54:41.797679368 -0800 +@@ -18,6 +18,7 @@ + /* Written by jla; revised by djm */ + /* extracted for util-linux by ooprala */ + ++#include "config.h" + #include + #include + +--- util-linux-2.25.2/lib/setproctitle.c.orig 2015-03-01 11:43:47.752974942 -0800 ++++ util-linux-2.25.2/lib/setproctitle.c 2015-03-01 11:54:46.497856864 -0800 +@@ -3,6 +3,7 @@ + * + * Clobbers argv of our main procedure so ps(1) will display the title. + */ ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/strutils.c.orig 2015-03-01 11:43:47.755217223 -0800 ++++ util-linux-2.25.2/lib/strutils.c 2015-03-01 11:54:50.265252752 -0800 +@@ -3,6 +3,7 @@ + * Copyright (C) 2010 Davidlohr Bueso + */ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/sysfs.c.orig 2015-03-01 11:43:47.757446028 -0800 ++++ util-linux-2.25.2/lib/sysfs.c 2015-03-01 11:54:54.370697652 -0800 +@@ -4,6 +4,7 @@ + * + * Written by Karel Zak + */ ++#include "config.h" + #include + + #include "c.h" +--- util-linux-2.25.2/lib/timeutils.c.orig 2015-03-01 11:43:47.759733018 -0800 ++++ util-linux-2.25.2/lib/timeutils.c 2015-03-01 11:54:59.904346610 -0800 +@@ -18,6 +18,7 @@ + along with util-linux; If not, see . + ***/ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/lib/ttyutils.c.orig 2015-03-01 11:43:47.761938016 -0800 ++++ util-linux-2.25.2/lib/ttyutils.c 2015-03-01 11:55:04.046327843 -0800 +@@ -4,6 +4,7 @@ + * + * Written by Karel Zak + */ ++#include "config.h" + #include + + #include "c.h" +--- util-linux-2.25.2/lib/xgetpass.c.orig 2015-03-01 11:43:47.766478464 -0800 ++++ util-linux-2.25.2/lib/xgetpass.c 2015-03-01 11:55:08.021688395 -0800 +@@ -5,6 +5,7 @@ + * Public domain. + */ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/text-utils/colcrt.c.orig 2015-03-01 11:32:01.483661600 -0800 ++++ util-linux-2.25.2/text-utils/colcrt.c 2015-03-01 11:32:22.335979347 -0800 @@ -38,6 +38,7 @@ * modified to work correctly in multi-byte locales */ @@ -31,8 +268,8 @@ #include #include #include /* for close() */ ---- util-linux-2.24.2/text-utils/colrm.c.orig 2014-10-03 12:57:37.234365767 -0700 -+++ util-linux-2.24.2/text-utils/colrm.c 2014-10-03 13:04:22.353214979 -0700 +--- util-linux-2.25.2/text-utils/colrm.c.orig 2015-03-01 11:32:01.486062543 -0800 ++++ util-linux-2.25.2/text-utils/colrm.c 2015-03-01 11:32:29.519982931 -0800 @@ -38,6 +38,7 @@ * modified to work correctly in multi-byte locales */ @@ -41,8 +278,8 @@ #include #include #include ---- util-linux-2.24.2/text-utils/column.c.orig 2014-10-03 12:57:37.238786225 -0700 -+++ util-linux-2.24.2/text-utils/column.c 2014-10-03 13:04:35.246011917 -0700 +--- util-linux-2.25.2/text-utils/column.c.orig 2015-03-01 11:32:01.488393625 -0800 ++++ util-linux-2.25.2/text-utils/column.c 2015-03-01 11:32:36.896574783 -0800 @@ -38,6 +38,7 @@ * modified to work correctly in multi-byte locales */ @@ -51,18 +288,38 @@ #include #include ---- util-linux-2.24.2/text-utils/hexdump.c.orig 2014-10-03 12:57:37.243108535 -0700 -+++ util-linux-2.24.2/text-utils/hexdump.c 2014-10-03 13:04:47.087065662 -0700 +--- util-linux-2.25.2/text-utils/hexdump-conv.c.orig 2015-03-01 11:32:01.490687692 -0800 ++++ util-linux-2.25.2/text-utils/hexdump-conv.c 2015-03-01 11:32:42.821621161 -0800 +@@ -31,6 +31,7 @@ + * SUCH DAMAGE. + */ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/text-utils/hexdump-display.c.orig 2015-03-01 11:32:01.492920078 -0800 ++++ util-linux-2.25.2/text-utils/hexdump-display.c 2015-03-01 11:32:49.738529478 -0800 +@@ -31,6 +31,7 @@ + * SUCH DAMAGE. + */ + ++#include "config.h" + #include + #include + #include +--- util-linux-2.25.2/text-utils/hexdump-parse.c.orig 2015-03-01 11:32:01.495159360 -0800 ++++ util-linux-2.25.2/text-utils/hexdump-parse.c 2015-03-01 11:33:00.346711491 -0800 @@ -35,6 +35,7 @@ * - added Native Language Support */ +#include "config.h" #include + #include #include - #include ---- util-linux-2.24.2/text-utils/hexsyntax.c.orig 2014-10-03 12:57:37.245992188 -0700 -+++ util-linux-2.24.2/text-utils/hexsyntax.c 2014-10-03 13:04:59.228066989 -0700 +--- util-linux-2.25.2/text-utils/hexdump.c.orig 2015-03-01 11:32:01.497386272 -0800 ++++ util-linux-2.25.2/text-utils/hexdump.c 2015-03-01 11:33:05.155584413 -0800 @@ -35,6 +35,7 @@ * - added Native Language Support */ @@ -70,9 +327,9 @@ +#include "config.h" #include #include - #include ---- util-linux-2.24.2/text-utils/rev.c.orig 2014-10-03 12:57:37.248641691 -0700 -+++ util-linux-2.24.2/text-utils/rev.c 2014-10-03 13:05:12.227532484 -0700 + #include +--- util-linux-2.25.2/text-utils/rev.c.orig 2015-03-01 11:32:01.499685509 -0800 ++++ util-linux-2.25.2/text-utils/rev.c 2015-03-01 11:33:11.255726569 -0800 @@ -48,6 +48,7 @@ * Changed tab indentation to 8 chars for better reading the code */ @@ -81,8 +338,8 @@ #include #include #include ---- util-linux-2.24.2/text-utils/tailf.c.orig 2014-10-03 12:57:37.251263508 -0700 -+++ util-linux-2.24.2/text-utils/tailf.c 2014-10-03 13:05:24.645043233 -0700 +--- util-linux-2.25.2/text-utils/tailf.c.orig 2015-03-01 11:32:01.504078280 -0800 ++++ util-linux-2.25.2/text-utils/tailf.c 2015-03-01 11:33:16.805390486 -0800 @@ -26,6 +26,7 @@ * flushed back to disk. This is sort of a "stealth" tail. */ @@ -91,33 +348,3 @@ #include #include #include ---- util-linux-2.24.2/lib/colors.c.orig 2014-10-03 12:57:53.090779693 -0700 -+++ util-linux-2.24.2/lib/colors.c 2014-10-03 13:05:42.799702714 -0700 -@@ -4,6 +4,7 @@ - * This file may be distributed under the terms of the - * GNU Lesser General Public License. - */ -+#include "config.h" - #include - #include - ---- util-linux-2.24.2/lib/fileutils.c.orig 2014-10-03 12:57:58.764773604 -0700 -+++ util-linux-2.24.2/lib/fileutils.c 2014-10-03 13:05:52.790897687 -0700 -@@ -2,6 +2,7 @@ - * Copyright (C) 2012 Sami Kerola - */ - -+#include "config.h" - #include - #include - #include ---- util-linux-2.24.2/lib/tt.c.orig 2014-10-03 12:58:03.068722737 -0700 -+++ util-linux-2.24.2/lib/tt.c 2014-10-03 13:06:03.548849305 -0700 -@@ -10,6 +10,7 @@ - * This file may be redistributed under the terms of the - * GNU Lesser General Public License. - */ -+#include "config.h" - #include - #include - #include diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/patches/localization-changes.patch --- a/components/text-utilities/patches/localization-changes.patch Mon Mar 02 15:26:19 2015 -0800 +++ b/components/text-utilities/patches/localization-changes.patch Tue Mar 03 11:01:06 2015 -0800 @@ -3,15 +3,19 @@ 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 @@ +--- util-linux-2.25.2/po/POTFILES.in.orig 2015-02-16 17:58:51.277504520 -0800 ++++ util-linux-2.25.2/po/POTFILES.in 2015-02-16 18:01:33.075068561 -0800 +@@ -1,29 +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-menu.c -disk-utils/fsck.c -disk-utils/fsck.cramfs.c -disk-utils/fsck.minix.c @@ -26,19 +30,12 @@ -disk-utils/partx.h -disk-utils/raw.c -disk-utils/resizepart.c +-disk-utils/sfdisk.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 @@ +@@ -81,96 +55,6 @@ include/xgetpass.h lib/at.c lib/blkdev.c @@ -132,10 +129,10 @@ -libblkid/src/topology/topology.h -libblkid/src/verify.c -libblkid/src/version.c + lib/boottime.c lib/canonicalize.c lib/colors.c - lib/cpuset.c -@@ -179,21 +60,6 @@ +@@ -179,24 +63,6 @@ lib/crc64.c lib/env.c lib/exec_shell.c @@ -147,17 +144,20 @@ -libfdisk/src/fdiskP.h -libfdisk/src/gpt.c -libfdisk/src/init.c +-libfdisk/src/iter.c -libfdisk/src/label.c -libfdisk/src/libfdisk.h +-libfdisk/src/partition.c -libfdisk/src/parttype.c -libfdisk/src/sgi.c -libfdisk/src/sun.c +-libfdisk/src/table.c -libfdisk/src/test.c -libfdisk/src/utils.c lib/fileutils.c lib/ismounted.c lib/langinfo.c -@@ -203,30 +69,6 @@ +@@ -206,30 +72,6 @@ lib/match.c lib/mbsalign.c lib/md5.c @@ -188,9 +188,9 @@ lib/pager.c lib/path.c lib/procutils.c -@@ -237,143 +79,8 @@ +@@ -251,115 +93,7 @@ + lib/sysfs.c lib/timeutils.c - lib/tt.c lib/ttyutils.c -libuuid/src/clear.c -libuuid/src/compare.c @@ -206,7 +206,6 @@ -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 @@ -221,6 +220,7 @@ -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 @@ -249,35 +249,16 @@ -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 @@ -320,26 +301,17 @@ -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 @@ + term-utils/agetty.c + term-utils/mesg.c + term-utils/script.c +--- util-linux-2.25.2/configure.orig 2015-02-16 18:03:52.241717421 -0800 ++++ util-linux-2.25.2/configure 2015-02-16 18:04:23.594933195 -0800 +@@ -4851,7 +4851,7 @@ # Define the identity of the package. - PACKAGE='util-linux' + PACKAGE='text-utilities' - VERSION='2.24.2' + VERSION='2.25.2' diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/patches/parse.c.patch --- a/components/text-utilities/patches/parse.c.patch Mon Mar 02 15:26:19 2015 -0800 +++ b/components/text-utilities/patches/parse.c.patch Tue Mar 03 11:01:06 2015 -0800 @@ -7,20 +7,20 @@ 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; +--- util-linux-2.25.2/text-utils/hexdump-parse.c.orig 2015-02-16 18:06:45.921790582 -0800 ++++ util-linux-2.25.2/text-utils/hexdump-parse.c 2015-02-16 18:09:59.879541819 -0800 +@@ -226,7 +226,7 @@ + struct hexdump_fu *fu; + struct list_head *p, *q; + char *p1, *p2, *fmtp; +- char savech, cs[3]; ++ char savech, cs[4]; + int nconv, prec = 0; - nextpr = NULL; -@@ -282,9 +282,10 @@ + list_for_each (p, &fs->fulist) { +@@ -301,9 +301,10 @@ goto isint; - case 'o': case 'u': case 'x': case 'X': + } else if (first_letter(cs, "ouxX")) { pr->flags = F_UINT; -isint: cs[2] = '\0'; - cs[1] = cs[0]; @@ -30,19 +30,19 @@ + 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'; + case 0: + pr->bcnt = 4; +@@ -355,9 +356,10 @@ + pr->flags = F_ADDRESS; + ++p2; + if (first_letter(p1 + 2, "dox")) { +- cs[0] = 'q'; +- cs[1] = p1[2]; +- cs[2] = '\0'; ++ cs[0] = 'l'; ++ cs[1] = 'l'; ++ cs[2] = p1[2]; ++ cs[3] = '\0'; + } else { + p1[3] = '\0'; + badconv(p1); diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/patches/tests.patch --- a/components/text-utilities/patches/tests.patch Mon Mar 02 15:26:19 2015 -0800 +++ b/components/text-utilities/patches/tests.patch Tue Mar 03 11:01:06 2015 -0800 @@ -1,30 +1,17 @@ -Changes needed to make the hexdump and tailf tests work correctly. +Changes needed to make the 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 +--- util-linux-2.25.2/tests/ts/tailf/simple.orig 2015-02-16 18:13:47.493114932 -0800 ++++ util-linux-2.25.2/tests/ts/tailf/simple 2015-03-01 15:18:29.040656789 -0800 +@@ -27,9 +27,9 @@ --$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_CMD_TAILF $INPUT > $TS_OUTPUT 2>&1 & - 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 +-sleep 0.5 ++sleep 0.1 echo {0..9} >> $INPUT --sleep 0.1 +-sleep 0.5 +sleep 0.2 rm -f $INPUT diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/patches/ttyutils.h.patch --- a/components/text-utilities/patches/ttyutils.h.patch Mon Mar 02 15:26:19 2015 -0800 +++ b/components/text-utilities/patches/ttyutils.h.patch Tue Mar 03 11:01:06 2015 -0800 @@ -2,8 +2,8 @@ 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 +--- 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) @@ -13,22 +13,22 @@ +#define OXTABS 0 +#endif +#ifndef TTYDEF_IFLAG -+#define TTYDEF_IFLAG (BRKINT | ICRNL | IMAXBEL | IXON | IXANY) ++#define TTYDEF_IFLAG (BRKINT | ICRNL | IMAXBEL | IXON | IXANY) +#endif +#ifndef TTYDEF_OFLAG -+#define TTYDEF_OFLAG (OPOST | ONLCR | OXTABS) ++#define TTYDEF_OFLAG (OPOST | ONLCR | OXTABS) +#endif +#ifndef TTYDEF_LFLAG -+#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) ++#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) +#endif +#ifndef TTYDEF_CFLAG -+#define TTYDEF_CFLAG (CREAD | CS8 | HUPCL) ++#define TTYDEF_CFLAG (CREAD | CS8 | HUPCL) +#endif +#ifndef CREPRINT -+#define CREPRINT CTRL('r') ++#define CREPRINT CTRL('r') +#endif +#ifndef CDISCARD -+#define CDISCARD CTRL('o') ++#define CDISCARD CTRL('o') +#endif + static inline void reset_virtual_console(struct termios *tp, int flags) diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/test/results-64.master --- a/components/text-utilities/test/results-64.master Mon Mar 02 15:26:19 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +0,0 @@ - --------------------- util-linux regression tests -------------------- - - For development purpose only. - Don't execute on production system! - - - 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/fillrow - sub dir: $(SOURCE_DIR)/tests/ts/column - top dir: $(SOURCE_DIR)/tests - self: $(SOURCE_DIR)/tests/ts/column - test name: fillrow - test desc: fill row - component: column - namespace: column/fillrow - verbose: yes - output: $(SOURCE_DIR)/tests/output/column/fillrow - valgrind: $(SOURCE_DIR)/tests/output/column/fillrow.vgdump - expected: $(SOURCE_DIR)/tests/expected/column/fillrow - mountpoint: $(SOURCE_DIR)/tests/output/column/fillrow-mnt - - column: fill row ... OK - - 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/separator_table - sub dir: $(SOURCE_DIR)/tests/ts/column - top dir: $(SOURCE_DIR)/tests - self: $(SOURCE_DIR)/tests/ts/column - test name: separator_table - test desc: separator & table - component: column - namespace: column/separator_table - verbose: yes - output: $(SOURCE_DIR)/tests/output/column/separator_table - valgrind: $(SOURCE_DIR)/tests/output/column/separator_table.vgdump - expected: $(SOURCE_DIR)/tests/expected/column/separator_table - mountpoint: $(SOURCE_DIR)/tests/output/column/separator_table-mnt - - column: separator & table ... OK - - script: $(SOURCE_DIR)/tests/ts/hexdump/empty-format - sub dir: $(SOURCE_DIR)/tests/ts/hexdump - top dir: $(SOURCE_DIR)/tests - self: $(SOURCE_DIR)/tests/ts/hexdump - test name: empty-format - test desc: format-strings - component: hexdump - namespace: hexdump/empty-format - verbose: yes - output: $(SOURCE_DIR)/tests/output/hexdump/empty-format - valgrind: $(SOURCE_DIR)/tests/output/hexdump/empty-format.vgdump - expected: $(SOURCE_DIR)/tests/expected/hexdump/empty-format - mountpoint: $(SOURCE_DIR)/tests/output/hexdump/empty-format-mnt - - hexdump: format-strings ... OK - - script: $(SOURCE_DIR)/tests/ts/tailf/simple - sub dir: $(SOURCE_DIR)/tests/ts/tailf - top dir: $(SOURCE_DIR)/tests - self: $(SOURCE_DIR)/tests/ts/tailf - test name: simple - test desc: simple - component: tailf - namespace: tailf/simple - verbose: yes - output: $(SOURCE_DIR)/tests/output/tailf/simple - valgrind: $(SOURCE_DIR)/tests/output/tailf/simple.vgdump - expected: $(SOURCE_DIR)/tests/expected/tailf/simple - mountpoint: $(SOURCE_DIR)/tests/output/tailf/simple-mnt - - tailf: simple ... OK - ---------------------------------------------------------------------- - All 6 tests PASSED ---------------------------------------------------------------------- diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/test/results-i386-64.master --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/test/results-i386-64.master Tue Mar 03 11:01:06 2015 -0800 @@ -0,0 +1,176 @@ + +-------------------- util-linux regression tests -------------------- + + For development purpose only. + Don't execute on production system! + + + 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/fillrow + sub dir: $(SOURCE_DIR)/tests/ts/column + top dir: $(SOURCE_DIR)/tests + self: $(SOURCE_DIR)/tests/ts/column + test name: fillrow + test desc: fill row + component: column + namespace: column/fillrow + verbose: yes + output: $(SOURCE_DIR)/tests/output/column/fillrow + valgrind: $(SOURCE_DIR)/tests/output/column/fillrow.vgdump + expected: $(SOURCE_DIR)/tests/expected/column/fillrow + mountpoint: $(SOURCE_DIR)/tests/output/column/fillrow-mnt + + column: fill row ... OK + + 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 ... 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/separator_table + sub dir: $(SOURCE_DIR)/tests/ts/column + top dir: $(SOURCE_DIR)/tests + self: $(SOURCE_DIR)/tests/ts/column + test name: separator_table + test desc: separator & table + component: column + namespace: column/separator_table + verbose: yes + output: $(SOURCE_DIR)/tests/output/column/separator_table + valgrind: $(SOURCE_DIR)/tests/output/column/separator_table.vgdump + expected: $(SOURCE_DIR)/tests/expected/column/separator_table + mountpoint: $(SOURCE_DIR)/tests/output/column/separator_table-mnt + + column: separator & table ... OK + + 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/tailf/simple + sub dir: $(SOURCE_DIR)/tests/ts/tailf + top dir: $(SOURCE_DIR)/tests + self: $(SOURCE_DIR)/tests/ts/tailf + test name: simple + test desc: simple + component: tailf + namespace: tailf/simple + verbose: yes + output: $(SOURCE_DIR)/tests/output/tailf/simple + valgrind: $(SOURCE_DIR)/tests/output/tailf/simple.vgdump + expected: $(SOURCE_DIR)/tests/expected/tailf/simple + mountpoint: $(SOURCE_DIR)/tests/output/tailf/simple-mnt + + tailf: simple ... OK + +--------------------------------------------------------------------- + 1 tests of 8 FAILED +--------------------------------------------------------------------- diff -r 9ac96ba60329 -r cd126ba3fdda components/text-utilities/test/results-sparc-64.master --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/text-utilities/test/results-sparc-64.master Tue Mar 03 11:01:06 2015 -0800 @@ -0,0 +1,176 @@ + +-------------------- util-linux regression tests -------------------- + + For development purpose only. + Don't execute on production system! + + + 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/fillrow + sub dir: $(SOURCE_DIR)/tests/ts/column + top dir: $(SOURCE_DIR)/tests + self: $(SOURCE_DIR)/tests/ts/column + test name: fillrow + test desc: fill row + component: column + namespace: column/fillrow + verbose: yes + output: $(SOURCE_DIR)/tests/output/column/fillrow + valgrind: $(SOURCE_DIR)/tests/output/column/fillrow.vgdump + expected: $(SOURCE_DIR)/tests/expected/column/fillrow + mountpoint: $(SOURCE_DIR)/tests/output/column/fillrow-mnt + + column: fill row ... OK + + 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 ... 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/separator_table + sub dir: $(SOURCE_DIR)/tests/ts/column + top dir: $(SOURCE_DIR)/tests + self: $(SOURCE_DIR)/tests/ts/column + test name: separator_table + test desc: separator & table + component: column + namespace: column/separator_table + verbose: yes + output: $(SOURCE_DIR)/tests/output/column/separator_table + valgrind: $(SOURCE_DIR)/tests/output/column/separator_table.vgdump + expected: $(SOURCE_DIR)/tests/expected/column/separator_table + mountpoint: $(SOURCE_DIR)/tests/output/column/separator_table-mnt + + column: separator & table ... OK + + 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 ... FAILED (hexdump/format-strings-empty-format) + : 1b_octal ... OK + : 1b_char ... OK + : canon ... OK + : 2b_dec ... FAILED (hexdump/format-strings-2b_dec) + : 2b_octal ... FAILED (hexdump/format-strings-2b_octal) + : 2b_hex ... FAILED (hexdump/format-strings-2b_hex) + ... FAILED (4 from 7 sub-tests) + + 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 ... FAILED (hexdump/highlighting-1b_octal-2) + : 1b_octal-3 ... OK + : 1b_octal-4 ... FAILED (hexdump/highlighting-1b_octal-4) + : 1b_octal-5 ... FAILED (hexdump/highlighting-1b_octal-5) + : 1b_octal-6 ... OK + : 1b_octal-7 ... FAILED (hexdump/highlighting-1b_octal-7) + : 1b_octal-8 ... FAILED (hexdump/highlighting-1b_octal-8) + : 1b_octal-9 ... FAILED (hexdump/highlighting-1b_octal-9) + : 1b_char-1 ... OK + : 1b_char-2 ... OK + : 1b_char-3 ... OK + : canon-1 ... FAILED (hexdump/highlighting-canon-1) + : canon-2 ... OK + : 2b_dec-1 ... FAILED (hexdump/highlighting-2b_dec-1) + : 2b_dec-2 ... FAILED (hexdump/highlighting-2b_dec-2) + : 2b_dec-3 ... FAILED (hexdump/highlighting-2b_dec-3) + : 2b_dec-4 ... FAILED (hexdump/highlighting-2b_dec-4) + : 2b_dec-5 ... FAILED (hexdump/highlighting-2b_dec-5) + : 2b_dec-6 ... OK + : 2b_dec-7 ... OK + : 2b_dec-8 ... FAILED (hexdump/highlighting-2b_dec-8) + : 4b_dec-1 ... FAILED (hexdump/highlighting-4b_dec-1) + : 4b_dec-2 ... FAILED (hexdump/highlighting-4b_dec-2) + : 4b_dec-3 ... FAILED (hexdump/highlighting-4b_dec-3) + : 4b_dec-4 ... FAILED (hexdump/highlighting-4b_dec-4) + : 4b_dec-5 ... OK + : 4b_dec-6 ... FAILED (hexdump/highlighting-4b_dec-6) + : 4b_dec-7 ... FAILED (hexdump/highlighting-4b_dec-7) + ... FAILED (19 from 29 sub-tests) + + script: $(SOURCE_DIR)/tests/ts/tailf/simple + sub dir: $(SOURCE_DIR)/tests/ts/tailf + top dir: $(SOURCE_DIR)/tests + self: $(SOURCE_DIR)/tests/ts/tailf + test name: simple + test desc: simple + component: tailf + namespace: tailf/simple + verbose: yes + output: $(SOURCE_DIR)/tests/output/tailf/simple + valgrind: $(SOURCE_DIR)/tests/output/tailf/simple.vgdump + expected: $(SOURCE_DIR)/tests/expected/tailf/simple + mountpoint: $(SOURCE_DIR)/tests/output/tailf/simple-mnt + + tailf: simple ... OK + +--------------------------------------------------------------------- + 3 tests of 8 FAILED +---------------------------------------------------------------------