/hg/icedtea: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sat Aug 30 18:16:07 UTC 2014
changeset f12234502198 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f12234502198
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Aug 29 19:06:23 2014 +0100
PR1965: Support kernels that require PaX marking on the JDK binaries.
2014-08-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(icedtea): Fix path to finished image.
(icedtea-debug): Likewise.
(icedtea-boot): Likewise.
2012-05-21 Andrew John Hughes <ahughes at redhat.com>
* AUTHORS: Add Ralph Sennhauser.
2012-02-03 Ralph Sennhauser <sera at gentoo.org>
* Makefile.am:
(icedtea): Run pax-mark-vm on the just-built image.
(icedtea-debug): Likewise.
(icedtea-boot): Likewise.
* acinclude.m4:
(IT_WITH_PAX): Check for a pax command being specified.
* configure.ac:
Call IT_WITH_PAX.
* pax-mark-vm.in:
Script to PaX mark a JDK image.
changeset fdd666c34606 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fdd666c34606
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Aug 29 19:09:40 2014 +0100
PR1965: Update PaX support to detect running PaX kernel and use newer tools
2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1965: Update PaX support to detect running PaX
kernel and use newer tools
* NEWS: Updated.
* acinclude.m4:
(IT_HAS_PAX): New macro to detect whether the running
kernel uses PaX.
(IT_WITH_PAX): Rewritten to search for PaX tools -
currently paxmark.sh, paxctl-ng, chpax and paxctl -
and fail if a tool isn't found and a PaX kernel is
being used.
changeset 701e191f03b9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=701e191f03b9
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Aug 29 19:15:38 2014 +0100
PR1965: Avoid giving PAX_COMMAND a value if no PaX utility is available.
2014-02-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_WITH_PAX): Leave PAX_COMMAND with the empty
string rather than "not specified" to avoid build
failures.
* pax-mark-vm.in: Update PAX_COMMAND check.
changeset d47f0837adbb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d47f0837adbb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Aug 29 19:17:11 2014 +0100
PR1965: Add Gentoo bug reference for PaX update.
2014-02-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Add Gentoo bug reference for
PaX update.
changeset 715fa1507f8d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=715fa1507f8d
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Aug 29 19:20:28 2014 +0100
PR1970: Add bug reference for AArch64 import.
2014-08-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Add bug reference for AArch64 import.
diffstat:
AUTHORS | 1 +
ChangeLog | 54 ++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 11 ++++---
NEWS | 3 +-
acinclude.m4 | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 3 ++
pax-mark-vm.in | 13 ++++++++++
7 files changed, 153 insertions(+), 6 deletions(-)
diffs (249 lines):
diff -r 01f23141787a -r 715fa1507f8d AUTHORS
--- a/AUTHORS Fri Aug 29 03:21:59 2014 +0100
+++ b/AUTHORS Fri Aug 29 19:20:28 2014 +0100
@@ -30,6 +30,7 @@
Bernhard Rosenkränzer <bero at arklinux.org>
Marc Schoenefeld <mschoene at redhat.com>
Keith Seitz <keiths at redhat.com>
+Ralph Sennhauser <sera at gentoo.org>
Yasumasa Suenaga <yasuenag at gmail.com>
Joshua Sumali <jsumali at redhat.com>
Pavel Tisnovsky <ptisnovs at redhat.com>
diff -r 01f23141787a -r 715fa1507f8d ChangeLog
--- a/ChangeLog Fri Aug 29 03:21:59 2014 +0100
+++ b/ChangeLog Fri Aug 29 19:20:28 2014 +0100
@@ -1,3 +1,57 @@
+2014-08-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Add bug reference for AArch64 import.
+
+2014-02-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Add Gentoo bug reference for
+ PaX update.
+
+2014-02-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_WITH_PAX): Leave PAX_COMMAND with the empty
+ string rather than "not specified" to avoid build
+ failures.
+ * pax-mark-vm.in: Update PAX_COMMAND check.
+
+2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1965: Update PaX support to detect running PaX
+ kernel and use newer tools
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_HAS_PAX): New macro to detect whether the running
+ kernel uses PaX.
+ (IT_WITH_PAX): Rewritten to search for PaX tools -
+ currently paxmark.sh, paxctl-ng, chpax and paxctl -
+ and fail if a tool isn't found and a PaX kernel is
+ being used.
+
+2014-08-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (icedtea): Fix path to finished image.
+ (icedtea-debug): Likewise.
+ (icedtea-boot): Likewise.
+
+2012-05-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * AUTHORS: Add Ralph Sennhauser.
+
+2012-02-03 Ralph Sennhauser <sera at gentoo.org>
+
+ * Makefile.am:
+ (icedtea): Run pax-mark-vm on the just-built image.
+ (icedtea-debug): Likewise.
+ (icedtea-boot): Likewise.
+ * acinclude.m4:
+ (IT_WITH_PAX): Check for a pax command being specified.
+ * configure.ac:
+ Call IT_WITH_PAX.
+ * pax-mark-vm.in:
+ Script to PaX mark a JDK image.
+
2014-08-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r 01f23141787a -r 715fa1507f8d Makefile.am
--- a/Makefile.am Fri Aug 29 03:21:59 2014 +0100
+++ b/Makefile.am Fri Aug 29 19:20:28 2014 +0100
@@ -1410,6 +1410,7 @@
$(ICEDTEA_ENV) \
-C $(BUILD_OUTPUT_DIR) \
$(ICEDTEA_BUILD_TARGET)
+ $(abs_top_builddir)/pax-mark-vm $(BUILD_IMAGE_DIR)/j2sdk-image
mkdir -p $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_IMAGE_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/ext
@@ -1463,7 +1464,7 @@
if ENABLE_JAMVM
printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
- @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)/images
+ @echo "IcedTea is served:" $(BUILD_IMAGE_DIR)/j2sdk-image
mkdir -p stamps
touch $@
@@ -1483,6 +1484,7 @@
$(ICEDTEA_ENV) \
-C $(DEBUG_BUILD_OUTPUT_DIR) \
$(ICEDTEA_BUILD_TARGET)
+ $(abs_top_builddir)/pax-mark-vm $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image
mkdir -p $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_DEBUG_IMAGE_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/ext
@@ -1536,8 +1538,7 @@
if ENABLE_JAMVM
printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
- @echo "IcedTea (debug build) is served:" \
- $(DEBUG_BUILD_OUTPUT_DIR)
+ @echo "IcedTea (debug build) is served:" $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image
mkdir -p stamps
touch $@
@@ -1583,8 +1584,8 @@
$(ICEDTEA_ENV_BOOT) \
-C $(BOOT_BUILD_OUTPUT_DIR) \
images
- @echo "Bootstrapped IcedTea is served:" \
- $(BOOT_BUILD_OUTPUT_DIR)/images
+ $(abs_top_builddir)/pax-mark-vm $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image
+ @echo "Bootstrapped IcedTea is served:" $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image
mkdir -p stamps
touch $@
diff -r 01f23141787a -r 715fa1507f8d NEWS
--- a/NEWS Fri Aug 29 03:21:59 2014 +0100
+++ b/NEWS Fri Aug 29 19:20:28 2014 +0100
@@ -45,11 +45,12 @@
- PR1938: Zero broken by enforced use of -Werror
- PR1942: Bug reports lack IcedTea version & distribution packaging information
- PR1950: Add build support for Zero SH
+ - PR1965, G498288: Allow builds on PaX kernels
- Don't substitute 'j' for '-j' inside -I directives
- Extend 8041658 to all files in the HotSpot build.
- Remove jcheck
* AArch64 port
- - Imported from aarch64 jdk8 repository.
+ - PR1970: Imported from aarch64 jdk8 repository.
* JamVM
- JSR 292: Invoke Dynamic
- JSR 308: Type Annotations
diff -r 01f23141787a -r 715fa1507f8d acinclude.m4
--- a/acinclude.m4 Fri Aug 29 03:21:59 2014 +0100
+++ b/acinclude.m4 Fri Aug 29 19:20:28 2014 +0100
@@ -1883,3 +1883,77 @@
AC_MSG_RESULT(${ALT_NASHORN_SRC_ZIP})
AC_SUBST(ALT_NASHORN_SRC_ZIP)
])
+
+AC_DEFUN_ONCE([IT_HAS_PAX],
+[
+ AC_MSG_CHECKING([if a PaX kernel is in use])
+ if cat /proc/self/status | grep '^PaX' >&AS_MESSAGE_LOG_FD 2>&1; then
+ pax_active=yes;
+ else
+ pax_active=no;
+ fi
+ AC_MSG_RESULT([${pax_active}])
+ AM_CONDITIONAL([USING_PAX], test x"${pax_active}" = "xyes")
+])
+
+AC_DEFUN_ONCE([IT_WITH_PAX],
+[
+ AC_REQUIRE([IT_HAS_PAX])
+ PAX_DEFAULT=/usr/sbin/paxmark.sh
+ AC_MSG_CHECKING([if a PaX utility was specified])
+ AC_ARG_WITH([pax],
+ [AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
+ [
+ if test "x${withval}" = "xyes"; then
+ PAX_COMMAND=no
+ else
+ PAX_COMMAND="${withval}"
+ fi
+ ],
+ [
+ PAX_COMMAND=no
+ ])
+ AC_MSG_RESULT(${PAX_COMMAND})
+ if test "x${PAX_COMMAND}" == "xno"; then
+ PAX_COMMAND=${PAX_DEFAULT}
+ fi
+ AC_MSG_CHECKING([if $PAX_COMMAND is a valid executable file])
+ if test -x "${PAX_COMMAND}" && test -f "${PAX_COMMAND}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PAX_COMMAND=""
+ AC_PATH_PROG(PAX_COMMAND, "paxmark.sh")
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl-ng")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "chpax")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ if test "x${pax_active}" = "xyes"; then
+ AC_MSG_ERROR("No PaX utility found and running on a PaX kernel.")
+ else
+ AC_MSG_WARN("No PaX utility found.")
+ fi
+ fi
+ fi
+ if test -n "${PAX_COMMAND}"; then
+ AC_MSG_CHECKING([which options to pass to ${PAX_COMMAND}])
+ case "${host_cpu}" in
+ i?86)
+ PAX_COMMAND_ARGS="-msp"
+ ;;
+ *)
+ PAX_COMMAND_ARGS="-m"
+ ;;
+ esac
+ AC_MSG_RESULT(${PAX_COMMAND_ARGS})
+ fi
+ AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "x")
+ AC_SUBST(PAX_COMMAND)
+ AC_SUBST(PAX_COMMAND_ARGS)
+])
diff -r 01f23141787a -r 715fa1507f8d configure.ac
--- a/configure.ac Fri Aug 29 03:21:59 2014 +0100
+++ b/configure.ac Fri Aug 29 19:20:28 2014 +0100
@@ -144,6 +144,9 @@
IT_ENABLE_HG
IT_WITH_TZDATA_DIR
+IT_WITH_PAX
+AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
+
AC_PATH_TOOL([HG],[hg])
if test "x${enable_hg}" = "xyes"; then
if test "x${HG}" = x; then
diff -r 01f23141787a -r 715fa1507f8d pax-mark-vm.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pax-mark-vm.in Fri Aug 29 19:20:28 2014 +0100
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Taken from Gentoo's pax-utils.eclass
+list_paxables() {
+ file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
+}
+
+if test "x at PAX_COMMAND@" != "x"; then
+ for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
+ echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
+ @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
+ done
+fi
More information about the distro-pkg-dev
mailing list