16734056 Make antlr ASLR enabled
authorBrian Cameron <brian.cameron@oracle.com>
Wed, 15 May 2013 12:38:01 -0700
changeset 1303 79b691ffbda3
parent 1302 4838d241e95c
child 1304 428fd83fdeb2
16734056 Make antlr ASLR enabled 16734059 Doxygen needs to be 64-bit and have ASLR enabled 16734063 librsync needs ASLR enabled 16734067 Need to make libsndfile ASLR enabled. 16734069 MC needs to be made 64-bit 16734074 spawn-fcgi needs to be made 64-bit and be ASLR enabled 16734080 Make Python 2.6, Python 2.7, cssutils, PIL, simplejson & twiste d ASLR enabled.
components/antlr/Makefile
components/doxygen/Makefile
components/doxygen/patches/doxygen1.patch
components/librsync/Makefile
components/libsndfile/Makefile
components/mc/Makefile
components/mc/mc.p5m
components/python/cssutils/Makefile
components/python/imaging/Makefile
components/python/python26/Makefile
components/python/python27/Makefile
components/python/simplejson/Makefile
components/python/twisted/Makefile
components/spawn-fcgi/Makefile
components/spawn-fcgi/spawn-fcgi.p5m
--- a/components/antlr/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/antlr/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# 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
@@ -62,6 +62,8 @@
 
 COMPONENT_TEST_TARGETS = test
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 build:          $(BUILD_32)
 
--- a/components/doxygen/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/doxygen/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -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
 
@@ -50,14 +50,16 @@
 
 # Need to override default options since configure doesn't
 # understand CC, CXX, etc.
-CONFIGURE_OPTIONS =	--platform solaris-cc
+CONFIGURE_OPTIONS =	--platform solaris-cc-64
 CONFIGURE_OPTIONS +=	--prefix /usr
 CONFIGURE_OPTIONS +=	--enable-langs nl,sv,cz,fr,id,it,de,jp,je,es,fi,ru,hr,pl,pt,hu,kr,ke,ro,si,cn,no,br,dk,sk,ua,gr,tw,sr,ca,lt,za,ar,fa
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 	cd $(PROTO_DIR) ; $(UNPACK) ../../../$(COMPONENT_ARCHIVE_1) 
 
 test:	$(NO_TESTS)
--- a/components/doxygen/patches/doxygen1.patch	Tue May 14 22:57:32 2013 -0700
+++ b/components/doxygen/patches/doxygen1.patch	Wed May 15 12:38:01 2013 -0700
@@ -29,3 +29,23 @@
  TMAKE_LFLAGS_RELEASE	=
  TMAKE_LFLAGS_DEBUG	=
  TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
+--- doxygen-1.7.6.1/tmake/lib/solaris-cc-64/tmake.conf-orig	2013-03-26 19:19:25.644626673 -0500
++++ doxygen-1.7.6.1/tmake/lib/solaris-cc-64/tmake.conf	2013-03-26 19:22:10.411978779 -0500
[email protected]@ -17,7 +17,7 @@ TMAKE_CFLAGS_SHLIB	= -KPIC
+ TMAKE_CFLAGS_YACC	=
+ 
+ TMAKE_CXX		= CC
+-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
++TMAKE_CXXFLAGS		= -norunpath -D__USE_LEGACY_PROTOTYPES__ -m64
+ TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
+ TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
+ TMAKE_CXXFLAGS_RELEASE	= -xO2
[email protected]@ -37,7 +37,7 @@ TMAKE_LIBDIR_OPENGL	=
+ TMAKE_LINK		= CC
+ # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
+ TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
+-TMAKE_LFLAGS		= -64 -xtarget=generic64
++TMAKE_LFLAGS		= -norunpath -m64
+ TMAKE_LFLAGS_RELEASE	=
+ TMAKE_LFLAGS_DEBUG	=
+ TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
--- a/components/librsync/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/librsync/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -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
 
@@ -63,6 +63,8 @@
 
 PATCH_LEVEL = 1
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 build: $(BUILD_32_and_64)
 
 install: $(INSTALL_32_and_64)
--- a/components/libsndfile/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/libsndfile/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -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_ENV +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_ENV +=	CXXFLAGS="$(CXXFLAGS)"
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/mc/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/mc/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -54,9 +54,9 @@
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/mc/mc.p5m	Tue May 14 22:57:32 2013 -0700
+++ b/components/mc/mc.p5m	Wed May 15 12:38:01 2013 -0700
@@ -35,7 +35,7 @@
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/202
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/mc
+file usr/bin/$(MACH64)/mc path=usr/bin/mc
 file ABOUT-NLS path=usr/share/doc/mc/ABOUT-NLS
 file AUTHORS path=usr/share/doc/mc/AUTHORS
 file COPYING path=usr/share/doc/mc/COPYING
--- a/components/python/cssutils/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/python/cssutils/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -39,6 +39,9 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+COMPONENT_TEST_DIR= $(COMPONENT_SRC)
+COMPONENT_TEST_ARGS= ./setup.py test
+
 # Remove the trailing Control-M's from the Python source files.
 COMPONENT_PRE_BUILD_ACTION = \
 	/usr/bin/find $(SOURCE_DIR)/src \
@@ -68,11 +71,14 @@
 	(cd $(SOURCE_DIR); $(RM) -r src ; $(CP) -rp src-$(PYTHON_VERSION) src )
 
 # common targets
+# This module delivers pure Python, so only 32-bit is built as the same is used
+# for both 32-bit and 64-bit.  We test both 32-bit and 64-bit, though.
+#
 build:          $(BUILD_32)
 
 install:        $(INSTALL_32)
 
-test:           $(NO_TESTS)
+test:           $(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
--- a/components/python/imaging/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/python/imaging/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -39,12 +39,21 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+TEST_PYTHONPATH.32 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL
+TEST_PYTHONPATH.64 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL:$(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL/64
+
+COMPONENT_TEST_DIR= $(COMPONENT_SRC)
+COMPONENT_TEST_ARGS= ./selftest.py
+COMPONENT_TEST_ENV= PYTHONPATH=$(TEST_PYTHONPATH.$(BITS))
+
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 build:          $(BUILD_32_and_64)
 
 install:        $(INSTALL_32_and_64)
 
-test:           $(NO_TESTS)
+test:           $(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
--- a/components/python/python26/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/python/python26/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -113,6 +113,8 @@
              $(MV) include/python2.6/pyconfig.h include/python2.6/pyconfig-$(BITS).h ; \
              $(TOUCH) lib/python2.6/lib2to3/*.pickle)
                 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 $(INSTALL_32):  $(INSTALL_64)
 build:		$(BUILD_32_and_64)
--- a/components/python/python27/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/python/python27/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -118,6 +118,8 @@
              $(MV) include/python2.7/pyconfig.h include/python2.7/pyconfig-$(BITS).h ; \
              $(TOUCH) lib/python2.7/lib2to3/*.pickle)
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 $(INSTALL_32):  $(INSTALL_64)
 build:		$(BUILD_32_and_64)
--- a/components/python/simplejson/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/python/simplejson/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -39,12 +39,17 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+COMPONENT_TEST_DIR= $(COMPONENT_SRC) 
+COMPONENT_TEST_ARGS= ./setup.py test
+
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 build:          $(BUILD_32_and_64)
 
 install:        $(INSTALL_32_and_64)
 
-test:           $(NO_TESTS)
+test:           $(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
--- a/components/python/twisted/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/python/twisted/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -39,6 +39,12 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+COMPONENT_TEST_DIR= $(COMPONENT_SRC) 
+COMPONENT_TEST_CMD= $(@D)/scripts-2.6/trial twisted
+COMPONENT_TEST_ARGS=""
+
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 build:          $(BUILD_32_and_64)
 
@@ -51,7 +57,7 @@
 # $ ../build/i86-2.6/scripts-2.6/trial twisted
 # $ ../build/i86-2.7/scripts-2.7/trial twisted
 #
-test:           $(NO_TESTS)
+test:           $(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
--- a/components/spawn-fcgi/Makefile	Tue May 14 22:57:32 2013 -0700
+++ b/components/spawn-fcgi/Makefile	Wed May 15 12:38:01 2013 -0700
@@ -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
@@ -39,11 +39,14 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+CONFIGURE_ENV +=        CFLAGS="$(CFLAGS)"
+
+ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:           $(NO_TESTS)
 
--- a/components/spawn-fcgi/spawn-fcgi.p5m	Tue May 14 22:57:32 2013 -0700
+++ b/components/spawn-fcgi/spawn-fcgi.p5m	Wed May 15 12:38:01 2013 -0700
@@ -35,6 +35,6 @@
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2009/562
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/spawn-fcgi
+file usr/bin/$(MACH64)/spawn-fcgi path=usr/bin/spawn-fcgi
 file path=usr/share/man/man1/spawn-fcgi.1
 license spawn-fcgi.license license=BSD