Mercurial > hg > icedtea6-hg

changeset 2948:6af17f5442ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup pax marking additions from Gentoo and mention in NEWS. 2013-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (.PHONY): Add clean-pax-mark-vm, clean-pax-mark-vm-debug, clean-pax-mark-vm-ecj. (icedtea): Move pax-mark-vm invocation to its own rule. (icedtea-against-icedtea): Depend on pax-mark-vm. (clean-icedtea-against-icedtea): Likewise for clean-pax-mark-vm. (icedtea-debug-against-icedtea): Likewise for pax-mark-vm-debug. (clean-icedtea-debug-against-icedtea): Likewise for clean-pax-mark-vm-debug. (clean-add-archive): Delete the archive. (clean-add-archive-debug): Likewise for debug. (pax-mark-vm): Move pax marking to here. (clean-pax-mark-vm): And remove stamp here. (pax-mark-vm-debug): Pax marking for debug build. (clean-pax-mark-vm-debug): And remove stamp here. (icedtea-ecj): Move pax-mark-vm to its own rule. (icedtea-against-icedtea): Depend on pax-mark-vm-ecj. (clean-icedtea-against-icedtea): Likewise for clean-pax-mark-vm-ecj. (clean-add-archive-ecj): Delete the archive. (pax-mark-vm-ecj): Move ecj pax marking to here. (clean-pax-mark-vm-ecj): And remove stamp here. * acinclude.m4: (IT_CHECK_FOR_PAX): Remove now unused macro. * NEWS: Mention pax marking fixes.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Fri, 25 Jan 2013 21:28:47 +0000
parents 2bb62ac6d345
children f6a0a42bf443
files ChangeLog Makefile.am NEWS acinclude.m4
diffstat 4 files changed, 78 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jan 25 19:48:41 2013 +0000
+++ b/ChangeLog	Fri Jan 25 21:28:47 2013 +0000
@@ -1,3 +1,34 @@
+2013-01-25  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* Makefile.am:
+	(.PHONY): Add clean-pax-mark-vm,
+	clean-pax-mark-vm-debug, clean-pax-mark-vm-ecj.
+	(icedtea): Move pax-mark-vm invocation to
+	its own rule.
+	(icedtea-against-icedtea): Depend on pax-mark-vm.
+	(clean-icedtea-against-icedtea): Likewise for
+	clean-pax-mark-vm.
+	(icedtea-debug-against-icedtea): Likewise for
+	pax-mark-vm-debug.
+	(clean-icedtea-debug-against-icedtea): Likewise for
+	clean-pax-mark-vm-debug.
+	(clean-add-archive): Delete the archive.
+	(clean-add-archive-debug): Likewise for debug.
+	(pax-mark-vm): Move pax marking to here.
+	(clean-pax-mark-vm): And remove stamp here.
+	(pax-mark-vm-debug): Pax marking for debug build.
+	(clean-pax-mark-vm-debug): And remove stamp here.
+	(icedtea-ecj): Move pax-mark-vm to its own rule.
+	(icedtea-against-icedtea): Depend on pax-mark-vm-ecj.
+	(clean-icedtea-against-icedtea): Likewise for
+	clean-pax-mark-vm-ecj.
+	(clean-add-archive-ecj): Delete the archive.
+	(pax-mark-vm-ecj): Move ecj pax marking to here.
+	(clean-pax-mark-vm-ecj): And remove stamp here.
+	* acinclude.m4:
+	(IT_CHECK_FOR_PAX): Remove now unused macro.
+	* NEWS: Mention pax marking fixes.
+
 2012-06-24  Ralph Sennhauser  <sera@gentoo.org>
 
 	* Makefile.am:
--- a/Makefile.am	Fri Jan 25 19:48:41 2013 +0000
+++ b/Makefile.am	Fri Jan 25 21:28:47 2013 +0000
@@ -763,7 +763,8 @@
 	clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
 	clean-add-tzdata-support clean-add-tzdata-support-debug clean-add-systemtap-ecj \
 	clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts \
-	clean-download-hotspot clean-tests clean-tapset-report jtregcheck
+	clean-download-hotspot clean-tests clean-tapset-report jtregcheck clean-pax-mark-vm \
+	clean-pax-mark-vm-debug clean-pax-mark-vm-ecj
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -1507,7 +1508,6 @@
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
 	  $(ICEDTEA_BUILD_TARGET)
-	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
@@ -1566,27 +1566,28 @@
 
 stamps/icedtea-against-icedtea.stamp: stamps/icedtea.stamp \
  stamps/add-jamvm.stamp stamps/add-cacao.stamp stamps/add-zero.stamp \
- stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp stamps/add-tzdata-support.stamp \
- stamps/add-archive.stamp
+ stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp \
+ stamps/add-tzdata-support.stamp stamps/add-archive.stamp stamps/pax-mark-vm.stamp
 	mkdir -p stamps
 	touch stamps/icedtea-against-icedtea.stamp
 
 clean-icedtea-against-icedtea: clean-add-jamvm clean-add-zero clean-add-cacao \
  clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support \
- clean-add-archive
+ clean-add-archive clean-pax-mark-vm
 	rm -f stamps/icedtea-against-icedtea.stamp
 
 stamps/icedtea-debug-against-icedtea.stamp: stamps/icedtea-debug.stamp \
  stamps/add-jamvm-debug.stamp stamps/add-cacao-debug.stamp \
  stamps/add-zero-debug.stamp stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \
- stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp stamps/add-archive-debug.stamp
+ stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp stamps/add-archive-debug.stamp \
+ stamps/pax-mark-vm-debug.stamp
 	mkdir -p stamps
 	touch stamps/icedtea-debug-against-icedtea.stamp
 
 clean-icedtea-debug-against-icedtea: clean-add-zero-debug \
  clean-add-jamvm-debug clean-add-cacao-debug clean-add-systemtap-debug \
  clean-add-pulseaudio-debug clean-add-nss-debug clean-add-tzdata-support-debug \
- clean-add-archive-debug
+ clean-add-archive-debug clean-pax-mark-vm-debug
 	rm -f stamps/icedtea-debug-against-icedtea.stamp
 
 stamps/add-systemtap.stamp: stamps/icedtea.stamp
@@ -1839,6 +1840,7 @@
 	touch stamps/add-archive.stamp
 
 clean-add-archive:
+	rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
 	rm -f stamps/add-archive.stamp
 
 stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
@@ -1852,8 +1854,27 @@
 	touch stamps/add-archive-debug.stamp
 
 clean-add-archive-debug:
+	rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
 	rm -f stamps/add-archive-debug.stamp
 
+stamps/pax-mark-vm.stamp: stamps/icedtea.stamp
+if WITH_PAX
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
+endif
+	touch $@
+
+clean-pax-mark-vm:
+	rm -f stamps/pax-mark-vm.stamp
+
+stamps/pax-mark-vm-debug.stamp: stamps/icedtea-debug.stamp
+if WITH_PAX
+	$(abs_top_builddir)/pax-mark-vm $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image
+endif
+	touch $@
+
+clean-pax-mark-vm-debug:
+	rm -f stamps/pax-mark-vm-debug.stamp
+
 # OpenJDK ecj Targets
 # ===================
 
@@ -1864,7 +1885,6 @@
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/ \
 	  $(ICEDTEA_BUILD_TARGET)
-	$(abs_top_builddir)/pax-mark-vm $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
 	@echo "ecj-poured IcedTea is served:" \
 	  $(ECJ_BUILD_OUTPUT_DIR)
 	mkdir -p stamps
@@ -1876,12 +1896,12 @@
 
 stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp stamps/add-systemtap-ecj.stamp \
  stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp \
- stamps/add-archive-ecj.stamp
+ stamps/add-archive-ecj.stamp stamps/pax-mark-vm-ecj.stamp
 	mkdir -p stamps
 	touch stamps/icedtea-against-ecj.stamp
 
 clean-icedtea-against-ecj: clean-add-systemtap-ecj clean-add-pulseaudio-ecj clean-add-nss-ecj \
- clean-add-tzdata-support-ecj clean-add-archive-ecj
+ clean-add-tzdata-support-ecj clean-add-archive-ecj clean-pax-mark-vm-ecj
 	rm -f stamps/icedtea-against-ecj.stamp
 
 stamps/add-systemtap-ecj.stamp: stamps/icedtea-ecj.stamp
@@ -2015,8 +2035,18 @@
 	touch stamps/add-archive-ecj.stamp
 
 clean-add-archive-ecj:
+	rm -vf $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
 	rm -f stamps/add-archive-ecj.stamp
 
+stamps/pax-mark-vm-ecj.stamp: stamps/icedtea-ecj.stamp
+if WITH_PAX
+	$(abs_top_builddir)/pax-mark-vm $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
+endif
+	touch $@
+
+clean-pax-mark-vm-ecj:
+	rm -f stamps/pax-mark-vm-ecj.stamp
+
 # Rebuild targets
 
 rebuild:
@@ -2680,6 +2710,12 @@
 
 patch-fsg: stamps/patch-fsg.stamp
 
+pax-mark-vm: stamps/pax-mark-vm.stamp
+
+pax-mark-vm-debug: stamps/pax-mark-vm-debug.stamp
+
+pax-mark-vm-ecj: stamps/pax-mark-vm-ecj.stamp
+
 pulse-java: stamps/pulse-java.stamp
 
 rewriter: stamps/rewriter.stamp
--- a/NEWS	Fri Jan 25 19:48:41 2013 +0000
+++ b/NEWS	Fri Jan 25 21:28:47 2013 +0000
@@ -57,6 +57,7 @@
   - PR1114: Provide option to turn off downloading of tarballs (--disable-downloading)
   - PR1176: Synchronise CACAO rules between IcedTea6/7/8 where possible
   - RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive
+  - G422525: Apply pax markings before using a freshly built JVM.
 * CACAO
   - PR1120: Unified version for icedtea6/7
   - CA166, CA167: check-langtools fixes for icedtea6
--- a/acinclude.m4	Fri Jan 25 19:48:41 2013 +0000
+++ b/acinclude.m4	Fri Jan 25 21:28:47 2013 +0000
@@ -1708,18 +1708,6 @@
 AC_CONFIG_FILES([nss.cfg])
 ])
 
-AC_DEFUN_ONCE([IT_CHECK_FOR_PAX],[
-AC_CACHE_CHECK([if a PaX-enabled kernel is running], it_cv_pax, [
-if grep '^PaX:' /proc/self/status >&AS_MESSAGE_LOG_FD 2>&1; then
-  it_cv_pax=yes;
-else
-  it_cv_pax=no;
-fi
-])
-AM_CONDITIONAL([HAS_PAX], test x"${it_cv_pax}" = "xyes")
-AC_PROVIDE([$0])dnl
-])
-
 AC_DEFUN([IT_JAVAH],[
 AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
 AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [