/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jan 25 13:29:03 PST 2013
changeset 5c657c998832 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5c657c998832
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Jan 25 19:30:32 2013 +0000
Prepare for release.
2013-01-25 Andrew John Hughes <gnu.andrew at redhat.com>
* configure.ac: Set to 1.12.0.
* NEWS: Add release date.
changeset 2bb62ac6d345 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2bb62ac6d345
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Jan 25 19:48:41 2013 +0000
G422525: Apply pax markings before using a freshly built JVM.
2012-06-24 Ralph Sennhauser <sera at gentoo.org>
* Makefile.am:
(ICEDTEA_PATCHES): Replace HAS_PAX with
WITH_PAX. Add RMIC patch.
(icedtea): Invoke pax-mark-vm on built image.
(icedtea-ecj): Likewise.
* acinclude.m4:
(IT_WITH_PAX): New macro to specify pax utility.
* configure.ac:
Call IT_WITH_PAX instead of IT_CHECK_FOR_PAX.
* patches/pax-mark-rmic-java.patch:
New patch to PaX mark VM before running just-built
rmic.
changeset 6af17f5442ff in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6af17f5442ff
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Jan 25 21:28:47 2013 +0000
Cleanup pax marking additions from Gentoo and mention in NEWS.
2013-01-25 Andrew John Hughes <gnu.andrew at 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.
diffstat:
ChangeLog | 51 ++++++++++++++++++++++++++++++++
Makefile.am | 62 ++++++++++++++++++++++++++++++++-------
NEWS | 3 +-
acinclude.m4 | 58 +++++++++++++++++++++++++++++-------
configure.ac | 6 ++-
patches/pax-mark-rmic-java.patch | 10 ++++++
6 files changed, 164 insertions(+), 26 deletions(-)
diffs (343 lines):
diff -r b6442f2ba732 -r 6af17f5442ff ChangeLog
--- a/ChangeLog Fri Jan 25 15:20:00 2013 +0000
+++ b/ChangeLog Fri Jan 25 21:28:47 2013 +0000
@@ -1,3 +1,54 @@
+2013-01-25 Andrew John Hughes <gnu.andrew at 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 at gentoo.org>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Replace HAS_PAX with
+ WITH_PAX. Add RMIC patch.
+ (icedtea): Invoke pax-mark-vm on built image.
+ (icedtea-ecj): Likewise.
+ * acinclude.m4:
+ (IT_WITH_PAX): New macro to specify pax utility.
+ * configure.ac:
+ Call IT_WITH_PAX instead of IT_CHECK_FOR_PAX.
+ * patches/pax-mark-rmic-java.patch:
+ New patch to PaX mark VM before running just-built
+ rmic.
+
+2013-01-25 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * configure.ac: Set to 1.12.0.
+ * NEWS: Add release date.
+
2013-01-25 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Fix bad bug reference caught by
diff -r b6442f2ba732 -r 6af17f5442ff Makefile.am
--- a/Makefile.am Fri Jan 25 15:20:00 2013 +0000
+++ b/Makefile.am Fri Jan 25 21:28:47 2013 +0000
@@ -511,8 +511,10 @@
NSS_PATCHES = patches/nss-not-enabled-config.patch
endif
-if HAS_PAX
-ICEDTEA_PATCHES += patches/no-test_gamma.patch
+if WITH_PAX
+ICEDTEA_PATCHES += \
+ patches/no-test_gamma.patch \
+ patches/pax-mark-rmic-java.patch
endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -547,7 +549,7 @@
endif
endif
-if !HAS_PAX
+if !WITH_PAX
ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch
endif
@@ -761,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'
@@ -1563,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
@@ -1836,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
@@ -1849,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
# ===================
@@ -1872,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
@@ -2011,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:
@@ -2676,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
diff -r b6442f2ba732 -r 6af17f5442ff NEWS
--- a/NEWS Fri Jan 25 15:20:00 2013 +0000
+++ b/NEWS Fri Jan 25 21:28:47 2013 +0000
@@ -10,7 +10,7 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.12 (2012-XX-XX):
+New in release 1.12 (2012-01-25):
* Import of OpenJDK6 b27 (all changes already in security updates)
* Import of OpenJDK6 b26
@@ -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
diff -r b6442f2ba732 -r 6af17f5442ff acinclude.m4
--- a/acinclude.m4 Fri Jan 25 15:20:00 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, [
@@ -1994,3 +1982,49 @@
AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN_ONCE([IT_WITH_PAX],
+[
+ AC_MSG_CHECKING([for pax utility to use])
+ AC_ARG_WITH([pax],
+ [AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
+ [
+ PAX_COMMAND=${withval}
+ if test "x${PAX_COMMAND}" = "xno"; then
+ PAX_COMMAND="not specified"
+ fi
+ ],
+ [
+ PAX_COMMAND="not specified"
+ ])
+ case "x${PAX_COMMAND}" in
+ xchpax)
+ case "${host_cpu}" in
+ i?86)
+ PAX_COMMAND_ARGS="-msp"
+ ;;
+ *)
+ PAX_COMMAND_ARGS="-m"
+ ;;
+ esac
+ ;;
+ xpaxctl)
+ case "${host_cpu}" in
+ i?86)
+ PAX_COMMAND_ARGS="-msp"
+ ;;
+ *)
+ PAX_COMMAND_ARGS="-m"
+ ;;
+ esac
+ ;;
+ *)
+ PAX_COMMAND="not specified"
+ PAX_COMMAND_ARGS="not specified"
+ ;;
+ esac
+ AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
+ AC_MSG_RESULT(${PAX_COMMAND})
+ AC_SUBST(PAX_COMMAND)
+ AC_SUBST(PAX_COMMAND_ARGS)
+])
diff -r b6442f2ba732 -r 6af17f5442ff configure.ac
--- a/configure.ac Fri Jan 25 15:20:00 2013 +0000
+++ b/configure.ac Fri Jan 25 21:28:47 2013 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.12pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.12.0],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
@@ -50,7 +50,6 @@
IT_CHECK_NUMBER_OF_PARALLEL_JOBS
IT_CP_SUPPORTS_REFLINK
IT_CAN_HARDLINK_TO_SOURCE_TREE
-IT_CHECK_FOR_PAX
IT_LOCATE_NSS
IT_DISABLE_TESTS
IT_DISABLE_HOTSPOT_TESTS
@@ -244,6 +243,9 @@
IT_GETDTDTYPE_CHECK
IT_JAVAH
+IT_WITH_PAX
+AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
+
dnl pkgconfig cannot be used to find these headers and libraries.
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
,[AC_MSG_ERROR("CUPS headers were not found -
diff -r b6442f2ba732 -r 6af17f5442ff patches/pax-mark-rmic-java.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pax-mark-rmic-java.patch Fri Jan 25 21:28:47 2013 +0000
@@ -0,0 +1,10 @@
+--- openjdk/jdk/make/com/sun/jmx/Makefile
++++ openjdk/jdk/make/com/sun/jmx/Makefile
+@@ -119,6 +119,7 @@
+
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+ $(prep-target)
++ "$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
+ $(RMIC) -classpath "$(CLASSDESTDIR)" \
+ -d $(CLASSDESTDIR) \
+ -v1.2 \
More information about the distro-pkg-dev
mailing list