16426977 Numerous components in Userland need to have ASLR enabled.
--- a/components/aalib/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/aalib/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -60,6 +60,8 @@
CONFIGURE_ENV += CC="$(CC)"
CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32_and_64)
--- a/components/conflict/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/conflict/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -53,6 +53,8 @@
CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX)
CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32)
--- a/components/diffutils/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/diffutils/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -44,6 +44,8 @@
CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32)
--- a/components/elinks/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/elinks/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -41,6 +41,8 @@
CONFIGURE_OPTIONS += --enable-256-colors
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32)
--- a/components/findutils/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/findutils/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -47,6 +47,8 @@
# field is incorrect on ZFS file systems.
CONFIGURE_OPTIONS += --disable-leaf-optimisation
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_64)
--- a/components/fping/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/fping/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -45,6 +45,7 @@
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
+ASLR_MODE = $(ASLR_ENABLE)
# common targets
build: $(BUILD_32)
--- a/components/gzip/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/gzip/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -82,6 +82,8 @@
$(GZGREP_MAN_VARIANTS):
$(RM) $@; echo ".so man1/gzgrep.1" > $@
+ASLR_MODE = $(ASLR_ENABLE)
+
build: $(BUILD_64)
install: $(INSTALL_64) $(GZGREP_MAN_VARIANTS)
--- a/components/hexedit/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/hexedit/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -46,6 +46,7 @@
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
+ASLR_MODE = $(ASLR_ENABLE)
# common targets
build: $(BUILD_32)
--- a/components/libconfuse/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/libconfuse/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -44,6 +44,8 @@
# This is really only needed to get the test target to pass.
COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32_and_64)
--- a/components/libdnet/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/libdnet/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -53,6 +53,8 @@
# Uncomment if you have the Check unit testing framework installed.
#CONFIGURE_OPTIONS += --with-check=/usr
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32_and_64)
--- a/components/links/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/links/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -43,6 +43,8 @@
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS) -xstrconst -Dinline"
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32)
--- a/components/pv/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/pv/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -50,6 +50,8 @@
COMPONENT_TEST_ENV += PATH="$(GNUBIN):$(PATH)"
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32)
--- a/components/swig/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/swig/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -46,6 +46,8 @@
CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)"
CONFIGURE_OPTIONS += --with-javaincl="$(JAVA_HOME)/include"
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32)
--- a/components/tidy/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/tidy/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -61,6 +61,8 @@
$(PROTODOCDIR):
$(MKDIR) $@
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32_and_64)
--- a/components/unrar/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/unrar/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -57,6 +57,8 @@
COMPONENT_BUILD_ARGS += -f makefile.unix
COMPONENT_BUILD_ARGS += STRIP="/bin/true"
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32)
--- a/components/wdiff/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/wdiff/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -43,6 +43,8 @@
COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"
+ASLR_MODE = $(ASLR_ENABLE)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/xz/Makefile Mon Mar 04 11:37:14 2013 -0800
+++ b/components/xz/Makefile Mon Mar 04 11:55:18 2013 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -38,6 +38,8 @@
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32_and_64)