# HG changeset patch
# User Michael Nestler <Michael.Nestler@Oracle.COM>
# Date 1410295523 25200
# Node ID 17fc4867be167ed2337147089e402e36eedc2c47
# Parent  d2f9b776557ae9126708bfa833f8bf1674f329bc
19581879 p7zip 64-bit and ASLR

diff -r d2f9b776557a -r 17fc4867be16 components/p7zip/Makefile
--- a/components/p7zip/Makefile	Tue Sep 09 14:21:44 2014 -0700
+++ b/components/p7zip/Makefile	Tue Sep 09 13:45:23 2014 -0700
@@ -59,13 +59,15 @@
 $(BUILD_DIR)/copying.txt: $(SOURCE_DIR)/DOCS/copying.txt
 	$(CP) $(SOURCE_DIR)/DOCS/copying.txt $@
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
 EXTRATARGETS = \
 	$(BUILD_DIR)/copying.txt $(BUILD_DIR)/unRarLicense.txt
 
-install:	build $(INSTALL_32) $(EXTRATARGETS)
+install:	build $(INSTALL_64) $(EXTRATARGETS)
 
 # When p7zip's install target is run, it creates all its directories mode 555,
 # so they're impossible to remove without adding the write bit first.
@@ -74,10 +76,10 @@
 COMPONENT_POST_INSTALL_ACTION += $(GSED) -i -e 's/\r//' $(PROTO_DIR)/usr/man/man1/7zr.1
 
 # build does this always
-test:	$(BUILD_32)
-	cd $(BUILD_DIR_32) && $(MAKE) -e test P7ZIP_HOME_DIR=$(BUILD_DIR_32)/bin
-	cd $(BUILD_DIR_32) && $(MAKE) -e test_7z P7ZIP_HOME_DIR=$(BUILD_DIR_32)/bin
-	cd $(BUILD_DIR_32) && $(MAKE) -e test_7zr P7ZIP_HOME_DIR=$(BUILD_DIR_32)/bin
+test:	$(BUILD_64)
+	cd $(BUILD_DIR_64) && $(MAKE) -e test P7ZIP_HOME_DIR=$(BUILD_DIR_64)/bin
+	cd $(BUILD_DIR_64) && $(MAKE) -e test_7z P7ZIP_HOME_DIR=$(BUILD_DIR_64)/bin
+	cd $(BUILD_DIR_64) && $(MAKE) -e test_7zr P7ZIP_HOME_DIR=$(BUILD_DIR_64)/bin
 
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
diff -r d2f9b776557a -r 17fc4867be16 components/p7zip/makefile.solaris
--- a/components/p7zip/makefile.solaris	Tue Sep 09 14:21:44 2014 -0700
+++ b/components/p7zip/makefile.solaris	Tue Sep 09 13:45:23 2014 -0700
@@ -20,14 +20,14 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 OPTFLAGS=-O
 
 LFS_CFLAGS = $(shell getconf LFS_CFLAGS)
 
-ALLFLAGS=${OPTFLAGS} -s -mt \
+ALLFLAGS=${OPTFLAGS} -s -mt -m64 \
         -DHAVE_LONG_LONG \
         $(LFS_CFLAGS) \
         -DENV_UNIX \
diff -r d2f9b776557a -r 17fc4867be16 components/p7zip/p7zip.p5m
--- a/components/p7zip/p7zip.p5m	Tue Sep 09 14:21:44 2014 -0700
+++ b/components/p7zip/p7zip.p5m	Tue Sep 09 13:45:23 2014 -0700
@@ -19,7 +19,7 @@
 #
 
 #
-# 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>
@@ -39,8 +39,11 @@
 file usr/lib/p7zip/7za path=usr/bin/7za
 file usr/lib/p7zip/7zr path=usr/bin/7zr
 file contrib/gzip-like_CLI_wrapper_for_7z/p7zip path=usr/bin/p7zip
-file usr/lib/p7zip/7z.so path=usr/lib/7z/7z.so
-file usr/lib/p7zip/Codecs/Rar29.so path=usr/lib/7z/Codecs/Rar29.so
+# Prevent "64-bit binary in 32-bit path" errors, which don't apply here.
+file usr/lib/p7zip/7z.so path=usr/lib/7z/7z.so \
+    pkg.linted.userland.action001.2=true
+file usr/lib/p7zip/Codecs/Rar29.so path=usr/lib/7z/Codecs/Rar29.so \
+    pkg.linted.userland.action001.2=true
 file path=usr/share/doc/p7zip/ChangeLog
 file path=usr/share/doc/p7zip/DOCS/7zC.txt
 file path=usr/share/doc/p7zip/DOCS/7zFormat.txt