22393841 migrate patchutils to Userland
authorDanek Duvall <danek.duvall@oracle.com>
Tue, 05 Jan 2016 13:09:17 -0800
changeset 5241 21a30e6ac5fd
parent 5240 6c0884f75bd9
child 5242 d5e2c756f63c
22393841 migrate patchutils to Userland
components/patchutils/Makefile
components/patchutils/patches/tests.patch
components/patchutils/patchutils.license-LGPLv2.1
components/patchutils/patchutils.p5m
components/patchutils/test/results-64.master
doc/testing.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/patchutils/Makefile	Tue Jan 05 13:09:17 2016 -0800
@@ -0,0 +1,78 @@
+#
+# 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) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		patchutils
+COMPONENT_VERSION=	0.3.1
+IPS_PKG_NAME=		text/patchutils
+COMPONENT_PROJECT_URL=	http://cyberelk.net/tim/patchutils/
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:48d28d4a6fd9922e15ecfd8a152ba5aef6673842c8303337fcaa6b3bb2d129a2
+COMPONENT_ARCHIVE_URL=	http://cyberelk.net/tim/data/patchutils/stable/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	utility/patchutils
+
+TPNO=			9269
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
+
+# Commands go under /usr/bin so set bindir correctly.
+CONFIGURE_BINDIR.64 =	$(CONFIGURE_PREFIX)/bin
+
+ASLR_MODE = $(ASLR_ENABLE)
+
+# A couple of tests dump core, and the message contains the pid
+# A number of failing tests operate on randomly named files
+# Remove the make garbage from the test output
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "/coredump/s/[0-9]*: Abort/XXXX: Abort/"' \
+	'-e "s,\(/var/tmp//.*diff-1\.\)......,\1XXXXXX,"' \
+	'-e "1,/^for test in/{N;d}"' \
+	'-e "/^===/{N;N;q}"'
+
+# common targets
+configure:	$(CONFIGURE_64)
+
+build:		$(BUILD_64)
+
+install:	$(INSTALL_64)
+
+# Note that the gendiff tests will fail on Solaris, because the gendiff utility
+# is missing; this is delivered by rpm.
+test:		$(TEST_64)
+
+system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+
+
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += text/gnu-diffutils
+REQUIRED_PACKAGES += text/gnu-patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/patchutils/patches/tests.patch	Tue Jan 05 13:09:17 2016 -0800
@@ -0,0 +1,377 @@
+Solaris-specific fixes to the tests to either explicitly use the GNU
+variants of shell utilities, or to use the utilities using arguments that
+will work with the Solaris variants.  Not suitable for upstream.
+
+--- patchutils-0.3.1/tests/U3/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/U3/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # This is an interdiff(1) test case.
+ # Test: -U3 works correctly.
+--- patchutils-0.3.1/tests/broken1/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/broken1/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ . ${top_srcdir-.}/tests/common.sh
+ 
+--- patchutils-0.3.1/tests/combine1/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/combine1/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -96,6 +96,6 @@
+ [ -s errors ] && exit 1
+ 
+ # There should be no fuzz.
+-patch file.a-z < patches >fuzz || exit 1
+-[ -s errors ] && exit 1
++${PATCH} file.a-z < patches >fuzz || exit 1
++
+ exit 0
+--- patchutils-0.3.1/tests/common.sh.~1~	Wed Jun 11 03:01:28 2008
++++ patchutils-0.3.1/tests/common.sh	Fri Dec 18 10:36:24 2015
[email protected]@ -1,17 +1,17 @@
+ [ -n "$VERBOSE" ] && set -x
+-rm -rf ${ARENA:=test-arena}
++rm -rf ${ARENA:='test-arena'}
+ mkdir -p $ARENA
+ top_builddir=`cd ${top_builddir-.}; pwd`
+ INTERDIFF=${top_builddir}/src/interdiff
+ REDIFF=${top_builddir}/src/rediff
+-COMBINEDIFF=${top_builddir}/src/combinediff
+-FLIPDIFF=${top_builddir}/src/flipdiff
+-LSDIFF=${top_builddir}/src/lsdiff
+-GREPDIFF=${top_builddir}/src/grepdiff
+-FILTERDIFF=${top_builddir}/src/filterdiff
++COMBINEDIFF="${top_builddir}/src/interdiff --combine"
++FLIPDIFF="${top_builddir}/src/interdiff --flip"
++LSDIFF="${top_builddir}/src/filterdiff --list"
++GREPDIFF="${top_builddir}/src/filterdiff --grep"
++FILTERDIFF="${top_builddir}/src/filterdiff --filter"
+ SELECTDIFF=${top_builddir}/src/selectdiff
+ RECOUNTDIFF=${top_builddir}/recountdiff
+ UNWRAPDIFF=${top_builddir}/unwrapdiff
+-: ${DIFF:=diff}
+-: ${PATCH:=patch -s}
++: ${DIFF:='gdiff'}
++: ${PATCH:='gpatch -s'}
+ cd $ARENA
+--- patchutils-0.3.1/tests/flip1/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip1/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ # Test: Patch2 reduces to nothing after flip.
[email protected]@ -29,7 +29,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip10/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip10/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -27,7 +27,7 @@
+ EOF
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip11/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip11/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -27,7 +27,7 @@
+ EOF
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip12/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip12/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -79,7 +79,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip13/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip13/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -87,7 +87,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip14/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip14/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -32,7 +32,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip15/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip15/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -27,7 +27,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip16/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip16/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -469,7 +469,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip17/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip17/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
+--- patchutils-0.3.1/tests/flip18/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip18/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
+--- patchutils-0.3.1/tests/flip19/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip19/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ # We must give an error in this case, or else complete it successfully.
+--- patchutils-0.3.1/tests/flip2/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip2/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -29,7 +29,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip3/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip3/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -29,7 +29,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip4/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip4/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -53,7 +53,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip5/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip5/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -59,7 +59,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip6/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip6/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -63,7 +63,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip7/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip7/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -63,7 +63,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip8/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip8/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -109,7 +109,7 @@
+ ${DIFF} -u file.orig file > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file.orig
+ +++ file
+--- patchutils-0.3.1/tests/flip9/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/flip9/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a flipdiff(1) testcase.
+ 
[email protected]@ -25,7 +25,7 @@
+ ${DIFF} -u file2.orig file2 > patch2
+ 
+ ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1
+-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
++sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp
+ cmp - patch-cmp << EOF || exit 1
+ --- file2.orig
+ +++ file2
+--- patchutils-0.3.1/tests/nodate/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/nodate/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -20,7 +20,7 @@
+ ${INTERDIFF} -U0 patch1 patch2 2>errors > patch1-2 || exit 1
+ [ -s errors ] && exit 1
+ cat << EOF | cmp - patch1-2 || exit 1
+-diff -U0 file file
++${DIFF} -U0 file file
+ --- file
+ +++ file	Nov 27 2001
+ @@ -36 +36 @@
+--- patchutils-0.3.1/tests/unline1/run-test.~1~	Wed Jul  2 04:11:08 2008
++++ patchutils-0.3.1/tests/unline1/run-test	Fri Dec 18 10:36:24 2015
[email protected]@ -25,7 +25,7 @@
+ [ -s errors ] && exit 1
+ 
+ cmp - patch1-2 << EOF || exit 1
+-diff -u file file
++${DIFF} -u file file
+ --- file
+ +++ file
+ @@ -1 +1 @@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/patchutils/patchutils.license-LGPLv2.1	Tue Jan 05 13:09:17 2016 -0800
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/patchutils/patchutils.p5m	Tue Jan 05 13:09:17 2016 -0800
@@ -0,0 +1,73 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+#
+set name=pkg.fmri \
+    value=pkg:/text/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="A collection of programs for manipulating patch files"
+set name=com.oracle.info.description \
+    value="This is a collection of programs that can manipulate patch files in a variety of ways, such as interpolating between two pre-patches, combining two incremental patches, fixing line numbers in hand-edited patches, and simply listing the files modified by a patch."
+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 value="Tim Waugh <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/770
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+link path=usr/bin/combinediff target=interdiff
+file path=usr/bin/dehtmldiff
+file path=usr/bin/editdiff
+file path=usr/bin/espdiff
+file path=usr/bin/filterdiff
+file path=usr/bin/fixcvsdiff
+link path=usr/bin/flipdiff target=interdiff
+link path=usr/bin/grepdiff target=filterdiff
+file path=usr/bin/interdiff
+link path=usr/bin/lsdiff target=filterdiff
+file path=usr/bin/recountdiff
+file path=usr/bin/rediff
+file path=usr/bin/splitdiff
+file path=usr/bin/unwrapdiff
+file path=usr/share/man/man1/combinediff.1
+file path=usr/share/man/man1/dehtmldiff.1
+file path=usr/share/man/man1/editdiff.1
+file path=usr/share/man/man1/espdiff.1
+file path=usr/share/man/man1/filterdiff.1
+file path=usr/share/man/man1/fixcvsdiff.1
+file path=usr/share/man/man1/flipdiff.1
+file path=usr/share/man/man1/grepdiff.1
+file path=usr/share/man/man1/interdiff.1
+file path=usr/share/man/man1/lsdiff.1
+file path=usr/share/man/man1/recountdiff.1
+file path=usr/share/man/man1/rediff.1
+file path=usr/share/man/man1/splitdiff.1
+file path=usr/share/man/man1/unwrapdiff.1
+#
+license COPYING license=GPLv2
+license patchutils.license-LGPLv2.1 license=LGPLv2.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/patchutils/test/results-64.master	Tue Jan 05 13:09:17 2016 -0800
@@ -0,0 +1,317 @@
+done
+FAIL: tests/newline1/run-test
+PASS: tests/newline2/run-test
+PASS: tests/newline3/run-test
+FAIL: tests/newline4/run-test
+PASS: tests/newline5/run-test
+FAIL: tests/create1/run-test
+PASS: tests/broken1/run-test
+PASS: tests/revert1/run-test
+PASS: tests/revert2/run-test
+FAIL: tests/dashes/run-test
+PASS: tests/dashes1/run-test
+PASS: tests/dashes2/run-test
+PASS: tests/dashes3/run-test
+PASS: tests/dashes4/run-test
+FAIL: tests/linux-2.4.0-test-pre-style/run-test
+FAIL: tests/linux-2.2.17-pre4-5/run-test
+FAIL: tests/linux-2.4.13-ac6-7/run-test
+FAIL: tests/apply1/run-test
+PASS: tests/copy1/run-test
+PASS: tests/edit1/run-test
+$(SOURCE_DIR)/tests/edit2/run-test: line 22: XXXX: Abort(coredump)
+FAIL: tests/edit2/run-test
+PASS: tests/edit3/run-test
+PASS: tests/edit4/run-test
+PASS: tests/edit5/run-test
+PASS: tests/edit6/run-test
+PASS: tests/edit7/run-test
+PASS: tests/edit8/run-test
+PASS: tests/edit9/run-test
+PASS: tests/edit10/run-test
+FAIL: tests/combine1/run-test
+FAIL: tests/combine2/run-test
+FAIL: tests/combine3/run-test
+$(SOURCE_DIR)/tests/gendiff1/run-test[21]: gendiff: not found [No such file or directory]
+$(SOURCE_DIR)/tests/gendiff1/run-test[24]: gendiff: not found [No such file or directory]
+abd test/file differ: char 5, line 3
+FAIL: tests/gendiff1/run-test
+$(SOURCE_DIR)/tests/gendiff2/run-test[21]: gendiff: not found [No such file or directory]
+$(SOURCE_DIR)/tests/gendiff2/run-test[25]: gendiff: not found [No such file or directory]
+abd test/file differ: char 5, line 3
+FAIL: tests/gendiff2/run-test
+$(SOURCE_DIR)/tests/comma/run-test[24]: gendiff: not found [No such file or directory]
+PASS: tests/comma/run-test
+$(SOURCE_DIR)/tests/addhunk1/run-test: line 34: XXXX: Abort(coredump)
+FAIL: tests/addhunk1/run-test
+PASS: tests/addhunk2/run-test
+- rediffed-patch differ: char 92, line 12
+FAIL: tests/addhunk3/run-test
+PASS: tests/delhunk1/run-test
+PASS: tests/delhunk2/run-test
+PASS: tests/delhunk3/run-test
+PASS: tests/delhunk4/run-test
+XPASS: tests/delhunk5/run-test
+PASS: tests/trimcontext1/run-test
+FAIL: tests/nodate/run-test
+PASS: tests/lsdiff1/run-test
+PASS: tests/lsdiff2/run-test
+PASS: tests/lsdiff3/run-test
+PASS: tests/lsdiff4/run-test
+PASS: tests/lsdiff5/run-test
+PASS: tests/lsdiff6/run-test
+PASS: tests/lsdiff7/run-test
+PASS: tests/lsdiff8/run-test
+PASS: tests/lsdiff9/run-test
+PASS: tests/lsdiff10/run-test
+PASS: tests/lsdiff11/run-test
+PASS: tests/lsdiff12/run-test
+PASS: tests/lsdiff13/run-test
+PASS: tests/lsdiff14/run-test
+PASS: tests/lsdiff15/run-test
+Ignoring potentially dangerous file name /var/tmp//interdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//interdiff-1.XXXXXX
+|+++ /var/tmp//interdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+interdiff: Error applying patch1 to reconstructed file
+FAIL: tests/fuzz1/run-test
+FAIL: tests/U0/run-test
+PASS: tests/U3/run-test
+PASS: tests/grepdiff1/run-test
+PASS: tests/grepdiff2/run-test
+PASS: tests/grepdiff3/run-test
+PASS: tests/grepdiff4/run-test
+PASS: tests/grepdiff5/run-test
+PASS: tests/grepdiff6/run-test
+PASS: tests/grepdiff7/run-test
+PASS: tests/number1/run-test
+PASS: tests/number2/run-test
+PASS: tests/nondiff/run-test
+PASS: tests/nondiff1/run-test
+PASS: tests/lscontext1/run-test
+PASS: tests/lscontext2/run-test
+PASS: tests/filterp/run-test
+PASS: tests/select1/run-test
+PASS: tests/select2/run-test
+PASS: tests/select3/run-test
+PASS: tests/select4/run-test
+PASS: tests/select5/run-test
+PASS: tests/select6/run-test
+PASS: tests/select7/run-test
+PASS: tests/select8/run-test
+PASS: tests/select9/run-test
+PASS: tests/select10/run-test
+PASS: tests/select11/run-test
+PASS: tests/preserve1/run-test
+PASS: tests/rediff1/run-test
+PASS: tests/rediff2/run-test
+PASS: tests/recount1/run-test
+PASS: tests/recount2/run-test
+PASS: tests/recount3/run-test
+PASS: tests/recount4/run-test
+PASS: tests/recount5/run-test
+PASS: tests/recount6/run-test
+PASS: tests/unwrapdiff1/run-test
+PASS: tests/overstrip/run-test
+PASS: tests/context1/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip1/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip2/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip3/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip4/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip5/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip6/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip7/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+3 out of 3 hunks ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip8/run-test
+PASS: tests/flip9/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip10/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip11/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+2 out of 2 hunks ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip12/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip13/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip14/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip15/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+2 out of 2 hunks ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip16/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The next patch, when reversed, would delete the file /var/tmp//flipdiff-1.XXXXXX,
+which does not exist!  Ignore -R? [n] 
+Apply anyway? [n] 
+1 out of 1 hunk ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip17/run-test
+Ignoring potentially dangerous file name /var/tmp//flipdiff-1.XXXXXX
+The text leading up to this was:
+--------------------------
+|--- /var/tmp//flipdiff-1.XXXXXX
+|+++ /var/tmp//flipdiff-1.XXXXXX
+--------------------------
+File to patch: 
+Skip this patch? [y] 
+2 out of 2 hunks ignored
+flipdiff: Error reconstructing original file
+FAIL: tests/flip18/run-test
+PASS: tests/flip19/run-test
+FAIL: tests/unline1/run-test
+PASS: tests/nul0/run-test
+PASS: tests/nul1/run-test
+PASS: tests/nul2/run-test
+PASS: tests/nul3/run-test
+PASS: tests/convert1/run-test
+PASS: tests/convert2/run-test
+PASS: tests/clean1/run-test
+================================================================
+38 of 127 tests did not behave as expected (1 unexpected passes)
+================================================================
--- a/doc/testing.txt	Fri Dec 18 11:03:32 2015 -0800
+++ b/doc/testing.txt	Tue Jan 05 13:09:17 2016 -0800
@@ -105,15 +105,15 @@
    $ gmake test
 
 At this point, you have a set of test results in
-components/elinks/test/test-64-results.
+components/elinks/build/test/$(MACH64)/test-64-results.
 
 Even better, there are a set of "global" regular expressions that are
 run on those test results to try to normalize them. The output from that
-is placed in components/elinks/test/results-64.snapshot
+is placed in components/elinks/build/test/$(MACH64)/results-64.snapshot
 
 You can now use the contents of that file as a first cut at the master results.
 
-   $ cp test/results-64.snapshot test/results-64.master
+   $ cp build/test/$(MACH64)/results-64.snapshot test/results-64.master
 
 Now run the tests again. Note that you have to get back to a clean start
 just in case the test process tries to compile any code.
@@ -123,7 +123,7 @@
 
 At this point, it will again compare the test results against the master(s),
 and if there are still differences, they will be placed in
-components/elinks/test/test-64-diffs
+components/elinks/build/test/$(MACH64)/test-64-diffs
 
 Typically these differences will be for things like usernames, temporary
 filenames, timings etc. If you have some differences, then you are going