# HG changeset patch
# User April Chin <april.chin@oracle.com>
# Date 1413838534 25200
# Node ID 840954262ba58b4311549a9247963dfcb10603c3
# Parent  53d60770c45de5055ab19dd968c82b10e6a7bad2
PSARC/2014/324 Update GNU patch to 2.7.1
15623830 SUNBT6927776 upgrade gpatch to 2.7.1
19476034 problem in UTILITY/GPATCH

diff -r 53d60770c45d -r 840954262ba5 components/patch/Makefile
--- a/components/patch/Makefile	Fri Oct 17 12:24:12 2014 -0700
+++ b/components/patch/Makefile	Mon Oct 20 13:55:34 2014 -0700
@@ -18,18 +18,18 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		patch
-COMPONENT_VERSION=	2.5.9
+COMPONENT_VERSION=	2.7.1
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/patch/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a
+    sha256:c05f28668c3474bc63adcd48abae921d15e71c254fbebdbaeda40456d64039d5
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/patch/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/gpatch
 
@@ -39,12 +39,16 @@
 
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
-# common targets
-build:		$(BUILD_32)
+COMPONENT_INSTALL_ARGS += bindir=$(USRBINDIR)
+
+ASLR_MODE = $(ASLR_ENABLE)
 
-install:	$(INSTALL_32)
+# common targets
+build:		$(BUILD_64)
 
-test:		$(NO_TESTS)
+install:	$(INSTALL_64)
+
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
diff -r 53d60770c45d -r 840954262ba5 components/patch/patch.p5m
--- a/components/patch/patch.p5m	Fri Oct 17 12:24:12 2014 -0700
+++ b/components/patch/patch.p5m	Mon Oct 20 13:55:34 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,24 +26,15 @@
     value=pkg:/text/gnu-patch@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The GNU Patch utility"
 set name=com.oracle.info.description value="GNU patch"
-set name=com.oracle.info.tpno value=8588
+set name=com.oracle.info.tpno value=18936
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
-    value=PSARC/1999/555
+    value=PSARC/1999/555 value=PSARC/2014/324
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/gnu
-dir path=usr/gnu/bin
-dir path=usr/gnu/share
-dir path=usr/gnu/share/man
-dir path=usr/gnu/share/man/man1
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
+
 file usr/bin/patch path=usr/gnu/bin/patch
 file usr/share/man/man1/patch.1 path=usr/gnu/share/man/man1/patch.1
 
diff -r 53d60770c45d -r 840954262ba5 components/patch/patches/DESTDIR.patch
--- a/components/patch/patches/DESTDIR.patch	Fri Oct 17 12:24:12 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- patch-2.5.9/Makefile.in.orig	Tue May 20 09:15:48 2003
-+++ patch-2.5.9/Makefile.in	Thu Feb  3 13:41:39 2011
-@@ -112,11 +112,11 @@
- 	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
- 
- install:: all installdirs
--	$(INSTALL_PROGRAM) patch$(EXEEXT) $(bindir)/$(patch_name)$(EXEEXT)
--	-$(INSTALL_DATA) $(srcdir)/patch.man $(man1dir)/$(patch_name)$(man1ext)
-+	$(INSTALL_PROGRAM) patch$(EXEEXT) $(DESTDIR)/$(bindir)/$(patch_name)$(EXEEXT)
-+	-$(INSTALL_DATA) $(srcdir)/patch.man $(DESTDIR)/$(man1dir)/$(patch_name)$(man1ext)
- 
- installdirs::
--	$(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(man1dir)
-+	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(man1dir)
- 
- install-strip::
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install