Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23564683 Update text-utilities to version 2.28
authorRich Burridge <rich.burridge@oracle.com>
Thu, 16 Jun 2016 06:52:10 -0700
changeset 6229 df01c95b47c5
parent 6228 37f9819bc49d
child 6230 126ac13f1547
23564683 Update text-utilities to version 2.28
components/text-utilities/Makefile file | annotate | diff | comparison | revisions
components/text-utilities/patches/colors.c.patch file | annotate | diff | comparison | revisions
components/text-utilities/patches/localization-changes.patch file | annotate | diff | comparison | revisions
components/text-utilities/patches/parse.c.patch file | annotate | diff | comparison | revisions 
--- a/components/text-utilities/Makefile	Thu Jun 16 13:48:33 2016 +0100
+++ b/components/text-utilities/Makefile	Thu Jun 16 06:52:10 2016 -0700
@@ -22,19 +22,20 @@
 #
 # Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+COMPILER= gcc
 BUILD_BITS= 64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		text-utilities
-COMPONENT_VERSION=	2.25.2
+COMPONENT_VERSION=	2.28
 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:e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6
-COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/v2.25/$(COMPONENT_ARCHIVE)
+    sha256:395847e2a18a2c317170f238892751e73a57104565344f8644090c8b091014bb
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
-TPNO=			21750
+TPNO=			29447
 
 TEST_TARGET= install $(TEST_64)
 SYSTEM_TEST_TARGET= configure $(SYSTEM_TEST_64)
@@ -55,10 +56,6 @@
 # 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=""
-
 # Always show the build and link lines for easier debugging.
 COMPONENT_BUILD_ARGS +=		V=1
 
--- a/components/text-utilities/patches/colors.c.patch	Thu Jun 16 13:48:33 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-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) {
--- a/components/text-utilities/patches/localization-changes.patch	Thu Jun 16 13:48:33 2016 +0100
+++ b/components/text-utilities/patches/localization-changes.patch	Thu Jun 16 06:52:10 2016 -0700
@@ -3,9 +3,9 @@
 
 These changes will not be submitted upstream.
 
---- 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 @@
+--- util-linux-2.28/po/POTFILES.in.orig	2016-06-09 14:25:26.035456587 -0700
++++ util-linux-2.28/po/POTFILES.in	2016-06-09 14:33:37.556681233 -0700
+@@ -1,31 +1,3 @@
 -disk-utils/addpart.c
 -disk-utils/blockdev.c
 -disk-utils/cfdisk.c
@@ -15,6 +15,8 @@
 -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
@@ -33,11 +35,11 @@
 -disk-utils/sfdisk.c
 -disk-utils/swaplabel.c
  include/all-io.h
- include/at.h
  include/bitops.h
-@@ -81,96 +55,6 @@
- include/xgetpass.h
- lib/at.c
+ include/blkdev.h
+@@ -81,97 +53,6 @@
+ include/widechar.h
+ include/xalloc.h
  lib/blkdev.c
 -libblkid/src/blkidP.h
 -libblkid/src/cache.c
@@ -76,6 +78,7 @@
 -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/ext.c
@@ -129,11 +132,11 @@
 -libblkid/src/topology/topology.h
 -libblkid/src/verify.c
 -libblkid/src/version.c
- lib/boottime.c
  lib/canonicalize.c
+ lib/color-names.c
  lib/colors.c
-@@ -179,24 +63,6 @@
- lib/crc64.c
+@@ -179,25 +60,6 @@
+ lib/crc32.c
  lib/env.c
  lib/exec_shell.c
 -libfdisk/src/alignment.c
@@ -146,26 +149,28 @@
 -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/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
  lib/fileutils.c
+ lib/idcache.c
  lib/ismounted.c
- lib/langinfo.c
-@@ -206,30 +72,6 @@
- lib/match.c
+@@ -209,32 +71,6 @@
  lib/mbsalign.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
@@ -175,6 +180,7 @@
 -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
@@ -188,8 +194,8 @@
  lib/pager.c
  lib/path.c
  lib/procutils.c
-@@ -251,115 +93,7 @@
- lib/sysfs.c
+@@ -257,118 +93,6 @@
+ lib/timer.c
  lib/timeutils.c
  lib/ttyutils.c
 -libuuid/src/clear.c
@@ -206,15 +212,15 @@
 -libuuid/src/uuid.h
 -libuuid/src/uuidP.h
 -libuuid/src/uuid_time.c
- lib/xgetpass.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/last-deprecated.c
 -login-utils/libuser.c
 -login-utils/libuser.h
 -login-utils/login.c
@@ -249,6 +255,7 @@
 -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/whereis.c
@@ -268,7 +275,6 @@
 -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
@@ -281,6 +287,8 @@
 -sys-utils/lscpu.c
 -sys-utils/lscpu-dmi.c
 -sys-utils/lscpu.h
+-sys-utils/lsipc.c
+-sys-utils/lsns.c
 -sys-utils/mount.c
 -sys-utils/mountpoint.c
 -sys-utils/nsenter.c
@@ -301,17 +309,18 @@
 -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.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 @@
+--- util-linux-2.28/configure.orig	2016-06-09 14:34:48.346013558 -0700
++++ util-linux-2.28/configure	2016-06-09 14:35:28.581050910 -0700
+@@ -4996,7 +4996,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE='util-linux'
 + PACKAGE='text-utilities'
-  VERSION='2.25.2'
+  VERSION='2.28'
  
  
--- a/components/text-utilities/patches/parse.c.patch	Thu Jun 16 13:48:33 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-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.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;
- 
- 	list_for_each (p, &fs->fulist) {
-@@ -301,9 +301,10 @@
- 				goto isint;
- 			} else if (first_letter(cs, "ouxX")) {
- 				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:
- 						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);
upstream/oracle/userland-gate