# HG changeset patch
# User XINGSZHA <erich.zhang@oracle.com>
# Date 1393959256 28800
# Node ID 47287ed9c79c77c2ec2b42b222565efa8185027e
# Parent  60456e7be821b5085754cbd98bcae581a08addc9
18141171 gnupg, libidn, nmap, openexr, pinentry and rtorrent need ASLR enabled.

diff -r 60456e7be821 -r 47287ed9c79c components/gnupg/Makefile
--- a/components/gnupg/Makefile	Thu Feb 27 07:51:20 2014 -0800
+++ b/components/gnupg/Makefile	Tue Mar 04 10:54:16 2014 -0800
@@ -100,6 +100,8 @@
 
 MAN8LIST = addgnupghome applygnupgdefaults
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 build: $(BUILD_32)
 
 install: $(INSTALL_32)
diff -r 60456e7be821 -r 47287ed9c79c components/libidn/Makefile
--- a/components/libidn/Makefile	Thu Feb 27 07:51:20 2014 -0800
+++ b/components/libidn/Makefile	Tue Mar 04 10:54:16 2014 -0800
@@ -18,7 +18,7 @@
 #
 # 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
 
@@ -113,6 +113,8 @@
 	    $(FIND) ./lib -type f -name "*.pl" -exec touch -acm {} + ; \
 	    $(FIND) ./lib -type f -name "*.pl" -exec chmod 0755 {} + )
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 build: $(BUILD_32_and_64)
 
 install: $(INSTALL_32_and_64)
diff -r 60456e7be821 -r 47287ed9c79c components/nmap/Makefile
--- a/components/nmap/Makefile	Thu Feb 27 07:51:20 2014 -0800
+++ b/components/nmap/Makefile	Tue Mar 04 10:54:16 2014 -0800
@@ -20,7 +20,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.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -70,6 +70,8 @@
         $(GSED) -i -e 's?env python?python2.6?' \
                 $(PROTOUSRBINDIR)/uninstall_zenmap
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 build:		$(BUILD_32)
 		
diff -r 60456e7be821 -r 47287ed9c79c components/openexr/Makefile
--- a/components/openexr/Makefile	Thu Feb 27 07:51:20 2014 -0800
+++ b/components/openexr/Makefile	Tue Mar 04 10:54:16 2014 -0800
@@ -18,7 +18,7 @@
 #
 # 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
 
@@ -58,6 +58,8 @@
 CONFIGURE_OPTIONS  +=           --enable-posix-sem
 CONFIGURE_OPTIONS  +=           --with-pic
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 build: $(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
diff -r 60456e7be821 -r 47287ed9c79c components/pinentry/Makefile
--- a/components/pinentry/Makefile	Thu Feb 27 07:51:20 2014 -0800
+++ b/components/pinentry/Makefile	Tue Mar 04 10:54:16 2014 -0800
@@ -18,7 +18,7 @@
 #
 # 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
 
@@ -78,6 +78,8 @@
 CONFIGURE_OPTIONS  +=		--disable-pinentry-qt
 CONFIGURE_OPTIONS  +=		--disable-ncurses
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 build: $(BUILD_32)
 
 install: $(INSTALL_32)
diff -r 60456e7be821 -r 47287ed9c79c components/rtorrent/Makefile
--- a/components/rtorrent/Makefile	Thu Feb 27 07:51:20 2014 -0800
+++ b/components/rtorrent/Makefile	Tue Mar 04 10:54:16 2014 -0800
@@ -20,7 +20,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.
 #
 
 # we really need to use studio, mostly because that's what
@@ -69,6 +69,7 @@
 CONFIGURE_OPTIONS +=		LDFLAGS="$(LDFLAGS)"
 CONFIGURE_OPTIONS +=		CXXFLAGS="$(CXXFLAGS)"
 
+ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
 build:		$(BUILD_32)