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.
24427879 Update diffutils to version 3.4
authorRich Burridge <rich.burridge@oracle.com>
Wed, 10 Aug 2016 20:20:39 -0700
changeset 6605 e78549f380cd
parent 6604 cd700b33a402
child 6606 eedbf7a8bfd5
24427879 Update diffutils to version 3.4
components/diffutils/Makefile file | annotate | diff | comparison | revisions
components/diffutils/diffutils.license file | annotate | diff | comparison | revisions
components/diffutils/diffutils.p5m file | annotate | diff | comparison | revisions
components/diffutils/test/results-64.master file | annotate | diff | comparison | revisions 
--- a/components/diffutils/Makefile	Wed Aug 10 18:29:42 2016 -0700
+++ b/components/diffutils/Makefile	Wed Aug 10 20:20:39 2016 -0700
@@ -27,13 +27,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		diffutils
-COMPONENT_VERSION=	3.3
+COMPONENT_VERSION=	3.4
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c
+    sha256:db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2
 COMPONENT_BUGDB=	utility/gnu-diffutils
 
-TPNO=			21995
+TPNO=			30940
 
 SYSTEM_TEST_TARGET= configure $(SYSTEM_TEST_64)
 include $(WS_MAKE_RULES)/gnu-component.mk
--- a/components/diffutils/diffutils.license	Wed Aug 10 18:29:42 2016 -0700
+++ b/components/diffutils/diffutils.license	Wed Aug 10 20:20:39 2016 -0700
@@ -1,4 +1,4 @@
-GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
@@ -673,7 +673,6 @@
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
-Copy of GNU Free Documentation License, Version 1.3
 
                 GNU Free Documentation License
                  Version 1.3, 3 November 2008
@@ -1077,19 +1076,19 @@
 "Massive Multiauthor Collaboration" (or "MMC") contained in the site
 means any set of copyrightable works thus published on the MMC site.
 
-"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 
-license published by Creative Commons Corporation, a not-for-profit 
-corporation with a principal place of business in San Francisco, 
-California, as well as future copyleft versions of that license 
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
 published by that same organization.
 
-"Incorporate" means to publish or republish a Document, in whole or in 
+"Incorporate" means to publish or republish a Document, in whole or in
 part, as part of another Document.
 
-An MMC is "eligible for relicensing" if it is licensed under this 
-License, and if all works that were first published under this License 
-somewhere other than this MMC, and subsequently incorporated in whole or 
-in part into the MMC, (1) had no cover texts or invariant sections, and 
+An MMC is "eligible for relicensing" if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole or
+in part into the MMC, (1) had no cover texts or invariant sections, and
 (2) were thus incorporated prior to November 1, 2008.
 
 The operator of an MMC Site may republish an MMC contained in the site
--- a/components/diffutils/diffutils.p5m	Wed Aug 10 18:29:42 2016 -0700
+++ b/components/diffutils/diffutils.p5m	Wed Aug 10 20:20:39 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -68,6 +68,7 @@
 file path=usr/share/locale/ja/LC_MESSAGES/diffutils.mo
 file path=usr/share/locale/lv/LC_MESSAGES/diffutils.mo
 file path=usr/share/locale/ms/LC_MESSAGES/diffutils.mo
+file path=usr/share/locale/nb/LC_MESSAGES/diffutils.mo
 file path=usr/share/locale/nl/LC_MESSAGES/diffutils.mo
 file path=usr/share/locale/pl/LC_MESSAGES/diffutils.mo
 file path=usr/share/locale/pt_BR/LC_MESSAGES/diffutils.mo
--- a/components/diffutils/test/results-64.master	Wed Aug 10 18:29:42 2016 -0700
+++ b/components/diffutils/test/results-64.master	Wed Aug 10 20:20:39 2016 -0700
@@ -1,21 +1,27 @@
 PASS: basic
+PASS: bignum
 PASS: binary
+brief-vs-stat-zero-kernel-lies: skipped test: no /proc/cmdline file
+SKIP: brief-vs-stat-zero-kernel-lies
 PASS: colliding-file-names
 PASS: excess-slash
 PASS: help-version
 PASS: function-line-vs-leading-space
+PASS: ignore-matching-lines
 PASS: label-vs-func
 PASS: new-file
 PASS: no-dereference
 PASS: no-newline-at-eof
 PASS: stdin
+PASS: strcoll-0-names
 PASS: filename-quoting
-============================================================================
-Testsuite summary for GNU diffutils 3.3
+PASS: colors
 ============================================================================
-# TOTAL: 12
-# PASS:  12
-# SKIP:  0
+Testsuite summary for GNU diffutils 3.4
+============================================================================
+# TOTAL: 17
+# PASS:  16
+# SKIP:  1
 # XFAIL: 0
 # FAIL:  0
 # XPASS: 0
upstream/oracle/userland-gate