/hg/release/icedtea-web-1.0: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Feb 1 15:24:51 PST 2011
changeset 0db0d2392ef2 in /hg/release/icedtea-web-1.0
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=0db0d2392ef2
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 01 21:20:37 2011 +0000
Make check for /jre tree produce output during configure.
2010-02-01 Andrew John Hughes <ahughes at redhat.com>
* configure.ac: Call IT_CHECK_JRE_PREFIX macro
rather than doing so inline.
* acinclude.m4 (IT_CHECK_JRE_PREFIX): Additions from
configure.ac supplemented with configure output
(AC_MSG_CHECKING/AC_MSG_RESULT).
changeset 8e02f38c3b6a in /hg/release/icedtea-web-1.0
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=8e02f38c3b6a
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 01 23:24:46 2011 +0000
Support DESTDIR correctly when installing to an empty directory.
2010-02-01 Andrew John Hughes <ahughes at redhat.com>
Fix issues with use of DESTDIR pointing to an empty
tree for staging.
* Makefile.am: (install-exec-local): Create just bin and
jre/lib for the main (NetX) install, creating
jre/lib/$(INSTALL_ARCH_DIR) only for the plugin install.
Amalgamate the if blocks and test for ${prefix}/jre/bin not
${DESTDIR}${prefix}/jre/bin to ensure we check the installed
JDK and not the staging tree. Move plugin installation to
the end to avoid mkinstalldirs from failing by trying to
create ${DESTDIR}${prefix}/bin a second time.
diffstat:
4 files changed, 52 insertions(+), 22 deletions(-)
ChangeLog | 24 ++++++++++++++++++++++++
Makefile.am | 28 ++++++++++++++--------------
acinclude.m4 | 13 +++++++++++++
configure.ac | 9 +--------
diffs (125 lines):
diff -r 3bd328e4b515 -r 8e02f38c3b6a ChangeLog
--- a/ChangeLog Tue Feb 01 10:53:44 2011 -0500
+++ b/ChangeLog Tue Feb 01 23:24:46 2011 +0000
@@ -1,3 +1,27 @@ 2011-01-24 Deepak Bhole <dbhole at redhat.c
+2010-02-01 Andrew John Hughes <ahughes at redhat.com>
+
+ Fix issues with use of DESTDIR pointing
+ to an empty tree for staging.
+ * Makefile.am:
+ (install-exec-local): Create just bin and
+ jre/lib for the main (NetX) install, creating
+ jre/lib/$(INSTALL_ARCH_DIR) only for the plugin
+ install. Amalgamate the if blocks and test for
+ ${prefix}/jre/bin not ${DESTDIR}${prefix}/jre/bin
+ to ensure we check the installed JDK and not the
+ staging tree. Move plugin installation to the end
+ to avoid mkinstalldirs from failing by trying to
+ create ${DESTDIR}${prefix}/bin a second time.
+
+2010-02-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * configure.ac: Call IT_CHECK_JRE_PREFIX macro
+ rather than doing so inline.
+ * acinclude.m4
+ (IT_CHECK_JRE_PREFIX): Additions from configure.ac
+ supplemented with configure output
+ (AC_MSG_CHECKING/AC_MSG_RESULT).
+
2011-01-24 Deepak Bhole <dbhole at redhat.com>
RH672262, CVE-2011-0025: IcedTea jarfile signature verification bypass
diff -r 3bd328e4b515 -r 8e02f38c3b6a Makefile.am
--- a/Makefile.am Tue Feb 01 10:53:44 2011 -0500
+++ b/Makefile.am Tue Feb 01 23:24:46 2011 +0000
@@ -102,32 +102,32 @@ clean-local: clean-netx clean-plugin cle
clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs
install-exec-local:
- ${mkinstalldirs} $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/$(INSTALL_ARCH_DIR)
-if ENABLE_PLUGIN
- ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/$(INSTALL_ARCH_DIR)/
- ${INSTALL_PROGRAM} $(PLUGIN_DIR)/launcher/pluginappletviewer $(DESTDIR)$(bindir)
- ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/plugin.jar
-endif
+ ${mkinstalldirs} $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib
${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/netx.jar
${INSTALL_PROGRAM} $(NETX_DIR)/launcher/javaws $(DESTDIR)$(prefix)/bin
- if [ -d $(DESTDIR)$(prefix)/jre/bin ] ; then \
+ ${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib
+ ${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(prefix)/bin
+ if [ -d $(prefix)/jre/bin ] ; then \
+ ${mkinstalldirs} $(DESTDIR)$(prefix)/jre/bin ; \
if [ -L $(DESTDIR)$(prefix)/jre/bin/javaws ] ; then \
rm -f $(DESTDIR)$(prefix)/jre/bin/javaws ; \
fi ; \
+ if [ -L $(DESTDIR)$(prefix)/jre/bin/itweb-settings ] ; then \
+ rm -f $(DESTDIR)$(prefix)/jre/bin/itweb-settings ; \
+ fi ; \
if [ ! -e $(prefix)/jre/bin/javaws ] ; then \
ln -s ../../bin/javaws $(DESTDIR)$(prefix)/jre/bin ; \
- fi ; \
- fi
- ${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib
- ${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(prefix)/bin
- if [ -d $(DESTDIR)$(prefix)/jre/bin ] ; then \
- if [ -L $(DESTDIR)$(prefix)/jre/bin/itweb-settings ] ; then \
- rm -f $(DESTDIR)$(prefix)/jre/bin/itweb-settings ; \
fi ; \
if [ ! -e $(prefix)/jre/bin/itweb-settings ] ; then \
ln -s ../../bin/itweb-settings $(DESTDIR)$(prefix)/jre/bin ; \
fi ; \
fi
+if ENABLE_PLUGIN
+ ${mkinstalldirs} $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/$(INSTALL_ARCH_DIR)
+ ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/$(INSTALL_ARCH_DIR)/
+ ${INSTALL_PROGRAM} $(PLUGIN_DIR)/launcher/pluginappletviewer $(DESTDIR)$(bindir)
+ ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/plugin.jar
+endif
install-data-local:
${mkinstalldirs} -d $(DESTDIR)$(prefix)/man/man1
diff -r 3bd328e4b515 -r 8e02f38c3b6a acinclude.m4
--- a/acinclude.m4 Tue Feb 01 10:53:44 2011 -0500
+++ b/acinclude.m4 Tue Feb 01 23:24:46 2011 +0000
@@ -667,3 +667,16 @@ fi
fi
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN_ONCE([IT_CHECK_JRE_PREFIX],[
+# Set JRE prefix based on whether top-level prefix is a JDK dir or a JRE dir
+AC_MSG_CHECKING([whether the chosen prefix contains a jre tree])
+if test -d ${prefix}/jre ; then
+ JRE_DIR_PREFIX="/jre";
+ AC_MSG_RESULT([yes])
+else
+ JRE_DIR_PREFIX="";
+ AC_MSG_RESULT([no])
+fi ;
+AC_SUBST([JRE_DIR_PREFIX])
+])
diff -r 3bd328e4b515 -r 8e02f38c3b6a configure.ac
--- a/configure.ac Tue Feb 01 10:53:44 2011 -0500
+++ b/configure.ac Tue Feb 01 23:24:46 2011 +0000
@@ -38,6 +38,7 @@ IT_GET_PKGVERSION
IT_GET_PKGVERSION
IT_OBTAIN_HG_REVISIONS
IT_CHECK_XULRUNNER_VERSION
+IT_CHECK_JRE_PREFIX
AC_CHECK_LIB(z, main,, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
dnl Check for libX11 headers and libraries.
@@ -78,12 +79,4 @@ IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAG
IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
-# Set JRE prefix based on whether to-level prefix is a JDK dir or a JRE dir
-if test -d ${prefix}/jre ; then
- JRE_DIR_PREFIX="/jre" ;
-else
- JRE_DIR_PREFIX="" ;
-fi ;
-AC_SUBST([JRE_DIR_PREFIX])
-
AC_OUTPUT
More information about the distro-pkg-dev
mailing list