diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8f3f937 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +SOURCES/icedtea6-1.13.13.tar.xz +SOURCES/java-access-bridge-1.23.0.tar.bz2 +SOURCES/openjdk-6-src-b41-04_jan_2017-rhel.tar.xz diff --git a/.java-1.6.0-openjdk.metadata b/.java-1.6.0-openjdk.metadata new file mode 100644 index 0000000..67d15f6 --- /dev/null +++ b/.java-1.6.0-openjdk.metadata @@ -0,0 +1,3 @@ +34250fb1bbd723091cc2645a5e41590aa69c9331 SOURCES/icedtea6-1.13.13.tar.xz +aa2c61cc73bad1e1a09e8843f341270f70921dbf SOURCES/java-access-bridge-1.23.0.tar.bz2 +7c23132d2cbea7605ce749fe0c350b7b21e76236 SOURCES/openjdk-6-src-b41-04_jan_2017-rhel.tar.xz diff --git a/SOURCES/README.src b/SOURCES/README.src new file mode 100644 index 0000000..eef0423 --- /dev/null +++ b/SOURCES/README.src @@ -0,0 +1,2 @@ +The java-1.6.0-openjdk-src subpackage contains the complete IcedTea +class library source code for use by IDE indexers and debuggers. diff --git a/SOURCES/add-final-location-rpaths.patch b/SOURCES/add-final-location-rpaths.patch new file mode 100644 index 0000000..b78ff45 --- /dev/null +++ b/SOURCES/add-final-location-rpaths.patch @@ -0,0 +1,146 @@ +Work in the presence of capabilities + +Include a hardcoded install path in RPATH in binaries. This is used +as fallback when $ORIGIN is ignored. $ORIGIN is ignored for when +linux capabilities are added to the binary. + +Fix launcher to treat the case where capabilities are set as +identical to a setuid binary: don't expect LD_LIBRARY_PATH to be +set. +--- a/Makefile.am.orig 2017-01-03 02:21:55.611333388 -0500 ++++ b/Makefile.am 2017-01-03 02:22:48.670489697 -0500 +@@ -837,7 +837,8 @@ + CXX=$(CXX)$(GCC_SUFFIX) \ + COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \ + UNLIMITED_CRYPTO="true" \ +- ARM32JIT="${ARM32JIT_STATUS}" ++ ARM32JIT="${ARM32JIT_STATUS}" \ ++ INSTALL_LOCATION="${INSTALL_LOCATION}" + + if ENABLE_CACAO + ICEDTEA_ENV += \ +diff -r b85872bd06da patches/add-final-location-rpaths.patch +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/patches/add-final-location-rpaths.patch Thu Apr 09 20:41:52 2015 +0100 +@@ -0,0 +1,121 @@ ++diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk ++--- openjdk.orig/corba/make/common/Defs-linux.gmk 2015-04-09 20:37:21.682577260 +0100 +++++ openjdk/corba/make/common/Defs-linux.gmk 2015-04-09 20:38:35.115295051 +0100 ++@@ -209,8 +209,8 @@ ++ # The environment variable LD_LIBRARY_PATH will over-ride these runpaths. ++ # Try: 'readelf -d lib*.so' to see these settings in a library. ++ # ++- LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN ++- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%) +++ LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH) +++ LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)%) ++ endif ++ ++ EXTRA_LIBS += -lc ++diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ++--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2015-04-09 20:37:21.962579996 +0100 +++++ openjdk/jdk/make/common/Defs-linux.gmk 2015-04-09 20:38:35.115295051 +0100 ++@@ -233,8 +233,8 @@ ++ # The environment variable LD_LIBRARY_PATH will over-ride these runpaths. ++ # Try: 'readelf -d lib*.so' to see these settings in a library. ++ # ++- LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN ++- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%) +++ LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH) +++ LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)%) ++ endif ++ ++ EXTRA_LIBS += -lc ++diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk ++--- openjdk.orig/jdk/make/common/Program.gmk 2015-04-09 20:37:28.862647438 +0100 +++++ openjdk/jdk/make/common/Program.gmk 2015-04-09 20:39:08.779624149 +0100 ++@@ -83,9 +83,10 @@ ++ endif ++ endif ++ ifeq ($(PLATFORM), linux) +++ LDFLAGS += -lcap ++ LDFLAGS += $(ZLIB_LIBS) -Wl,-z -Wl,origin ++ LDFLAGS += -Wl,--allow-shlib-undefined ++- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli +++ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)/jli ++ endif ++ endif ++ ifeq ($(PLATFORM), windows) ++diff -Nru openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile ++--- openjdk.orig/jdk/make/java/instrument/Makefile 2015-04-09 02:19:17.000000000 +0100 +++++ openjdk/jdk/make/java/instrument/Makefile 2015-04-09 20:38:35.115295051 +0100 ++@@ -111,7 +111,7 @@ ++ ifeq ($(PLATFORM), linux) ++ LDFLAGS += -Wl,-z -Wl,origin ++ LDFLAGS += -Wl,--allow-shlib-undefined ++- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli +++ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)/jli ++ endif ++ endif ++ ++diff -Nru openjdk.orig/jdk/src/solaris/bin/java_md.c openjdk/jdk/src/solaris/bin/java_md.c ++--- openjdk.orig/jdk/src/solaris/bin/java_md.c 2015-04-09 02:19:52.000000000 +0100 +++++ openjdk/jdk/src/solaris/bin/java_md.c 2015-04-09 20:38:35.115295051 +0100 ++@@ -39,6 +39,7 @@ ++ ++ #ifdef __linux__ ++ #include +++#include ++ #else ++ #include ++ #endif ++@@ -169,6 +170,19 @@ ++ return LIBARCHNAME; ++ } ++ +++#ifdef __linux +++static int +++have_caps() { +++ int have_cap = 0; +++ cap_t no_caps = cap_init(); +++ cap_t my_caps = cap_get_proc(); +++ have_cap = cap_compare(no_caps, my_caps); +++ cap_free(my_caps); +++ cap_free(no_caps); +++ return have_cap; +++} +++#endif +++ ++ void ++ CreateExecutionEnvironment(int *_argcp, ++ char ***_argvp, ++@@ -413,20 +427,24 @@ ++ ++ #ifdef __linux ++ /* ++- * On linux, if a binary is running as sgid or suid, glibc sets ++- * LD_LIBRARY_PATH to the empty string for security purposes. (In ++- * contrast, on Solaris the LD_LIBRARY_PATH variable for a ++- * privileged binary does not lose its settings; but the dynamic ++- * linker does apply more scrutiny to the path.) The launcher uses ++- * the value of LD_LIBRARY_PATH to prevent an exec loop. ++- * Therefore, if we are running sgid or suid, this function's ++- * setting of LD_LIBRARY_PATH will be ineffective and we should ++- * return from the function now. Getting the right libraries to ++- * be found must be handled through other mechanisms. +++ * On linux, if a binary is running as sgid or suid, or has +++ * capabilities set, glibc sets LD_LIBRARY_PATH to the empty +++ * string for security purposes. (In contrast, on Solaris the +++ * LD_LIBRARY_PATH variable for a privileged binary does not lose +++ * its settings; but the dynamic linker does apply more scrutiny +++ * to the path.) The launcher uses the value of LD_LIBRARY_PATH to +++ * prevent an exec loop. Therefore, if we are running sgid or +++ * suid, or have linux capabilities set, this function's setting +++ * of LD_LIBRARY_PATH will be ineffective and we should return +++ * from the function now. Getting the right libraries to be found +++ * must be handled through other mechanisms. ++ */ ++ if((getgid() != getegid()) || (getuid() != geteuid()) ) { ++ return; ++ } +++ if (have_caps()) { +++ return; +++ } ++ #endif ++ ++ /* runpath contains current effective LD_LIBRARY_PATH setting */ diff --git a/SOURCES/generate-rhel-zip.sh b/SOURCES/generate-rhel-zip.sh new file mode 100644 index 0000000..52a207d --- /dev/null +++ b/SOURCES/generate-rhel-zip.sh @@ -0,0 +1,91 @@ +#!/bin/sh + +# Untar openjdk source tarball. +mkdir openjdk +tar xJf $1 -C openjdk + +# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x) +# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x) + +# PR146/S6713083 +# Remove binaries +rm -f \ + openjdk/jdk/test/sun/management/windows/revokeall.exe \ + openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \ + openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \ + openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher + +rm -f \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \ + openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so + +rm -f \ + openjdk/jdk/test/java/util/Locale/data/deflocale.exe \ + openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.sh \ + openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \ + openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \ + +# Remove test sources with questionable license headers. +rm -f \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ + openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ + openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ + openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ + openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ + openjdk/jdk/test/java/util/Locale/LocaleTest.java \ + openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ + openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ + openjdk/jdk/test/sun/text/resources/LocaleDataTest.java + +# Remove J2DBench sources, some of which have questionable license +# headers. +rm -rf \ + openjdk/jdk/src/share/demo/java2d/J2DBench + +# Requires IcedTea patch PR2125 (not included) +echo "Syncing EC list with NSS" +patch -Np0 < pr2125.patch + +# Create new tarball with new name. +pushd openjdk > /dev/null + tar cJf ../$(basename $1 .tar.xz)-rhel.tar.xz * +popd > /dev/null + +# Remove old unzipped openjdk dir. +rm -rf openjdk diff --git a/SOURCES/java-1.6.0-openjdk-accessible-toolkit.patch b/SOURCES/java-1.6.0-openjdk-accessible-toolkit.patch new file mode 100644 index 0000000..222dcfb --- /dev/null +++ b/SOURCES/java-1.6.0-openjdk-accessible-toolkit.patch @@ -0,0 +1,16 @@ +diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java openjdk/jdk/src/share/classes/java/awt/Toolkit.java +--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500 ++++ openjdk/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500 +@@ -871,7 +871,11 @@ + return null; + } + }); +- loadAssistiveTechnologies(); ++ try { ++ loadAssistiveTechnologies(); ++ } catch ( AWTError error) { ++ // ignore silently ++ } + } finally { + // Make sure to always re-enable the JIT. + java.lang.Compiler.enable(); diff --git a/SOURCES/java-1.6.0-openjdk-debugdocs.patch b/SOURCES/java-1.6.0-openjdk-debugdocs.patch new file mode 100644 index 0000000..fd7b5cc --- /dev/null +++ b/SOURCES/java-1.6.0-openjdk-debugdocs.patch @@ -0,0 +1,39 @@ +--- oldMakefile 2008-07-02 17:48:01.000000000 -0400 ++++ openjdk/Makefile 2008-07-02 17:48:09.000000000 -0400 +@@ -143,7 +143,7 @@ + create_fresh_product_bootdir: FRC + @$(START_ECHO) + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + BOOT_CYCLE_SETTINGS= \ + build_product_image + @$(FINISH_ECHO) +@@ -151,7 +151,7 @@ + create_fresh_debug_bootdir: FRC + @$(START_ECHO) + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + BOOT_CYCLE_DEBUG_SETTINGS= \ + build_debug_image + @$(FINISH_ECHO) +@@ -159,7 +159,7 @@ + create_fresh_fastdebug_bootdir: FRC + @$(START_ECHO) + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + BOOT_CYCLE_DEBUG_SETTINGS= \ + build_fastdebug_image + @$(FINISH_ECHO) +@@ -212,7 +212,7 @@ + $(MAKE) \ + ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \ + DEBUG_NAME=$(DEBUG_NAME) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + $(BOOT_CYCLE_DEBUG_SETTINGS) \ + generic_build_repo_series + @$(FINISH_ECHO) + diff --git a/SOURCES/java-1.6.0-openjdk-debuginfo.patch b/SOURCES/java-1.6.0-openjdk-debuginfo.patch new file mode 100644 index 0000000..197c6ef --- /dev/null +++ b/SOURCES/java-1.6.0-openjdk-debuginfo.patch @@ -0,0 +1,20 @@ +--- openjdk/hotspot/build/linux/makefiles/saproc.make_back 2009-12-14 13:35:46.000000000 +0100 ++++ openjdk/hotspot/make/linux/makefiles/saproc.make 2009-12-14 13:36:47.000000000 +0100 +@@ -87,6 +87,7 @@ + $(SASRCFILES) \ + $(SA_LFLAGS) \ + $(SA_DEBUG_CFLAGS) \ ++ -g \ + -o $@ \ + -lthread_db + $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } +--- openjdk/hotspot/build/linux/makefiles/jsig.make_back 2009-12-14 13:34:56.000000000 +0100 ++++ openjdk/hotspot/make/linux/makefiles/jsig.make 2009-12-14 13:35:31.000000000 +0100 +@@ -59,6 +59,7 @@ + $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) + @echo Making signal interposition lib... + $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ ++ -g \ + $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl + $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) diff --git a/SOURCES/java-1.6.0-openjdk-java-access-bridge-idlj.patch b/SOURCES/java-1.6.0-openjdk-java-access-bridge-idlj.patch new file mode 100644 index 0000000..6936fa6 --- /dev/null +++ b/SOURCES/java-1.6.0-openjdk-java-access-bridge-idlj.patch @@ -0,0 +1,71 @@ +--- oldjava-access-bridge-1.23.0/idlgen/Makefile.am 2008-06-03 02:47:29.000000000 -0400 ++++ java-access-bridge-1.23.0/idlgen/Makefile.am 2008-07-31 15:13:26.000000000 -0400 +@@ -3,7 +3,7 @@ + JARFILES=../gnome-java-bridge.jar ../$(EXTRA_JARFILES) + CLASSES=$(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class) + JAR=jar +-IDLJ_FLAGS=-emitAll $(IDLJ_IDLDIRS) ++IDLJ_FLAGS=-J-client -emitAll $(IDLJ_IDLDIRS) + + BONOBO_ACT_IDLFILES=$(wildcard $(BONOBO_ACT_IDLDIR)/*.idl) + BONOBO_IDLFILES=$(wildcard $(BONOBO_IDLDIR)/*.idl) +--- oldjava-access-bridge-1.23.0/idlgen/Makefile.in 2008-06-23 23:34:59.000000000 -0400 ++++ java-access-bridge-1.23.0/idlgen/Makefile.in 2008-07-31 15:13:45.000000000 -0400 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -140,7 +140,7 @@ + SUBDIRS = org + JARFILES = ../gnome-java-bridge.jar ../$(EXTRA_JARFILES) + CLASSES = $(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class) +-IDLJ_FLAGS = -emitAll $(IDLJ_IDLDIRS) ++IDLJ_FLAGS = -J-client -emitAll $(IDLJ_IDLDIRS) + BONOBO_ACT_IDLFILES = $(wildcard $(BONOBO_ACT_IDLDIR)/*.idl) + BONOBO_IDLFILES = $(wildcard $(BONOBO_IDLDIR)/*.idl) + AT_SPI_IDLFILES = $(wildcard $(AT_SPI_IDLDIR)/*.idl) +@@ -253,8 +253,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -279,8 +279,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -290,13 +290,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique diff --git a/SOURCES/java-1.6.0-openjdk-java-access-bridge-security.patch b/SOURCES/java-1.6.0-openjdk-java-access-bridge-security.patch new file mode 100644 index 0000000..48ebde5 --- /dev/null +++ b/SOURCES/java-1.6.0-openjdk-java-access-bridge-security.patch @@ -0,0 +1,25 @@ +--- openjdk/jdk/src/share/lib/security/java.security-linux ++++ openjdk/jdk/src/share/lib/security/java.security-linux +@@ -154,7 +154,9 @@ + com.sun.org.apache.xml.internal.security.,\ + com.sun.org.glassfish.,\ + com.sun.naming.internal.,\ +- org.jcp.xml.dsig.internal. ++ org.jcp.xml.dsig.internal.,\ ++ org.GNOME.Accessibility.,\ ++ org.GNOME.Bonobo. + + # + # List of comma-separated packages that start with or equal this string +@@ -193,7 +195,9 @@ + com.sun.org.apache.xml.internal.security.,\ + com.sun.org.glassfish.,\ + com.sun.naming.internal.,\ +- org.jcp.xml.dsig.internal. ++ org.jcp.xml.dsig.internal.,\ ++ org.GNOME.Accessibility.,\ ++ org.GNOME.Bonobo. + + # + # Determines whether this properties file can be appended to + diff --git a/SOURCES/java-1.6.0-openjdk-java-access-bridge-tck.patch b/SOURCES/java-1.6.0-openjdk-java-access-bridge-tck.patch new file mode 100644 index 0000000..36a23c0 --- /dev/null +++ b/SOURCES/java-1.6.0-openjdk-java-access-bridge-tck.patch @@ -0,0 +1,25 @@ +--- java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java.orig 2008-05-22 11:27:00.000000000 -0400 ++++ java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java 2008-05-22 11:28:02.000000000 -0400 +@@ -34,6 +34,9 @@ + import javax.accessibility.AccessibleRole; + import javax.accessibility.AccessibleText; + import javax.accessibility.AccessibleEditableText; ++import java.security.PrivilegedAction; ++import java.security.AccessController; ++ + + public class JavaBridge { + +@@ -332,7 +335,11 @@ + System.err.println ("Java Accessibility Bridge for GNOME loaded.\n"); + + // Not sure what kind of arguments should be sent to ORB +- String vm_rev = System.getProperty("java.version"); ++ String vm_rev = (String) AccessController.doPrivileged(new PrivilegedAction() { ++ public java.lang.Object run() { ++ return System.getProperty("java.version"); ++ } ++ }); + + if (vm_rev.compareTo("1.4.0") < 0) { + System.err.println("WARNING: Java Accessibility Bridge " + diff --git a/SOURCES/java-1.6.0-openjdk-optflags.patch b/SOURCES/java-1.6.0-openjdk-optflags.patch new file mode 100644 index 0000000..186dc48 --- /dev/null +++ b/SOURCES/java-1.6.0-openjdk-optflags.patch @@ -0,0 +1,13 @@ +diff -up ./configure.ac.sav ./configure.ac +--- ./configure.ac.sav 2011-07-22 10:28:06.000000000 -0400 ++++ ./configure.ac 2011-07-22 10:28:20.000000000 -0400 +@@ -24,6 +24,9 @@ + if test "x$CXX" = x; then + AC_MSG_ERROR([No C++ compiler found.]) + fi ++ ++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')" ++AC_SUBST(ALT_OPT_CFLAGS) + + IT_FIND_TOOL([MAKE], [make]) + IT_FIND_TOOL([GZIP], [gzip]) diff --git a/SOURCES/no_pr2125.patch b/SOURCES/no_pr2125.patch new file mode 100644 index 0000000..86b424e --- /dev/null +++ b/SOURCES/no_pr2125.patch @@ -0,0 +1,11 @@ +diff -r 9fca0eafd25a fsg.sh.in +--- a/fsg.sh.in Wed Jul 22 22:29:27 2015 +0100 ++++ b/fsg.sh.in Wed Jul 22 23:22:08 2015 +0100 +@@ -90,7 +90,3 @@ + openjdk/jdk/src/solaris/doc/sun/man/man1/javaws.1 \ + openjdk/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 + +-if test "x@ENABLE_NON_NSS_CURVES@" = "xno"; then +- echo "Syncing EC list with NSS" +- patch -Np0 < @abs_top_srcdir@/patches/pr2125.patch +-fi diff --git a/SOURCES/pr2808.patch b/SOURCES/pr2808.patch new file mode 100644 index 0000000..3cf3288 --- /dev/null +++ b/SOURCES/pr2808.patch @@ -0,0 +1,869 @@ +# HG changeset patch +# User Andrew John Hughes +# Date 1453759602 0 +# Mon Jan 25 22:06:42 2016 +0000 +# Node ID 412e3ce4141e2ddb01c8fb099fc0823d783e7b3d +# Parent 33e9441c53fc29f1aa1f496eedda845b6e405473 +S8076221, PR2808: Disable RC4 cipher suites + +2016-01-25 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch: + Backport of 8076221 to OpenJDK 6 b38. + * patches/openjdk/8078823-disabledalgorithms_fails_intermittently.patch: + Improve reliability of DisabledAlgorithms test. + * patches/pr2808-fix_disabled_algorithms_test.patch: + Remove Java 7 features from new DisabledAlgorithms test. + +diff -r 33e9441c53fc -r 412e3ce4141e patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch Mon Jan 25 22:06:42 2016 +0000 +@@ -0,0 +1,553 @@ ++# HG changeset patch ++# User xuelei ++# Date 1429096621 0 ++# Wed Apr 15 11:17:01 2015 +0000 ++# Node ID 6a24fc5e32a359335538bfa453040fc2d9ba13e9 ++# Parent fe93a8cd20a56dc59e5f2464d7e6bd0d52b807b3 ++8076221: Disable RC4 cipher suites ++Reviewed-by: xuelei, wetmore ++ ++diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-linux openjdk/jdk/src/share/lib/security/java.security-linux ++--- openjdk.orig/jdk/src/share/lib/security/java.security-linux 2016-01-20 01:47:58.000000000 +0000 +++++ openjdk/jdk/src/share/lib/security/java.security-linux 2016-01-25 20:25:35.722972332 +0000 ++@@ -451,7 +451,7 @@ ++ # ++ # Example: ++ # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 ++-jdk.tls.disabledAlgorithms=SSLv3, DH keySize < 768 +++jdk.tls.disabledAlgorithms=SSLv3, RC4, DH keySize < 768 ++ ++ # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) ++ # processing in JSSE implementation. ++diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-solaris openjdk/jdk/src/share/lib/security/java.security-solaris ++--- openjdk.orig/jdk/src/share/lib/security/java.security-solaris 2016-01-20 01:47:58.000000000 +0000 +++++ openjdk/jdk/src/share/lib/security/java.security-solaris 2016-01-25 20:24:27.088115212 +0000 ++@@ -411,7 +411,7 @@ ++ # ++ # Example: ++ # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 ++-jdk.tls.disabledAlgorithms=SSLv3, DH keySize < 768 +++jdk.tls.disabledAlgorithms=SSLv3, RC4, DH keySize < 768 ++ ++ # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) ++ # processing in JSSE implementation. ++diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-windows openjdk/jdk/src/share/lib/security/java.security-windows ++--- openjdk.orig/jdk/src/share/lib/security/java.security-windows 2016-01-20 01:47:58.000000000 +0000 +++++ openjdk/jdk/src/share/lib/security/java.security-windows 2016-01-25 20:23:50.300727758 +0000 ++@@ -428,7 +428,7 @@ ++ # ++ # Example: ++ # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 ++-jdk.tls.disabledAlgorithms=SSLv3, DH keySize < 768 +++jdk.tls.disabledAlgorithms=SSLv3, RC4, DH keySize < 768 ++ ++ # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) ++ # processing in JSSE implementation. ++diff -Nru openjdk.orig/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java openjdk/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java ++--- openjdk.orig/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java 1970-01-01 01:00:00.000000000 +0100 +++++ openjdk/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java 2016-01-25 20:17:49.902742622 +0000 ++@@ -0,0 +1,362 @@ +++/* +++ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +++ * +++ * This code is free software; you can redistribute it and/or modify it +++ * under the terms of the GNU General Public License version 2 only, as +++ * published by the Free Software Foundation. +++ * +++ * This code is distributed in the hope that it will be useful, but WITHOUT +++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +++ * version 2 for more details (a copy is included in the LICENSE file that +++ * accompanied this code). +++ * +++ * You should have received a copy of the GNU General Public License version +++ * 2 along with this work; if not, write to the Free Software Foundation, +++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +++ * +++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +++ * or visit www.oracle.com if you need additional information or have any +++ * questions. +++ */ +++ +++import java.io.BufferedInputStream; +++import java.io.BufferedOutputStream; +++import java.io.IOException; +++import java.io.InputStream; +++import java.io.OutputStream; +++import java.security.NoSuchAlgorithmException; +++import java.security.Security; +++import java.util.concurrent.TimeUnit; +++import javax.net.ssl.SSLContext; +++import javax.net.ssl.SSLHandshakeException; +++import javax.net.ssl.SSLServerSocket; +++import javax.net.ssl.SSLServerSocketFactory; +++import javax.net.ssl.SSLSocket; +++import javax.net.ssl.SSLSocketFactory; +++ +++/** +++ * @test +++ * @bug 8076221 +++ * @summary Check if weak cipher suites are disabled +++ * @run main/othervm DisabledAlgorithms default +++ * @run main/othervm DisabledAlgorithms empty +++ */ +++public class DisabledAlgorithms { +++ +++ private static final String pathToStores = +++ "../../../../sun/security/ssl/etc"; +++ private static final String keyStoreFile = "keystore"; +++ private static final String trustStoreFile = "truststore"; +++ private static final String passwd = "passphrase"; +++ +++ private static final String keyFilename = +++ System.getProperty("test.src", "./") + "/" + pathToStores + +++ "/" + keyStoreFile; +++ +++ private static final String trustFilename = +++ System.getProperty("test.src", "./") + "/" + pathToStores + +++ "/" + trustStoreFile; +++ +++ // supported RC4 cipher suites +++ // it does not contain KRB5 cipher suites because they need a KDC +++ private static final String[] rc4_ciphersuites = new String[] { +++ "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", +++ "TLS_ECDHE_RSA_WITH_RC4_128_SHA", +++ "SSL_RSA_WITH_RC4_128_SHA", +++ "TLS_ECDH_ECDSA_WITH_RC4_128_SHA", +++ "TLS_ECDH_RSA_WITH_RC4_128_SHA", +++ "SSL_RSA_WITH_RC4_128_MD5", +++ "TLS_ECDH_anon_WITH_RC4_128_SHA", +++ "SSL_DH_anon_WITH_RC4_128_MD5" +++ }; +++ +++ public static void main(String[] args) throws Exception { +++ if (args.length < 1) { +++ throw new RuntimeException("No parameters specified"); +++ } +++ +++ System.setProperty("javax.net.ssl.keyStore", keyFilename); +++ System.setProperty("javax.net.ssl.keyStorePassword", passwd); +++ System.setProperty("javax.net.ssl.trustStore", trustFilename); +++ System.setProperty("javax.net.ssl.trustStorePassword", passwd); +++ +++ switch (args[0]) { +++ case "default": +++ // use default jdk.tls.disabledAlgorithms +++ System.out.println("jdk.tls.disabledAlgorithms = " +++ + Security.getProperty("jdk.tls.disabledAlgorithms")); +++ +++ // check if RC4 cipher suites can't be used by default +++ checkFailure(rc4_ciphersuites); +++ break; +++ case "empty": +++ // reset jdk.tls.disabledAlgorithms +++ Security.setProperty("jdk.tls.disabledAlgorithms", ""); +++ System.out.println("jdk.tls.disabledAlgorithms = " +++ + Security.getProperty("jdk.tls.disabledAlgorithms")); +++ +++ // check if RC4 cipher suites can be used +++ // if jdk.tls.disabledAlgorithms is empty +++ checkSuccess(rc4_ciphersuites); +++ break; +++ default: +++ throw new RuntimeException("Wrong parameter: " + args[0]); +++ } +++ } +++ +++ /* +++ * Checks if that specified cipher suites cannot be used. +++ */ +++ private static void checkFailure(String[] ciphersuites) throws Exception { +++ try (SSLServer server = SSLServer.init(ciphersuites)) { +++ startNewThread(server); +++ while (!server.isRunning()) { +++ sleep(); +++ } +++ +++ int port = server.getPort(); +++ for (String ciphersuite : ciphersuites) { +++ try (SSLClient client = SSLClient.init(port, ciphersuite)) { +++ client.connect(); +++ throw new RuntimeException("Expected SSLHandshakeException " +++ + "not thrown"); +++ } catch (SSLHandshakeException e) { +++ System.out.println("Expected exception on client side: " +++ + e); +++ } +++ } +++ +++ server.stop(); +++ while (server.isRunning()) { +++ sleep(); +++ } +++ +++ if (!server.sslError()) { +++ throw new RuntimeException("Expected SSL exception " +++ + "not thrown on server side"); +++ } +++ } +++ +++ } +++ +++ /* +++ * Checks if specified cipher suites can be used. +++ */ +++ private static void checkSuccess(String[] ciphersuites) throws Exception { +++ try (SSLServer server = SSLServer.init(ciphersuites)) { +++ startNewThread(server); +++ while (!server.isRunning()) { +++ sleep(); +++ } +++ +++ int port = server.getPort(); +++ for (String ciphersuite : ciphersuites) { +++ try (SSLClient client = SSLClient.init(port, ciphersuite)) { +++ client.connect(); +++ String negotiated = client.getNegotiatedCipherSuite(); +++ System.out.println("Negotiated cipher suite: " +++ + negotiated); +++ if (!negotiated.equals(ciphersuite)) { +++ throw new RuntimeException("Unexpected cipher suite: " +++ + negotiated); +++ } +++ } +++ } +++ +++ server.stop(); +++ while (server.isRunning()) { +++ sleep(); +++ } +++ +++ if (server.error()) { +++ throw new RuntimeException("Unexpected error on server side"); +++ } +++ } +++ +++ } +++ +++ private static Thread startNewThread(SSLServer server) { +++ Thread serverThread = new Thread(server, "SSL server thread"); +++ serverThread.setDaemon(true); +++ serverThread.start(); +++ return serverThread; +++ } +++ +++ private static void sleep() { +++ try { +++ TimeUnit.MILLISECONDS.sleep(50); +++ } catch (InterruptedException e) { +++ // do nothing +++ } +++ } +++ +++ static class SSLServer implements Runnable, AutoCloseable { +++ +++ private final SSLServerSocket ssocket; +++ private volatile boolean stopped = false; +++ private volatile boolean running = false; +++ private volatile boolean sslError = false; +++ private volatile boolean otherError = false; +++ +++ private SSLServer(SSLServerSocket ssocket) { +++ this.ssocket = ssocket; +++ } +++ +++ @Override +++ public void run() { +++ System.out.println("Server: started"); +++ running = true; +++ while (!stopped) { +++ try (SSLSocket socket = (SSLSocket) ssocket.accept()) { +++ System.out.println("Server: accepted client connection"); +++ InputStream in = socket.getInputStream(); +++ OutputStream out = socket.getOutputStream(); +++ int b = in.read(); +++ if (b < 0) { +++ throw new IOException("Unexpected EOF"); +++ } +++ System.out.println("Server: send data: " + b); +++ out.write(b); +++ out.flush(); +++ socket.getSession().invalidate(); +++ } catch (SSLHandshakeException e) { +++ System.out.println("Server: run: " + e); +++ sslError = true; +++ } catch (IOException e) { +++ if (!stopped) { +++ System.out.println("Server: run: " + e); +++ e.printStackTrace(); +++ otherError = true; +++ } +++ } +++ } +++ +++ System.out.println("Server: finished"); +++ running = false; +++ } +++ +++ int getPort() { +++ return ssocket.getLocalPort(); +++ } +++ +++ String[] getEnabledCiperSuites() { +++ return ssocket.getEnabledCipherSuites(); +++ } +++ +++ boolean isRunning() { +++ return running; +++ } +++ +++ boolean sslError() { +++ return sslError; +++ } +++ +++ boolean error() { +++ return sslError || otherError; +++ } +++ +++ void stop() { +++ stopped = true; +++ if (!ssocket.isClosed()) { +++ try { +++ ssocket.close(); +++ } catch (IOException e) { +++ System.out.println("Server: close: " + e); +++ } +++ } +++ } +++ +++ @Override +++ public void close() { +++ stop(); +++ } +++ +++ static SSLServer init(String[] ciphersuites) +++ throws IOException { +++ SSLServerSocketFactory ssf = (SSLServerSocketFactory) +++ SSLServerSocketFactory.getDefault(); +++ SSLServerSocket ssocket = (SSLServerSocket) +++ ssf.createServerSocket(0); +++ +++ if (ciphersuites != null) { +++ System.out.println("Server: enable cipher suites: " +++ + java.util.Arrays.toString(ciphersuites)); +++ ssocket.setEnabledCipherSuites(ciphersuites); +++ } +++ +++ return new SSLServer(ssocket); +++ } +++ } +++ +++ static class SSLClient implements AutoCloseable { +++ +++ private final SSLSocket socket; +++ +++ private SSLClient(SSLSocket socket) { +++ this.socket = socket; +++ } +++ +++ void connect() throws IOException { +++ System.out.println("Client: connect to server"); +++ try ( +++ BufferedInputStream bis = new BufferedInputStream( +++ socket.getInputStream()); +++ BufferedOutputStream bos = new BufferedOutputStream( +++ socket.getOutputStream())) { +++ bos.write('x'); +++ bos.flush(); +++ +++ int read = bis.read(); +++ if (read < 0) { +++ throw new IOException("Client: couldn't read a response"); +++ } +++ socket.getSession().invalidate(); +++ } +++ } +++ +++ String[] getEnabledCiperSuites() { +++ return socket.getEnabledCipherSuites(); +++ } +++ +++ String getNegotiatedCipherSuite() { +++ return socket.getSession().getCipherSuite(); +++ } +++ +++ @Override +++ public void close() throws Exception { +++ if (!socket.isClosed()) { +++ try { +++ socket.close(); +++ } catch (IOException e) { +++ System.out.println("Client: close: " + e); +++ } +++ } +++ } +++ +++ static SSLClient init(int port) +++ throws NoSuchAlgorithmException, IOException { +++ return init(port, null); +++ } +++ +++ static SSLClient init(int port, String ciphersuite) +++ throws NoSuchAlgorithmException, IOException { +++ SSLContext context = SSLContext.getDefault(); +++ SSLSocketFactory ssf = (SSLSocketFactory) +++ context.getSocketFactory(); +++ SSLSocket socket = (SSLSocket) ssf.createSocket("localhost", port); +++ +++ if (ciphersuite != null) { +++ System.out.println("Client: enable cipher suite: " +++ + ciphersuite); +++ socket.setEnabledCipherSuites(new String[] { ciphersuite }); +++ } +++ +++ return new SSLClient(socket); +++ } +++ +++ } +++ +++ +++} ++diff -Nru openjdk.orig/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java openjdk/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java ++--- openjdk.orig/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java 2016-01-20 01:42:21.000000000 +0000 +++++ openjdk/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java 2016-01-25 20:23:28.749086605 +0000 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -30,7 +30,7 @@ ++ */ ++ ++ import java.io.*; ++-import java.net.*; +++import java.security.Security; ++ import javax.net.ssl.*; ++ ++ public class CipherSuiteOrder { ++@@ -192,6 +192,10 @@ ++ volatile Exception clientException = null; ++ ++ public static void main(String[] args) throws Exception { +++ // reset the security property to make sure that the algorithms +++ // and keys used in this test are not disabled. +++ Security.setProperty("jdk.tls.disabledAlgorithms", ""); +++ ++ String keyFilename = ++ System.getProperty("test.src", "./") + "/" + pathToStores + ++ "/" + keyStoreFile; ++diff -Nru openjdk.orig/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java openjdk/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java ++--- openjdk.orig/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java 2016-01-25 20:15:46.384811880 +0000 +++++ openjdk/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java 2016-01-25 20:17:49.902742622 +0000 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -102,10 +102,10 @@ ++ import java.nio.*; ++ import java.security.KeyStore; ++ import java.security.KeyFactory; +++import java.security.Security; ++ import java.security.cert.Certificate; ++ import java.security.cert.CertificateFactory; ++ import java.security.spec.PKCS8EncodedKeySpec; ++-import java.security.spec.*; ++ import java.security.interfaces.*; ++ import java.util.Base64; ++ ++@@ -367,6 +367,10 @@ ++ } ++ ++ public static void main(String args[]) throws Exception { +++ // reset the security property to make sure that the algorithms +++ // and keys used in this test are not disabled. +++ Security.setProperty("jdk.tls.disabledAlgorithms", ""); +++ ++ if (args.length != 4) { ++ System.out.println( ++ "Usage: java DHEKeySizing cipher-suite " + ++diff -Nru openjdk.orig/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java openjdk/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java ++--- openjdk.orig/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java 2016-01-20 01:42:24.000000000 +0000 +++++ openjdk/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java 2016-01-25 20:17:49.902742622 +0000 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -622,6 +622,9 @@ ++ } ++ ++ public static void main(String args[]) throws Exception { +++ // reset the security property to make sure that the algorithms +++ // and keys used in this test are not disabled. +++ Security.setProperty("jdk.tls.disabledAlgorithms", ""); ++ ++ CheckStatus cs; ++ ++diff -Nru openjdk.orig/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java openjdk/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java ++--- openjdk.orig/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java 2016-01-20 01:42:24.000000000 +0000 +++++ openjdk/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java 2016-01-25 20:20:24.580152890 +0000 ++@@ -33,6 +33,8 @@ ++ * The code could certainly be tightened up a lot. ++ * ++ * @author Brad Wetmore +++ * +++ * @run main/othervm ConnectionTest ++ */ ++ ++ import javax.net.ssl.*; ++@@ -672,6 +674,10 @@ ++ } ++ ++ public static void main(String args[]) throws Exception { +++ // reset the security property to make sure that the algorithms +++ // and keys used in this test are not disabled. +++ Security.setProperty("jdk.tls.disabledAlgorithms", ""); +++ ++ ConnectionTest ct = new ConnectionTest(); ++ ct.test(); ++ } ++diff -Nru openjdk.orig/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java openjdk/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java ++--- openjdk.orig/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java 2016-01-20 01:42:24.000000000 +0000 +++++ openjdk/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java 2016-01-25 20:19:17.305278447 +0000 ++@@ -180,6 +180,9 @@ ++ } ++ ++ public static void main(String args[]) throws Exception { +++ // reset the security property to make sure that the algorithms +++ // and keys used in this test are not disabled. +++ Security.setProperty("jdk.tls.disabledAlgorithms", ""); ++ ++ LargeBufs test; ++ ++diff -Nru openjdk.orig/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java openjdk/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java ++--- openjdk.orig/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java 2016-01-20 01:42:25.000000000 +0000 +++++ openjdk/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java 2016-01-25 20:18:53.009685445 +0000 ++@@ -33,7 +33,7 @@ ++ */ ++ ++ import java.io.*; ++-import java.net.*; +++import java.security.Security; ++ import javax.net.ssl.*; ++ ++ public class GenericStreamCipher { ++@@ -161,6 +161,10 @@ ++ volatile Exception clientException = null; ++ ++ public static void main(String[] args) throws Exception { +++ // reset the security property to make sure that the algorithms +++ // and keys used in this test are not disabled. +++ Security.setProperty("jdk.tls.disabledAlgorithms", ""); +++ ++ String keyFilename = ++ System.getProperty("test.src", ".") + "/" + pathToStores + ++ "/" + keyStoreFile; +diff -r 33e9441c53fc -r 412e3ce4141e patches/openjdk/8078823-disabledalgorithms_fails_intermittently.patch +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/patches/openjdk/8078823-disabledalgorithms_fails_intermittently.patch Mon Jan 25 22:06:42 2016 +0000 +@@ -0,0 +1,58 @@ ++# HG changeset patch ++# User asmotrak ++# Date 1435145895 -10800 ++# Wed Jun 24 14:38:15 2015 +0300 ++# Node ID 66bf77932d57ef00e0c68c19c5e45e0b1de80fad ++# Parent fddcb008fd1d285ed7d84011a43cdf556ab16bcb ++8078823: javax/net/ssl/ciphersuites/DisabledAlgorithms.java fails intermittently ++Reviewed-by: xuelei ++ ++diff -r fddcb008fd1d -r 66bf77932d57 test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java ++--- openjdk/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java Tue Jun 23 15:07:18 2015 +0100 +++++ openjdk/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java Wed Jun 24 14:38:15 2015 +0300 ++@@ -104,6 +104,8 @@ ++ default: ++ throw new RuntimeException("Wrong parameter: " + args[0]); ++ } +++ +++ System.out.println("Test passed"); ++ } ++ ++ /* ++@@ -128,7 +130,6 @@ ++ } ++ } ++ ++- server.stop(); ++ while (server.isRunning()) { ++ sleep(); ++ } ++@@ -224,11 +225,19 @@ ++ } catch (SSLHandshakeException e) { ++ System.out.println("Server: run: " + e); ++ sslError = true; +++ stopped = true; ++ } catch (IOException e) { ++ if (!stopped) { ++- System.out.println("Server: run: " + e); +++ System.out.println("Server: run: unexpected exception: " +++ + e); ++ e.printStackTrace(); ++ otherError = true; +++ stopped = true; +++ } else { +++ System.out.println("Server: run: " + e); +++ System.out.println("The exception above occurred " +++ + "because socket was closed, " +++ + "please ignore it"); ++ } ++ } ++ } ++@@ -261,6 +270,7 @@ ++ stopped = true; ++ if (!ssocket.isClosed()) { ++ try { +++ System.out.println("Server: close socket"); ++ ssocket.close(); ++ } catch (IOException e) { ++ System.out.println("Server: close: " + e); +diff -r 33e9441c53fc -r 412e3ce4141e patches/pr2808-fix_disabled_algorithms_test.patch +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/patches/pr2808-fix_disabled_algorithms_test.patch Mon Jan 25 22:06:42 2016 +0000 +@@ -0,0 +1,226 @@ ++--- openjdk.orig/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java 2015-10-21 05:20:57.910156611 +0100 +++++ openjdk/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java 2016-01-25 21:58:39.334103875 +0000 ++@@ -82,16 +82,14 @@ ++ System.setProperty("javax.net.ssl.trustStore", trustFilename); ++ System.setProperty("javax.net.ssl.trustStorePassword", passwd); ++ ++- switch (args[0]) { ++- case "default": +++ if ("default".equals(args[0])) { ++ // use default jdk.tls.disabledAlgorithms ++ System.out.println("jdk.tls.disabledAlgorithms = " ++ + Security.getProperty("jdk.tls.disabledAlgorithms")); ++ ++ // check if RC4 cipher suites can't be used by default ++ checkFailure(rc4_ciphersuites); ++- break; ++- case "empty": +++ } else if ("empty".equals(args[0])) { ++ // reset jdk.tls.disabledAlgorithms ++ Security.setProperty("jdk.tls.disabledAlgorithms", ""); ++ System.out.println("jdk.tls.disabledAlgorithms = " ++@@ -100,19 +98,19 @@ ++ // check if RC4 cipher suites can be used ++ // if jdk.tls.disabledAlgorithms is empty ++ checkSuccess(rc4_ciphersuites); ++- break; ++- default: +++ } else { ++ throw new RuntimeException("Wrong parameter: " + args[0]); ++ } ++- ++- System.out.println("Test passed"); ++ } ++ ++ /* ++ * Checks if that specified cipher suites cannot be used. ++ */ ++ private static void checkFailure(String[] ciphersuites) throws Exception { ++- try (SSLServer server = SSLServer.init(ciphersuites)) { +++ SSLServer server = null; +++ +++ try { +++ server = SSLServer.init(ciphersuites); ++ startNewThread(server); ++ while (!server.isRunning()) { ++ sleep(); ++@@ -120,16 +118,21 @@ ++ ++ int port = server.getPort(); ++ for (String ciphersuite : ciphersuites) { ++- try (SSLClient client = SSLClient.init(port, ciphersuite)) { +++ SSLClient client = null; +++ try { +++ client = SSLClient.init(port, ciphersuite); ++ client.connect(); ++ throw new RuntimeException("Expected SSLHandshakeException " ++ + "not thrown"); ++ } catch (SSLHandshakeException e) { ++ System.out.println("Expected exception on client side: " ++ + e); +++ } finally { +++ if (client != null) { client.close(); } ++ } ++ } ++ +++ server.stop(); ++ while (server.isRunning()) { ++ sleep(); ++ } ++@@ -138,15 +141,18 @@ ++ throw new RuntimeException("Expected SSL exception " ++ + "not thrown on server side"); ++ } +++ } finally { +++ if (server != null ) { server.close(); } ++ } ++- ++ } ++ ++ /* ++ * Checks if specified cipher suites can be used. ++ */ ++ private static void checkSuccess(String[] ciphersuites) throws Exception { ++- try (SSLServer server = SSLServer.init(ciphersuites)) { +++ SSLServer server = null; +++ try { +++ server = SSLServer.init(ciphersuites); ++ startNewThread(server); ++ while (!server.isRunning()) { ++ sleep(); ++@@ -154,7 +160,9 @@ ++ ++ int port = server.getPort(); ++ for (String ciphersuite : ciphersuites) { ++- try (SSLClient client = SSLClient.init(port, ciphersuite)) { +++ SSLClient client = null; +++ try { +++ client = SSLClient.init(port, ciphersuite); ++ client.connect(); ++ String negotiated = client.getNegotiatedCipherSuite(); ++ System.out.println("Negotiated cipher suite: " ++@@ -163,6 +171,8 @@ ++ throw new RuntimeException("Unexpected cipher suite: " ++ + negotiated); ++ } +++ } finally { +++ if (client != null) { client.close(); } ++ } ++ } ++ ++@@ -174,6 +184,8 @@ ++ if (server.error()) { ++ throw new RuntimeException("Unexpected error on server side"); ++ } +++ } finally { +++ if (server != null) { server.close(); } ++ } ++ ++ } ++@@ -193,7 +205,7 @@ ++ } ++ } ++ ++- static class SSLServer implements Runnable, AutoCloseable { +++ static class SSLServer implements Runnable { ++ ++ private final SSLServerSocket ssocket; ++ private volatile boolean stopped = false; ++@@ -210,7 +222,9 @@ ++ System.out.println("Server: started"); ++ running = true; ++ while (!stopped) { ++- try (SSLSocket socket = (SSLSocket) ssocket.accept()) { +++ SSLSocket socket = null; +++ try { +++ socket = (SSLSocket) ssocket.accept(); ++ System.out.println("Server: accepted client connection"); ++ InputStream in = socket.getInputStream(); ++ OutputStream out = socket.getOutputStream(); ++@@ -225,19 +239,16 @@ ++ } catch (SSLHandshakeException e) { ++ System.out.println("Server: run: " + e); ++ sslError = true; ++- stopped = true; ++ } catch (IOException e) { ++ if (!stopped) { ++- System.out.println("Server: run: unexpected exception: " ++- + e); +++ System.out.println("Server: run: " + e); ++ e.printStackTrace(); ++ otherError = true; ++- stopped = true; ++- } else { ++- System.out.println("Server: run: " + e); ++- System.out.println("The exception above occurred " ++- + "because socket was closed, " ++- + "please ignore it"); +++ } +++ } finally { +++ if (socket != null ) { +++ try { socket.close(); } +++ catch (IOException e) { } ++ } ++ } ++ } ++@@ -270,7 +281,6 @@ ++ stopped = true; ++ if (!ssocket.isClosed()) { ++ try { ++- System.out.println("Server: close socket"); ++ ssocket.close(); ++ } catch (IOException e) { ++ System.out.println("Server: close: " + e); ++@@ -278,7 +288,6 @@ ++ } ++ } ++ ++- @Override ++ public void close() { ++ stop(); ++ } ++@@ -300,7 +309,7 @@ ++ } ++ } ++ ++- static class SSLClient implements AutoCloseable { +++ static class SSLClient { ++ ++ private final SSLSocket socket; ++ ++@@ -310,11 +319,12 @@ ++ ++ void connect() throws IOException { ++ System.out.println("Client: connect to server"); ++- try ( ++- BufferedInputStream bis = new BufferedInputStream( ++- socket.getInputStream()); ++- BufferedOutputStream bos = new BufferedOutputStream( ++- socket.getOutputStream())) { +++ BufferedInputStream bis = null; +++ BufferedOutputStream bos = null; +++ try { +++ bis = new BufferedInputStream(socket.getInputStream()); +++ bos = new BufferedOutputStream(socket.getOutputStream()); +++ ++ bos.write('x'); ++ bos.flush(); ++ ++@@ -323,6 +333,9 @@ ++ throw new IOException("Client: couldn't read a response"); ++ } ++ socket.getSession().invalidate(); +++ } finally { +++ if (bis != null) { bis.close(); } +++ if (bos != null) { bos.close(); } ++ } ++ } ++ ++@@ -334,7 +347,6 @@ ++ return socket.getSession().getCipherSuite(); ++ } ++ ++- @Override ++ public void close() throws Exception { ++ if (!socket.isClosed()) { ++ try { diff --git a/SOURCES/pr2849.patch b/SOURCES/pr2849.patch new file mode 100644 index 0000000..38b4c73 --- /dev/null +++ b/SOURCES/pr2849.patch @@ -0,0 +1,21 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -33,7 +33,6 @@ + IT_FIND_TOOL([TAR], [tar]) + IT_FIND_TOOL([CHMOD], [chmod]) + IT_FIND_TOOL([SHA256SUM], [sha256sum]) +-IT_FIND_TOOL([WGET], [wget]) + IT_FIND_TOOL([ZIP], [zip]) + IT_FIND_TOOL([UNZIP], [unzip]) + IT_FIND_TOOL([CPIO], [cpio]) +@@ -268,6 +267,9 @@ + IT_FIND_ECJ_JAR + IT_FIND_TOOL([XSLTPROC], [xsltproc]) + fi ++if test "x$enable_downloading" = "xyes"; then ++ IT_FIND_TOOL([WGET], [wget]) ++fi + IT_USING_CACAO + AC_CONFIG_FILES([javac], [chmod +x javac]) + AC_CONFIG_FILES([javap], [chmod +x javap]) diff --git a/SOURCES/pre-2009-spec-changelog b/SOURCES/pre-2009-spec-changelog new file mode 100644 index 0000000..04613be --- /dev/null +++ b/SOURCES/pre-2009-spec-changelog @@ -0,0 +1,1021 @@ +# This file contains the spec file changelogs prior to 2011 + +* Tue Jun 06 2011 Jiri Vanek - 1:1.6.0.0-58.1.10.2 +- Resolves: rhbz#709375 +- Bumped to IcedTea6 1.10.2 +- RH706250, S6213702, CVE-2011-0872: (so) non-blocking sockets with TCP urgent + disabled get still selected for read ops (win) +- RH706106, S6618658, CVE-2011-0865: Vulnerability in deserialization +- RH706111, S7012520, CVE-2011-0815: Heap overflow vulnerability in + FileDialog.show() (win) +- RH706139, S7013519, CVE-2011-0822, CVE-2011-0862: Integer overflows in 2D + code +- RH706153, S7013969, CVE-2011-0867: NetworkInterface.toString can reveal + bindings +- RH706234, S7013971, CVE-2011-0869: Vulnerability in SAAJ +- RH706239, S7016340, CVE-2011-0870: Vulnerability in SAAJ +- RH706241, S7016495, CVE-2011-0868: Crash in Java 2D transforming an image + with scale close to zero +- RH706248, S7020198, CVE-2011-0871: ImageIcon creates Component with null acc +- RH706245, S7020373, CVE-2011-0864: JSR rewriting can overflow memory address + size variables + +* Tue Apr 19 2011 Deepak Bhole 1:1.6.0.0-57.1.10.1 +- Updated to IcedTea6 1.10.1 +- Added --disable-bootstrap switch for non-bootstrap builds +- Updated hotspot tarball to hs20-b11 (f0f676c5a2c6) +- Removed java-1.6.0-openjdk-fix-RA.patch (in icedTea6 1.10.1) + +* Tue Apr 13 2011 Jiri Vanek 1:1.6.0.0-57.1.10 +- removed BuildRequires: libstdc++-static as it is fixed upstream +- added information for icedtea6.1.10 fixlist: http://blog.fuseyism.com/index.php/2011/04/04/icedtea6-1101-released/ + + +* Tue Apr 12 2011 Dan Horák 1:1.6.0.0-56.1.10 +- fix autogen vs. patch5 order + +* Tue Mar 15 2011 Jiri Vanek 1:1.6.0.0-55.1.10 +-removed plugin +-bumped to icedtea6 1.10 +-./configure adapted for icedtea6 1.10 +-added newest hotspot 20 +-bumped to openjdk b22 +-added patch5 makefile-xalan-deps.patch to sutisfy xalan dependencies. +-fixed patch0 +-added patch6 + +* Tue Feb 15 2011 Deepak Bhole 1:1.6.0.0-52.1.9.7 +- Updated to IcedTea6 1.9.7 +- Enabled bootstrap +- Security updates: + S6378709, CVE-2010-4465: AWT event dispatch does not support framework code + S6854912, CVE-2010-4465: Security issue with the clipboard access in Applets + S6878713, CVE-2010-4469: Verifier heap corruption, relating to backward jsrs + S6907662, CVE-2010-4465: System clipboard should ensure access restrictions + S6927050, CVE-2010-4470: Features set on SchemaFactory not inherited by + Validator + S6981922, CVE-2010-4448: DNS cache poisoning by untrusted applets + S6983554, CVE-2010-4450: (launcher) Fix empty user's LD_LIBRARY_PATH + environment variable in the launcher + S6985453, CVE-2010-4471: Font.createFont may expose some system properties + in exception text + S6994263, CVE-2010-4472: Untrusted code can replace JRE's XML DSig Transform + or C14N algorithm implementations + RH677332, CVE-2011-0706: IcedTea multiple signers privilege escalation + +* Wed Feb 9 2011 Jiri Vanek 1:1.6.0.0-53.1.9.6 +- updated to icedtea 1.9.6 +- Security updates + - S4421494, CVE-2010-4476: infinite loop while parsing double literal. + + +* Wed Feb 09 2011 Fedora Release Engineering - 1:1.6.0.0-52.1.9.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 28 2011 Jiri Vanek 1:1.6.0.0-51.1.9.5 +- updated to icedtea 1.9.5 +- http://blog.fuseyism.com/index.php/2011/02/01/security-icedtea6-178-185-195-released/ + +* Tue Jan 18 2011 Jiri Vanek - 1:1.6.0.0-50.1.9.4 +- updated to iced tea 1.9.4 + +* Thu Jan 13 2011 Deepak Bhole - 1:1.6.0.0-49.1.9.3 +- Sync with F14 and rebuild for rawhide: + From Deepak Bhole : + - Updated to IcedTea 1.9.3 + - Resolves: rhbz# 645843 + - Resolves: rhbz# 647737 + - Resolves: rhbz# 643674 + - Remove patch that disabled Compressed Oops. It is now the default upstream. + - Added BR for libstdc++-static + - From Andrew Hughes (ahughes@redhat.com): Updated to IcedTea 1.9.1 + - Sync with F13: + - Fixed plugin update to IcedTeaPlugin.so + - Fixed plugin cpu usage issue + - Fixed plugin rewrites ? in URL + - Resolves: rhbz#500077 + - Resolves: rhbz#560193 + - Resolves: rhbz#601281 + - Resolves: rhbz#616893 + - Resolves: rhbz#616895 + - Resolves: rhbz#595191 + - Resovles: rhbz#596850 + - Resolves: rhbz#597134 + - Resolves: rhbz#580432 + - Resovles: rhbz#598353 + - Resolves: rhbz#592553 + - Resolves: rhbz#602906 + From Jiri Vanek : + - Resolves: rhbz#657491 + - Removed Asian and Indic font dependencies. + - added fonts dependencies + +* Tue Nov 2 2010 Jiri Vanek -1:1.6.0-41.1.8 +-fixing rhbz#648499 - BuildRequires: redhat-lsb + +* Mon Oct 18 2010 JiriVanek - 1:1.6.0.0-40.b18 +- added javaws man pages +- Updated name + +* Wed Jun 09 2010 Deepak Bhole - 1:1.6.0.0-39.b18 +- Update source file names + +* Tue Jun 08 2010 Deepak Bhole - 1:1.6.0.0-38.b18 +- Change file-requires to requires for mozilla-filesystem%{?_isa} + +* Mon Apr 12 2010 Martin Matejovic - 1:1.6.0-37.b18 +- Added icedtea6-1.8 +- Added openjdk b18 +- Removed java-1.6.0-openjdk-securitypatches-20100323.patch +- Removed java-1.6.0-openjdk-linux-globals.patch +- Removed java-1.6.0-openjdk-memory-barriers.patch + + +* Tue Mar 30 2010 Martin Matejovic - 1:1.6.0-37.b17 +- Added java-1.6.0-openjdk-securitypatches-20100323.patch +- Added java-1.6.0-openjdk-linux-globals.patch +- Added java-1.6.0-openjdk-memory-barriers.patch +- Resolves: rhbz#575760 +- Resolves: rhbz#575764 +- Resolves: rhbz#575736 +- Resolves: rhbz#575740 +- Resolves: rhbz#575745 +- Resolves: rhbz#575747 +- Resolves: rhbz#575755 +- Resolves: rhbz#575756 +- Resolves: rhbz#575818 +- Resolves: rhbz#575808 +- Resolves: rhbz#575789 +- Resolves: rhbz#575775 +- Resolves: rhbz#575772 +- Resolves: rhbz#575769 +- Resolves: rhbz#533125 +- Resolves: rhbz#575871 +- Resolves: rhbz#575865 +- Resolves: rhbz#575861 +- Resolves: rhbz#575854 +- Resolves: rhbz#575846 + +* Tue Mar 2 2010 Martin Matejovic - 1:1.6.0-35.b17 +- Added icedtea6-1.7.1 +- Resolves: rhbz#542586 +- Resolves: rhbz#568640 +- Resolves: rhbz#567228 +- Resolves: rhbz#539971 +- Resolves: rhbz#555503 +- Resolves: rhbz#523651 +- Resolves: rhbz#500077 +- Resolves: rhbz#475892 + +* Fri Jan 29 2010 Martin Matejovic - 1:1.6.0-34.b17 +- Added icedtea6-1.7 +- Added openjdk b17 +- npplugin enabled +- Removed: java-1.6.0-openjdk-netbeans.patch +- Removed: java-1.6.0-openjdk-securitypatches-20091103.patch +- Removed: java-1.6.0-openjdk-sparc-fixes.patch +- Removed: java-1.6.0-openjdk-sparc-hotspot.patch +- Removed: java-1.6.0-openjdk-x11.patch + +* Mon Dec 14 2009 Martin Matejovic - 1:1.6.0-33.b16 +- Added java-1.6.0-openjdk-elf-debuginfo.patch +- Added java-1.6.0-openjdk-debuginfo.patch + +* Thu Nov 12 2009 Martin Matejovic - 1:1.6.0-33.b16 +- Updated release +- Fixed applying patches + +* Mon Nov 09 2009 Martin Matejovic - 1:1.6.0-32.b16 +- Added java-1.6.0-openjdk-securitypatches-20091103.patch +- Removed BuildRequirement: openmotif-devel, lesstif-devel +- Resolves: rhbz#510197 +- Resolves: rhbz#530053 +- Resolves: rhbz#530057 +- Resolves: rhbz#530061 +- Resolves: rhbz#530062 +- Resolves: rhbz#530063 +- Resolves: rhbz#530067 +- Resolves: rhbz#530098 +- Resolves: rhbz#530173 +- Resolves: rhbz#530175 +- Resolves: rhbz#530296 +- Resolves: rhbz#530297 +- Resolves: rhbz#530300 + +* Thu Sep 9 2009 Lillian Angel - 1:1.6.0-31.b16 +- Added java-1.6.0-openjdk-netbeans.patch. +- Reenabled visualvm. + +* Thu Sep 9 2009 Lillian Angel - 1:1.6.0-30.b16 +- Temporarily removed building of visualvm. + +* Thu Sep 9 2009 Lillian Angel - 1:1.6.0-30.b16 +- Removed unneeded patches. +- Updated icedteaver to 1.6 +- Resolves: rhbz#484858 +- Resolves: rhbz#497408 +- Resolves: rhbz#489414 + +* Mon Aug 10 2009 Ville Skyttä - 1:1.6.0-29.b16 +- Use bzipped java-access-bridge tarball. + +* Tue Aug 4 2009 Lillian Angel - 1:1.6.0-28.b16 +- Updated java-1.6.0-openjdk-netx.patch, and renamed to +java-1.6.0-openjdk-netxandplugin.patch. +- Added java-1.6.0-openjdk-securitypatches.patch. +- Resolves: rhbz#512101 +- Resolves: rhbz#512896 +- Resolves: rhbz#512914 +- Resolves: rhbz#512907 +- Resolves: rhbz#512921 +- Resolves: rhbz#511915 +- Resolves: rhbz#512915 +- Resolves: rhbz#512920 +- Resolves: rhbz#512714 +- Resolves: rhbz#513215 +- Resolves: rhbz#513220 +- Resolves: rhbz#513222 +- Resolves: rhbz#513223 +- Resolves: rhbz#503794 + +* Thu Jul 30 2009 Lillian Angel - 1:1.6.0-27.b16 +- java-1.6.0-openjdk-x11.patch updated. + +* Wed Jul 29 2009 Lillian Angel - 1:1.6.0-27.b16 +- Renamed java-1.6.0-openjdk-libx11.patch to java-1.6.0-openjdk-x11.patch +and updated. + +* Wed Jul 29 2009 Lillian Angel - 1:1.6.0-26.b16 +- Added java-1.6.0-openjdk-libx11.patch. + +* Fri Jul 24 2009 Fedora Release Engineering - 1:1.6.0.0-25.b16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jul 10 2009 Lillian Angel - 1:1.6.0-24.b16 +- Added java-1.6.0-openjdk-execvpe.patch. + +* Thu Jul 9 2009 Lillian Angel - 1:1.6.0-24.b16 +- Added java-1.6.0-openjdk-netx.patch +- Moved policytool to devel package. +- Updated release. +- Resolves: rhbz#507870 +- Resolves: rhbz#471346 + +* Fri May 29 2009 Lillian Angel - 1:1.6.0-23.b16 +- Fixed abs-install-dir. +- Updated release. + +* Fri May 29 2009 Lillian Angel - 1:1.6.0-22.b16 +- Set icedteasnapshot to nil. +- Updated release. + +* Wed May 21 2009 Lillian Angel - 1:1.6.0-21.b16 +- Disable building systemtap on non-jit arches. + +* Tue May 19 2009 Lillian Angel - 1:1.6.0-21.b16 +- Set icedteasnapshot. Only release candidate. + +* Tue May 19 2009 Lillian Angel - 1:1.6.0-21.b16 +- Removed java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk-securitypatches.patch +java-1.6.0-openjdk-pulsejava.patch. +- Updated visualvm source. +- Updated sparc patches. +- Updated release. +- Updated icedteaver. +- Updated openjdkver. +- Updated openjdkdate. +- Adjusted buildoutputdir. +- Set runtests to 0. Hanging test causing problems. +- Include systemtap support, install hotspot tapset. +- Resolves: rhbz#479041 +- Resolves: rhbz#480075 +- Resolves: rhbz#483095 +- Resolves: rhbz#487872 +- Resolves: rhbz#467591 +- Resolves: rhbz#487452 +- Resolves: rhbz#498109 +- Resolves: rhbz#497191 +- Resolves: rhbz#462876 +- Resolves: rhbz#489586 +- Resolves: rhbz#501391 + +* Wed May 6 2009 Lillian Angel - 1:1.6.0.0-20.b14 +- Added devel requirement for netbeans-platform + +* Mon Apr 27 2009 Christopher Aillon - 1:1.6.0.0-20.b14 +- Rebuild against newer gecko + +* Mon Apr 6 2009 Lillian Angel - 1:1.6.0-19.b14 +- Updated java-1.6.0-openjdk-lcms.patch + +* Thu Apr 2 2009 Lillian Angel - 1:1.6.0-18.b14 +- Added java-1.6.0-openjdk-pulsejava.patch. +- Updated release. +- Updated java-1.6.0-openjdk-lcms.patch. +- Resolves: rhbz#492367 +- Resolves: rhbz#493276 + +* Tue Mar 24 2009 Lillian Angel - 1:1.6.0-17.b14 +- Updated java-1.6.0-openjdk-lcms.patch. + +* Tue Mar 24 2009 Lillian Angel - 1:1.6.0-16.b14 +- Added java-1.6.0-openjdk-securitypatches.patch. +- Updated release. + +* Fri Mar 20 2009 Lillian Angel - 1:1.6.0-15.b14 +- Added java-1.6.0-openjdk-lcms.patch. + +* Mon Mar 9 2009 Lillian Angel - 1:1.6.0-14.b14 +- Updated sources. +- Resolves: rhbz#489029 + +* Mon Mar 2 2009 Lillian Angel - 1:1.6.0-14.b14 +- Reverting last change. + +* Mon Mar 2 2009 Lillian Angel - 1:1.6.0-14.b14 +- Fixed archinstall i386 to i586, since Fedora 11 made the switch. + +* Wed Feb 25 2009 Dennis Gilmore - 1:1.6.0-13.b14 +- fix sparc arch building asm-sparc has gone. we only have asm/ now +- add sparc arches back to the jit arch list + +* Wed Feb 25 2009 Lillian Angel - 1:1.6.0.0-12.b14 +- Updated release. +- Updated icedteaver. +- Re-enabled visualvm building. +- Installed jvisualvm appropriately. +- Resolves: rhbz#480487 +- Resolves: rhbz#482943 + +* Wed Feb 25 2009 Fedora Release Engineering - 1:1.6.0.0-11.b14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jan 26 2009 Lillian Angel - 1:1.6.0-10.b14 +- Updated sources. + +* Fri Jan 23 2009 Lillian Angel - 1:1.6.0-10.b14 +- Added accessibility patch. + +* Thu Jan 22 2009 Lillian Angel - 1:1.6.0-10.b14 +- Updated to icedtea-1.4 snapshot. +- Updated release. +- Removed netbeans and visualvm. +- Resolves: rhbz#472953 +- Resolves: rhbz#475081 +- Resolves: rhbz#452573 +- Resolves: rhbz#477351 +- Resolves: rhbz#475109 +- Resolves: rhbz#476462 + +* Sun Jan 11 2009 Lillian Angel - 1:1.6.0-9.b14 +- Removed README.plugin, updated source list. +- Updated release. + +* Fri Dec 5 2008 Lillian Angel - 1:1.6.0-8.b14 +- Added hotspot source. +- Added --with-hotspot-src-zip build option. +- Set runtests to 1. +- Updated jtreg log. +- Added new patch to add GNOME to java.security. +- Updated icedteasnapshot. +- Updated openjdkver. +- Updated openjdkdate. +- Resolves: rhbz#474431 +- Resolves: rhbz#474503 +- Resolves: rhbz#472862 + +* Tue Dec 2 2008 Lillian Angel - 1:1.6.0-7.b13 +- Set runtests to 0. + +* Tue Dec 2 2008 Lillian Angel - 1:1.6.0-7.b13 +- Updated pkgversion to include release and arch. +- Set runtests to 1. +- Updated icedteasnapshot. +- Resolves: rhbz#468484 +- Resolves: rhbz#472862 +- Resolves: rhbz#472234 +- Resolves: rhbz#472233 +- Resolves: rhbz#472231 +- Resolves: rhbz#472228 +- Resolves: rhbz#472224 +- Resolves: rhbz#472218 +- Resolves: rhbz#472213 +- Resolves: rhbz#472212 +- Resolves: rhbz#472211 +- Resolves: rhbz#472209 +- Resolves: rhbz#472208 +- Resolves: rhbz#472206 +- Resolves: rhbz#472201 + +* Mon Nov 24 2008 Lillian Angel - 1:1.6.0-6.b13 +- Updated icedteasnapshot. +- Updated openjdkver to b13. +- Updated openjdkdate. +- Resolves: rhbz#471987 +- Resolves: rhbz#465531 +- Resolves: rhbz#470551 + +* Thu Nov 20 2008 Lillian Angel - 1:1.6.0-6.b12 +- Redirect error from removing gcjwebplugin link. +- Resolves: rhbz#471568 + +* Thu Nov 13 2008 Lillian Angel - 1:1.6.0-5.b12 +- Added java-fonts to Provides for base package. +- Resolves: rhbz#469893 + +* Wed Nov 12 2008 Lillian Angel - 1:1.6.0-4.b12 +- Fixed pulse audio build requirements. +- Updated release. +- Resolves: rhbz#471229 + +* Fri Nov 7 2008 Lillian Angel - 1:1.6.0-3.b12 +- Updated icedteasnapshot. +- Resolves: rhbz#453290 +- Resolves: rhbz#469361 + +* Wed Nov 5 2008 Lillian Angel - 1:1.6.0-3.b12 +- Re-enabled pulse java. Fix committed upstream to prevent TCK failures. +- Updated release. +- Updated icedteasnapshot. +- Updated icedteaver. +- Updated visualvm source. + +* Thu Oct 30 2008 Lillian Angel - 1:1.6.0-2.b12 +- Fixed post plugin scriptlet to work for install, as well as upgrade. + +* Wed Oct 29 2008 Lillian Angel - 1:1.6.0-2.b12 +- Fixed release string. + +* Mon Oct 27 2008 Lillian Angel - 1:1.6.0-2b12 +- Updated icedteasnapshot. +- Fixed post scriptlet to remove gcjwebplugin.so. +- Updated jvisualvm requirement. +- Added build option --with-pkgversion=6b12-Fedora-10 +- Resolves: rhbz#428503 +- Resolves: rhbz#251829 +- Resolves: rhbz#415061 +- Resolves: rhbz#452188 + +* Mon Oct 27 2008 Lillian Angel - 1:1.6.0-1.2.b12 +- Added netbeans requirement for devel package. +- Fixed removal of gcjwebplugin.so link when installing plugin package. +- Updated Release. +- Resolves: rhbz#468635 + +* Fri Oct 24 2008 Lillian Angel - 1:1.6.0-1.1.b12 +- Removed --enable-pulse-java. Causes some TCK tests to fail. + +* Fri Oct 24 2008 Lillian Angel - 1:1.6.0-1.1.b12 +- Updated sources to include latest liveconnect fixes. + +* Wed Oct 22 2008 Lillian Angel - 1:1.6.0-1.0.b12 +- Removed option to build with alternate jar. + +* Tue Oct 21 2008 Lillian Angel - 1:1.6.0-1.0.b12 +- Updated icedteaver. +- Updated Release. +- Changed to use IcedTeaPlugin.so instead of gcjwebplugin.so. Includes +LiveConnect support. +- Updated mauvedate. +- Added xulrunner-devel and xulrunner-devel-unstable as build requirements. +- Enabled building of pulse-java, not default sound implementation though. +- Added build requirements for pulse-java. +- Resolves: rhbz#468043 +- Resolves: rhbz#375161 +- Resolves: rhbz#432184 +- Resolves: rhbz#302071 +- Resolves: rhbz#457536 +- Resolves: rhbz#460236 +- Resolves: rhbz#460084 +- Resolves: rhbz#467794 + +* Tue Oct 14 2008 Lillian Angel - 1:1.6.0-0.23.b12 +- Updated icedteasnapshot to nil. +- Updated release. +- Added jakarta-commons-logging requirement for visualvm. + +* Thu Oct 2 2008 Lillian Angel - 1:1.6.0-0.22.b12 +- Enabled building of jvisualvm tool. + +* Wed Sep 24 2008 Lillian Angel - 1:1.6.0-0.21.b12 +- Removed all instances of security jars. + +* Wed Sep 24 2008 Lillian Angel - 1:1.6.0-0.21.b12 +- Updated icedteasnapshot. +- Updated release. +- Updated openjdkver. +- Updated openjdkdate. + +* Mon Sep 22 2008 Lillian Angel - 1:1.6.0-0.20.b11 +- Removed update-desktop-database dependency. +- Resolves: rhbz#463046 + +* Mon Sep 08 2008 Lillian Angel - 1:1.6.0-0.20.b11 +- Added rhino requirement. +- Resolves: rhbz#461336 + +* Tue Aug 05 2008 Lillian Angel 1:1.6.0-0.20.b11 +- Updated icedteasnapshot. + +* Thu Jul 31 2008 Lillian Angel 1:1.6.0-0.20.b11 +- Added java-access-bridge idlj patch. Temp workaround for bug similar to: +http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6708395. + +* Mon Jul 28 2008 Lillian Angel - 1:1.6.0-0.20.b11 +- Removed freetype patch. + +* Wed Jul 23 2008 Lubomir Rintel - 1:1.6.0-0.20.b11 +- Specify vendor for javaws desktop entry. +- Merge EPEL-5 and Fedora devel packages. + +* Mon Jul 21 2008 Lillian Angel - 1:1.6.0.0-0.19.b11 +- Updated icedteasnapshot. + +* Wed Jul 16 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Updated icedteasnapshot. +- Updated openjdkver. +- Updated openjdkdate. +- Updated generate-fedora-zip.sh + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Updated accessver to 1.23. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Added rhino as a BuildRequirement. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Removed all unneeded patches. Security patches are included in the +new icedtea source. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Fixed fedorazip. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Updated icedteaver. +- Updated icedteasnapshot. +- Updated openjdkdate. +- Updated openjdkver. +- Updated release. +- Resolves: rhbz#452525 +- Resolves: rhbz#369861 + +* Thu Jul 9 2008 Lillian Angel - 1:1.6.0.0-0.17.b09 +- Added sparc/64 patches. + +* Wed Jul 8 2008 Lillian Angel - 1:1.6.0.0-0.17.b09 +- Only apply hotspot security patch of jitarches. + +* Wed Jul 2 2008 Lillian Angel - 1:1.6.0.0-0.17.b09 +- Added OpenJDK security patches. + +* Tue Jun 3 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.16.b09 +- Add runtests define. +- Provide Xvfb instance to jtreg. +- Run test suites on JIT architectures only. +- Clean up arch handling. + +* Fri May 30 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Remove jhat patch. + +* Fri May 30 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Remove makefile patch. +- Update generate-fedora-zip.sh. + +* Fri May 30 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Formatting cleanups. + +* Fri May 30 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Group all Mauve commands. + +* Fri May 30 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Formatting cleanups. +- Add jtreg_output to src subpackage. + +* Wed May 28 2008 Lillian Angel - 1:1.6.0.0-0.15.b09 +- Updated icedteasnapshot for new release. + +* Tue May 27 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Require ca-certificates. +- Symlink to ca-certificates cacerts. +- Remove cacerts from files list. +- Resolves: rhbz#444260 + +* Mon May 26 2008 Lillian Angel - 1:1.6.0.0-0.14.b09 +- Added eclipse-ecj build requirement for mauve. +- Updated icedteasnapshot. + +* Fri May 23 2008 Lillian Angel - 1:1.6.0.0-0.14.b09 +- Fixed jtreg testing. + +* Fri May 23 2008 Lillian Angel - 1:1.6.0.0-0.14.b09 +- Updated icedteasnapshot. +- Updated release. +- Added jtreg testing. + +* Thu May 22 2008 Lillian Angel - 1:1.6.0.0-0.13.b09 +- Added new patch java-1.6.0-openjdk-java-access-bridge-tck.patch. +- Updated release. + +* Mon May 05 2008 Lillian Angel - 1:1.6.0.0-0.12.b09 +- Updated release. +- Updated icedteasnapshot. +- Resolves: rhbz#445182 +- Resolves: rhbz#445183 + +* Tue Apr 29 2008 Lillian Angel - 1:1.6.0.0-0.11.b09 +- Fixed javaws.desktop installation. + +* Tue Apr 29 2008 Lillian Angel - 1:1.6.0.0-0.11.b09 +- Updated icedteasnapshot. +- Removed java-1.6.0-openjdk-jconsole.desktop and + java-1.6.0-openjdk-policytool.desktop files. + +* Tue Apr 29 2008 Lillian Angel - 1:1.6.0.0-0.11.b09 +- Updated release. +- Added archbuild and archinstall definitions for ia64. +- Resolves: rhbz#433843 + +* Mon Apr 28 2008 Lubomir Rintel - 1:1.6.0.0-0.12.b08 +- Merge changes made to build on Red Hat Enterprise Linux 5, to include in EPEL: +- Require Freetype 2.2.0 instead of 2.3.0. +- Build against openmotif instead of lesstif when not on Fedora. + +* Mon Apr 28 2008 Lillian Angel - 1:1.6.0.0-0.10.b09 +- Fixed installation of javaws.desktop and javaws.png. + +* Mon Apr 28 2008 Joshua Sumali - 1:1.6.0.0-0.10.b09 +- Added javaws menu entry. +- Resolves: rhbz#443851 + +* Mon Apr 28 2008 Lillian Angel - 1:1.6.0.0-0.10.b09 +- Updated release. +- Updated icedteasnapshot. +- Added jconsole and policy menu entries. +- Removed all jhat references. +- Resolves: rhbz#435235 +- Resolves: rhbz#417501 +- Resolves: rhbz#437418 +- Resolves: rhbz#443360 +- Resolves: rhbz#304031 + +* Thu Apr 18 2008 Lillian Angel - 1:1.6.0.0-0.9.b09 +- Updated icedteaver. +- Updated icedteasnapshot. +- Updated openjdkver. +- Updated openjdkdate. +- Updated release. +- Resolves: rhbz#442602 +- Resolves: rhbz#442514 +- Resolves: rhbz#441437 +- Resolves: rhbz#375541 + +* Thu Apr 17 2008 Lillian Angel - 1:1.6.0.0-0.9.b08 +- Added javaws to /usr/bin. +- Resolves: rhbz#437929 + +* Mon Apr 08 2008 Lillian Angel - 1:1.6.0.0-0.8.b08 +- Updated sources. +- Updated icedteaver. + +* Mon Apr 07 2008 Dennis Gilmore - 1:1.6.0.0-0.8.b08 +- Enable building for all arches using zero where there is not a native port. + +* Mon Mar 31 2008 Lillian Angel - 1:1.6.0.0-0.7.b08 +- Updated icedteasnapshot. Includes sources needed to build xmlgraphics-commons. +- Updated release. +- Resolves: rhbz#439676 + +* Fri Mar 28 2008 Lillian Angel - 1:1.6.0.0-0.6.b08 +- Updated icedteasnapshot to fix ppc failure. + +* Thu Mar 27 2008 Lillian Angel - 1:1.6.0.0-0.6.b08 +- Removed iconv of THIRD_PARTY_README. + +* Thu Mar 27 2008 Lillian Angel - 1:1.6.0.0-0.6.b08 +- Updated icedteasnapshot. +- Updated openjdkver and openjdkdate. +- Removed java-1.6.0-openjdk-trademark.patch. +- Updated generate-fedora-zip.sh. +- Resolves: rhbz#438421 + +* Thu Mar 20 2008 Lillian Angel - 1:1.6.0.0-0.5.b06 +- Updated icedteasnapshot. +- Updated java-1.6.0-openjdk-optflags.patch. + +* Mon Mar 17 2008 Lillian Angel - 1:1.6.0.0-0.5.b06 +- Updated icedteasnapshot. +- Updated Release. +- Added new patch: java-1.6.0-openjdk-optflags.patch. +- Resolves: rhbz#437331 + +* Mon Mar 17 2008 Lillian Angel - 1:1.6.0.0-0.5.b06 +- Added version for freetype-devel requirement. +- Resolves: rhbz#437782 + +* Fri Mar 14 2008 Lillian Angel - 1:1.6.0.0-0.4.b06 +- Fixed Provides and Obsoletes for all sub-packages. Should have specified + java-1.7.0-icedtea < 1.7.0.0-0.999 instead of 1.7.0-0.999. +- Resolves: rhbz#437492 + +* Wed Mar 12 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.4.b06 +- Add FIXME about versionless SONAMEs. + +* Wed Mar 12 2008 Lillian Angel - 1:1.6.0.0-0.3.b06 +- Updated release. +- Updated mauvedate to 2008-03-11. +- Updated accessmajorver to 1.22. +- Updated accessminorver to 0. + +* Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 +- Updated snapshot. +- Changed icedteaopt to use --with-openjdk instead of --with-icedtea. + +* Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 +- Added Provides and Obsoletes for all subpackages. All sub-packages + replaces java-1.7.0-icedtea. +- Updated Release. +- Changed BuildRequires from java-1.7.0-icedtea to java-1.6.0-openjdk. +- Added TRADEMARK file to docs. + +* Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 +- Added Provides and Obsoletes. This package replaces java-1.7.0-icedtea. + +* Fri Feb 15 2008 Lillian Angel - 1:1.6.0.0-0.1.b06 +- Adapted for java-1.6.0-openjdk. + +* Wed Feb 13 2008 Lillian Angel - 1.7.0.0-0.25.b24 +- Added libffi requirement for ppc/64. + +* Wed Feb 13 2008 Lillian Angel - 1.7.0.0-0.25.b24 +- Updated icedteaver to 1.6. +- Updated release. + +* Mon Feb 11 2008 Lillian Angel - 1.7.0.0-0.24.b24 +- Added libjpeg-6b as a requirement. +- Resolves rhbz#432181 + +* Mon Jan 28 2008 Lillian Angel - 1.7.0.0-0.24.b24 +- Kill Xvfb after it completes mauve tests. + +* Mon Jan 21 2008 Thomas Fitzsimmons - 1.7.0.0-0.24.b24 +- Remove cgibindir macro. +- Remove icedtearelease. +- Remove binfmt_misc support. +- Remove .snapshot from changelog lines wider than 80 columns. + +* Tue Jan 08 2008 Lillian Angel - 1.7.0.0-0.23.b24.snapshot +- Added xorg-x11-fonts-misc as a build requirement for Mauve. +- Updated mauve_tests. + +* Mon Jan 07 2008 Lillian Angel - 1.7.0.0-0.23.b24.snapshot +- Updated Mauve's build requirements. +- Excluding Mauve tests that try to access the network. +- Added Xvfb functionality to mauve tests to avoid display-related failures. +- Resolves rhbz#427614 + +* Thu Jan 03 2008 Lillian Angel - 1.7.0.0-0.23.b24.snapshot +- Added mercurial as a Build Requirement. +- Fixed archbuild/archinstall if-block. + +* Thu Jan 03 2008 Lillian Angel - 1.7.0.0-0.23.b24.snapshot +- Removed BuildRequirement firefox-devel. +- Added BuildRequirement gecko-devel. +- Resolves rhbz#427350 + +* Fri Dec 28 2007 Lillian Angel - 1.7.0.0-0.23.b24.snapshot +- Updated icedtea source. +- Resolves rhbz#426142 + +* Thu Dec 13 2007 Lillian Angel - 1.7.0.0-0.23.b24.snapshot +- Updated icedteaver. +- Updated Release. +- Updated buildoutputdir. +- Removed openjdkdate. +- Updated openjdkver. +- Updated openjdkzip and fedorazip. +- Added Requires: jpackage-utils. +- Removed java-1.7.0-makefile.patch. +- Updated patch list. +- Resolves rhbz#411941 +- Resolves rhbz#399221 +- Resolves rhbz#318621 + +* Thu Dec 6 2007 Thomas Fitzsimmons - 1.7.0.0-0.22.b23 +- Clear bootstrap mode on ppc and ppc64. + +* Wed Dec 5 2007 Thomas Fitzsimmons - 1.7.0.0-0.21.b23 +- Update icedteasnapshot. + +* Fri Nov 30 2007 Thomas Fitzsimmons - 1.7.0.0-0.21.b23 +- Update icedteasnapshot. +- Remove ExclusiveArch. +- Assume i386. +- Add support for ppc and ppc64. +- Bootstrap on ppc and ppc64. + +* Thu Nov 15 2007 Thomas Fitzsimmons - 1.7.0.0-0.20.b23 +- Add giflib-devel build requirement. + +* Thu Nov 15 2007 Thomas Fitzsimmons - 1.7.0.0-0.20.b23 +- Add libjpeg-devel and libpng-devel build requirements. + +* Thu Nov 15 2007 Lillian Angel - 1.7.0.0-0.20.b23.snapshot +- Added gcjbootstrap. +- Updated openjdkver and openjdkdate to new b23 release. +- Updated Release. +- Added gcjbootstrap checks in. +- Resolves: rhbz#333721 + +* Mon Oct 15 2007 Lillian Angel - 1.7.0.0-0.19.b21.snapshot +- Updated release. + +* Fri Oct 12 2007 Lillian Angel - 1.7.0.0-0.18.b21.snapshot +- Updated release. + +* Fri Oct 12 2007 Lillian Angel - 1.7.0.0-0.17.b21.snapshot +- Added jhat patch back in. + +* Thu Oct 11 2007 Lillian Angel - 1.7.0.0-0.17.b21.snapshot +- Update icedtearelease. +- Update icedteasnapshot. +- Update openjdkver. +- Update openjdkdate. +- Updated genurl. +- Removed unneeded patches. +- Removed gcjbootstrap. +- Removed icedteaopt. +- Removed all gcj related checks. +- Resolves: rhbz#317041 +- Resolves: rhbz#314211 +- Resolves: rhbz#314141 +- Resolves: rhbz#301691 + +* Mon Oct 1 2007 Lillian Angel - 1.7.0.0-0.16.b19.snapshot +- Listed mauve_output as a doc file instead of a source. +- Added mauve_tests to the src files as doc. + +* Fri Sep 28 2007 Lillian Angel - 1.7.0.0-0.16.b19.snapshot +- Fixed testing. Output is stored in a file and passes/debug info is not shown. + +* Thu Sep 27 2007 Thomas Fitzsimmons - 1.7.0.0-0.16.b19 +- Apply patch to use system tzdata. +- Require tzdata-java. +- Fix mauve shell fragment. + +* Thu Sep 27 2007 Lillian Angel - 1.7.0.0-0.15.b19.snapshot +- Removed jtreg setup line. + +* Wed Sep 26 2007 Lillian Angel - 1.7.0.0-0.15.b19.snapshot +- Removed jtreg. Does not adhere to Fedora guidelines. + +* Tue Sep 25 2007 Lillian Angel - 1.7.0.0-0.15.b19.snapshot +- Fixed running of Xvfb so it does not terminate after a successful + test. +- Fixed mauve and jtreg test runs to not break the build when an error + is thrown + +* Mon Sep 24 2007 Lillian Angel - 1.7.0.0-0.15.b19.snapshot +- Added JTreg zip as source. +- Run JTreg tests after build for smoke testing. +- Added Xvfb as build requirement. + +* Wed Sep 12 2007 Lillian Angel - 1.7.0.0-0.15.b19.snapshot +- Added Mauve tarball as source. +- Added mauve_tests as source. +- Run Mauve after build for regression testing. + +* Thu Sep 7 2007 Thomas Fitzsimmons - 1.7.0.0-0.15.b18 +- Do not require openssl for build. +- Require openssl. +- Set gcjbootstrap to 0. +- Remove generate-cacerts.pl. +- Update icedtearelease. +- Update icedteasnapshot. +- Update openjdkver. +- Update openjdkdate. + +* Wed Sep 5 2007 Thomas Fitzsimmons - 1.7.0.0-0.15.b18 +- Rename javadoc master alternative javadocdir. +- Resolves: rhbz#269901 + +* Wed Sep 5 2007 Thomas Fitzsimmons - 1.7.0.0-0.15.b18 +- Remove epoch in plugin provides. +- Bump release number. +- Resolves: rhbz#274001 + +* Mon Aug 27 2007 Thomas Fitzsimmons - 1.7.0.0-0.14.b18 +- Include idlj man page in files list. + +* Mon Aug 27 2007 Thomas Fitzsimmons - 1.7.0.0-0.14.b18 +- Add documentation for plugin and src subpackages. +- Fix plugin alternative on x86_64. +- Add java-1.7.0-icedtea-win32.patch. +- Rename modzip.sh generate-fedora-zip.sh. +- Keep patches in main directory. +- Namespace patches. +- Add java-1.7.0-icedtea-win32.patch, README.plugin and README.src. +- Bump release number. + +* Mon Aug 27 2007 Lillian Angel - 1.7.0.0-0.13.b18.snapshot +- Added line to run modzip.sh to remove specific files from the openjdk zip. +- Defined new openjdk zip created by modzip.sh as newopenjdkzip. +- Added line to patch the IcedTea Makefile. No need to download openjdk zip. +- Updated genurl. +- Updated icedteasnapshot. + +* Fri Aug 24 2007 Thomas Fitzsimmons - 1.7.0.0-0.13.b18 +- Remove RMI CGI script and subpackage. +- Fix Java Access Bridge for GNOME URL. + +* Thu Aug 23 2007 Thomas Fitzsimmons - 1.7.0.0-0.12.b18 +- Fully qualify Java Access Bridge for GNOME and generate-cacerts + source paths. +- Fix plugin post alternatives invocation. +- Include IcedTea documentation. +- Update icedteasnapshot. + +* Tue Aug 21 2007 Thomas Fitzsimmons - 1.7.0.0-0.11.b18 +- Revert change to configure macro. + +* Mon Aug 20 2007 Thomas Fitzsimmons - 1.7.0.0-0.11.b18 +- Fix rpmlint errors. + +* Mon Aug 20 2007 Thomas Fitzsimmons - 1.7.0.0-0.11.b18 +- Add missing development alternatives. +- Bump accessver to 1.19.2. +- Bump icedteaver. +- Set icedteasnapshot. +- Define icedtearelease. +- Bump openjdkver. +- Bump openjdkdate. +- Bump release number. +- Add plugin build requirements and subpackage. + +* Tue Jul 31 2007 Lillian Angel - 1.7.0.0-0.10.b16.1.2 +- Bump icedteaver. +- Updated icedteasnapshot. +- Updated release to include icedteaver. + +* Wed Jul 25 2007 Lillian Angel - 1.7.0.0-0.9.b16 +- Updated icedteasnapshot. +- Bump openjdkver. +- Bump openjdkdate. +- Bump release number. + +* Wed Jul 18 2007 Thomas Fitzsimmons - 1.7.0.0-0.8.b15 +- Only build rmi subpackage on non-x86_64 architectures. + +* Wed Jul 18 2007 Thomas Fitzsimmons - 1.7.0.0-0.8.b15 +- Bump icedteaver. +- Update icedteasnapshot. + +* Fri Jul 13 2007 Thomas Fitzsimmons - 1.7.0.0-0.8.b15 +- Add rmi subpackage. +- Remove name-version javadoc directory. + +* Fri Jul 13 2007 Thomas Fitzsimmons - 1.7.0.0-0.8.b15 +- Set man extension to .gz in base and devel post sections. + +* Thu Jul 12 2007 Thomas Fitzsimmons - 1.7.0.0-0.7.b15 +- Clear icedteasnapshot. +- Bump release number. + +* Wed Jul 11 2007 Lillian Angel - 1.7.0.0-0.6.b15 +- Updated icedteasnapshot. +- Bump openjdkver. +- Bump openjdkdate. +- Bump release number. + +* Thu Jul 5 2007 Thomas Fitzsimmons - 1.7.0.0-0.5.b14 +- Define icedteasnapshot. + +* Wed Jul 4 2007 Thomas Fitzsimmons - 1.7.0.0-0.4.b14 +- Prevent jar repacking. + +* Wed Jul 4 2007 Thomas Fitzsimmons - 1.7.0.0-0.4.b14 +- Include generate-cacerts.pl. +- Generate and install cacerts file. + +* Tue Jul 3 2007 Thomas Fitzsimmons - 1.7.0.0-0.4.b14 +- Add javadoc subpackage. +- Add Java Access Bridge for GNOME. +- Add support for executable JAR files. +- Bump alternatives priority to 17000. + +* Thu Jun 28 2007 Thomas Fitzsimmons - 1.7.0.0-0.4.b14 +- Add support for executable jar files. +- Bump icedteaver. +- Bump openjdkver. +- Bump openjdkdate. +- Bump release number. + +* Tue Jun 19 2007 Thomas Fitzsimmons - 1.7.0.0-0.3.b13 +- Import IcedTea 1.1. +- Bump icedteaver. +- Bump openjdkver. +- Bump openjdkdate. +- Bump release number. +- Use --with-openjdk-src-zip. + +* Tue Jun 12 2007 Thomas Fitzsimmons - 1.7.0.0-0.2.b12 +- Initial build. diff --git a/SPECS/java-1.6.0-openjdk.spec b/SPECS/java-1.6.0-openjdk.spec new file mode 100644 index 0000000..0a8a85c --- /dev/null +++ b/SPECS/java-1.6.0-openjdk.spec @@ -0,0 +1,1152 @@ +# If gcjbootstrap is 1 IcedTea is bootstrapped against +# java-1.5.0-gcj-devel. If gcjbootstrap is 0 IcedTea is built against +# java-1.6.0-openjdk-devel. +%define gcjbootstrap 0 + +# If debug is 1, IcedTea is built with all debug info present. +%define debug 0 + + +%define icedteaver 1.13.13 +%define icedteasnapshot %{nil} +%define openjdkver 41 +%define openjdkdate 04_jan_2017 + +%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ + +%define icedteaurl http://icedtea.classpath.org/ + +%define accessmajorver 1.23 +%define accessminorver 0 +%define accessver %{accessmajorver}.%{accessminorver} +%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/ + +%define openjdkurl https://java.net/downloads/openjdk6/ +%define rhelzip openjdk-6-src-b%{openjdkver}-%{openjdkdate}-rhel.tar.xz + +%define multilib_arches ppc64 sparc64 x86_64 + +%define jit_arches %{ix86} x86_64 sparcv9 sparc64 + +%ifarch x86_64 +%define archbuild amd64 +%define archinstall amd64 +%endif +%ifarch ppc +%define archbuild ppc +%define archinstall ppc +%endif +%ifarch ppc64 +%define archbuild ppc64 +%define archinstall ppc64 +%endif +%ifarch i386 +%define archbuild i586 +%define archinstall i386 +%endif +%ifarch i686 +%define archbuild i586 +%define archinstall i386 +%endif +%ifarch ia64 +%define archbuild ia64 +%define archinstall ia64 +%endif +%ifarch s390 +%define archbuild s390x +%define archinstall s390x +%endif +# 32 bit sparc, optimized for v9 +%ifarch sparcv9 +%define archbuild sparc +%define archinstall sparc +%endif +# 64 bit sparc +%ifarch sparc64 +%define archbuild sparcv9 +%define archinstall sparcv9 +%endif +%ifnarch %{jit_arches} +%define archbuild %{_arch} +%define archinstall %{_arch} +%endif + +%if %{debug} +%define debugbuild icedtea-debug-against-icedtea +%else +%define debugbuild %{nil} +%endif + +%if %{debug} +%define buildoutputdir openjdk.build-debug +%else +%define buildoutputdir openjdk.build +%endif + +%if %{gcjbootstrap} +%define icedteaopt %{nil} +%else +%define icedteaopt --with-jdk-home=/usr/lib/jvm/%{sdklnk} +%endif + +%ifarch %{jit_arches} +%define stapopt --enable-systemtap +%define bootstrapopt %{nil} +%else +%define stapopt %{nil} +%define bootstrapopt --disable-bootstrap +%endif + +# Convert an absolute path to a relative path. Each symbolic link is +# specified relative to the directory in which it is installed so that +# it will resolve properly within chrooted installations. +%define script 'use File::Spec; print File::Spec->abs2rel($ARGV[0], $ARGV[1])' +%define abs2rel %{__perl} -e %{script} + +# Hard-code libdir on 64-bit architectures to make the 64-bit JDK +# simply be another alternative. +%ifarch %{multilib_arches} +%define syslibdir %{_prefix}/lib64 +%define _libdir %{_prefix}/lib +%define archname %{name}.%{_arch} +%else +%define syslibdir %{_libdir} +%define archname %{name} +%endif + +# Standard JPackage naming and versioning defines. +%define origin openjdk +%define priority 16000 +%define javaver 1.6.0 +%define buildver %{openjdkver} + +# Standard JPackage directories and symbolic links. +# Make 64-bit JDKs just another alternative on 64-bit architectures. +%ifarch %{multilib_arches} +%define sdklnk java-%{javaver}-%{origin}.%{_arch} +%define jrelnk jre-%{javaver}-%{origin}.%{_arch} +%define sdkdir %{name}-%{version}.%{_arch} +%else +%define sdklnk java-%{javaver}-%{origin} +%define jrelnk jre-%{javaver}-%{origin} +%define sdkdir %{name}-%{version} +%endif +%define jredir %{sdkdir}/jre +%define sdkbindir %{_jvmdir}/%{sdklnk}/bin +%define jrebindir %{_jvmdir}/%{jrelnk}/bin +%ifarch %{multilib_arches} +%define jvmjardir %{_jvmjardir}/%{name}-%{version}.%{_arch} +%else +%define jvmjardir %{_jvmjardir}/%{name}-%{version} +%endif + +%ifarch %{jit_arches} +# Where to install systemtap tapset (links) +# We would like these to be in a package specific subdir, +# but currently systemtap doesn't support that, so we have to +# use the root tapset dir for now. To distinquish between 64 +# and 32 bit architectures we place the tapsets under the arch +# specific dir (note that systemtap will only pickup the tapset +# for the primary arch for now). Systemtap uses the machine name +# aka build_cpu as architecture specific directory name. +#%define tapsetdir /usr/share/systemtap/tapset/%{sdkdir} +%define tapsetdir /usr/share/systemtap/tapset/%{_build_cpu} +%endif + +# Prevent brp-java-repack-jars from being run. +%define __jar_repack 0 + +Name: java-%{javaver}-%{origin} +Version: %{javaver}.%{buildver} +Release: %{icedteaver}.1%{?dist} +# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, +# and this change was brought into RHEL-4. java-1.5.0-ibm packages +# also included the epoch in their virtual provides. This created a +# situation where in-the-wild java-1.5.0-ibm packages provided "java = +# 1:1.5.0". In RPM terms, "1.6.0 < 1:1.5.0" since 1.6.0 is +# interpreted as 0:1.6.0. So the "java >= 1.6.0" requirement would be +# satisfied by the 1:1.5.0 packages. Thus we need to set the epoch in +# JDK package >= 1.6.0 to 1, and packages referring to JDK virtual +# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0". +Epoch: 1 +Summary: OpenJDK Runtime Environment +Group: Development/Languages + +License: ASL 1.1, ASL 2.0, GPL+, GPLv2, GPLv2 with exceptions, LGPL+, LGPLv2, MPLv1.0, MPLv1.1, Public Domain, W3C +URL: http://icedtea.classpath.org/ +Source0: %{icedteaurl}download/source/icedtea6-%{icedteaver}%{icedteasnapshot}.tar.xz +# To generate, download OpenJDK tarball from %{openjdkurl}, +# and run %{SOURCE3} on the tarball. +Source1: %{rhelzip} +Source2: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2 +Source3: %{genurl}generate-rhel-zip.sh +Source4: README.src + +# Pre-2009 changelog, retained to ensure contributions are not lost +SOURCE900: pre-2009-spec-changelog + +# FIXME: This patch needs to be fixed. optflags argument +# -mtune=generic is being ignored because it breaks several graphical +# applications. +Patch0: java-1.6.0-openjdk-optflags.patch +Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch +Patch2: java-1.6.0-openjdk-java-access-bridge-idlj.patch +Patch3: java-1.6.0-openjdk-java-access-bridge-security.patch +Patch4: java-1.6.0-openjdk-accessible-toolkit.patch +Patch5: java-1.6.0-openjdk-debugdocs.patch +Patch6: %{name}-debuginfo.patch +# This turns off the application of PR2125 by fsg.sh as +# we do it ourselves ahead of time via generate-rhel-zip.sh +Patch7: no_pr2125.patch +# This is a RHEL-specific patch to embed RHEL-specific paths +Patch10: add-final-location-rpaths.patch +# PR2808, RH1302383: Backport "8076221: Disable RC4 cipher suites" +Patch12: pr2808.patch +# PR2849: wget not required when downloading is disabled +Patch13: pr2849.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: alsa-lib-devel +BuildRequires: cups-devel +BuildRequires: desktop-file-utils +BuildRequires: giflib-devel +BuildRequires: libcap-devel +BuildRequires: libX11-devel +BuildRequires: libXi-devel +BuildRequires: libXp-devel +BuildRequires: libXt-devel +BuildRequires: libXtst-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: ant +BuildRequires: libXinerama-devel +BuildRequires: rhino +# Provides lsb_release for generating identification +BuildRequires: redhat-lsb-core +%if %{gcjbootstrap} +BuildRequires: java-1.5.0-gcj-devel +BuildRequires: libxslt +%else +BuildRequires: java-1.6.0-openjdk-devel >= 1.6.0.40 +%endif +# Java Access Bridge for GNOME build requirements. +BuildRequires: at-spi-devel +BuildRequires: gawk +BuildRequires: libbonobo-devel +BuildRequires: pkgconfig >= 0.9.0 +BuildRequires: xorg-x11-utils +# PulseAudio build requirements. +BuildRequires: pulseaudio-libs-devel >= 0.9.11 +BuildRequires: pulseaudio >= 0.9.11 +# Zero-assembler build requirement. +%ifnarch %{jit_arches} +BuildRequires: libffi-devel +%endif + +# cacerts build requirement. +BuildRequires: openssl +# execstack build requirement. +BuildRequires: prelink +%ifarch %{jit_arches} +#systemtap build requirement. +BuildRequires: systemtap-sdt-devel +%endif +# configure looks for /etc/mime.types +# to provide the JDK symlink +BuildRequires: mailcap + +Requires: fontconfig +Requires: libjpeg = 6b +# Require /etc/pki/java/cacerts. +Requires: ca-certificates +# Require /etc/mime.types +Requires: mailcap +# Require jpackage-utils for ant. +Requires: jpackage-utils >= 1.7.3-1jpp.2 +# Require zoneinfo data provided by tzdata-java subpackage. +Requires: tzdata-java +# Post requires alternatives to install tool alternatives. +Requires(post): %{_sbindir}/alternatives +# Postun requires alternatives to uninstall tool alternatives. +Requires(postun): %{_sbindir}/alternatives + +# Standard JPackage base provides. +Provides: jre6-%{javaver}-%{origin} = %{epoch}:%{version}-%{release} +Provides: jre6-%{origin} = %{epoch}:%{version}-%{release} +Provides: jre6-%{javaver} = %{epoch}:%{version}-%{release} +Provides: java6-%{javaver} = %{epoch}:%{version}-%{release} +Provides: jre6 = %{javaver} +Provides: java6-%{origin} = %{epoch}:%{version}-%{release} +Provides: java6 = %{epoch}:%{javaver} +# Standard JPackage extensions provides. +Provides: jndi6 = %{epoch}:%{version} +Provides: jndi6-ldap = %{epoch}:%{version} +Provides: jndi6-cos = %{epoch}:%{version} +Provides: jndi6-rmi = %{epoch}:%{version} +Provides: jndi6-dns = %{epoch}:%{version} +Provides: jaas6 = %{epoch}:%{version} +Provides: jsse6 = %{epoch}:%{version} +Provides: jce6 = %{epoch}:%{version} +Provides: jdbc6-stdext = 3.0 +Provides: java6-sasl = %{epoch}:%{version} +Provides: java6-fonts = %{epoch}:%{version} + +# No means to bootstrap these architectures +ExcludeArch: aarch64 ppc64le + +%description +The OpenJDK runtime environment. + +%package devel +Summary: OpenJDK Development Environment +Group: Development/Tools + +# Require base package. +Requires: %{name} = %{epoch}:%{version}-%{release} +# Post requires alternatives to install tool alternatives. +Requires(post): %{_sbindir}/alternatives +# Postun requires alternatives to uninstall tool alternatives. +Requires(postun): %{_sbindir}/alternatives + +# Standard JPackage devel provides. +Provides: java6-sdk-%{javaver}-%{origin} = %{epoch}:%{version} +Provides: java6-sdk-%{javaver} = %{epoch}:%{version} +Provides: java6-sdk-%{origin} = %{epoch}:%{version} +Provides: java6-sdk = %{epoch}:%{javaver} +Provides: java6-%{javaver}-devel = %{epoch}:%{version} +Provides: java6-devel-%{origin} = %{epoch}:%{version} +Provides: java6-devel = %{epoch}:%{javaver} + + +%description devel +The OpenJDK development tools. + +%package demo +Summary: OpenJDK Demos +Group: Development/Languages + +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description demo +The OpenJDK demos. + +%package src +Summary: OpenJDK Source Bundle +Group: Development/Languages + +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description src +The OpenJDK source bundle. + +%package javadoc +Summary: OpenJDK API Documentation +Group: Documentation + +# Post requires alternatives to install javadoc alternative. +Requires(post): %{_sbindir}/alternatives +# Postun requires alternatives to uninstall javadoc alternative. +Requires(postun): %{_sbindir}/alternatives + +# Standard JPackage javadoc provides. +Provides: java6-javadoc = %{epoch}:%{version}-%{release} +Provides: java6-%{javaver}-javadoc = %{epoch}:%{version}-%{release} + +%description javadoc +The OpenJDK API documentation. + +%prep +%setup -q -n icedtea6-%{icedteaver}%{icedteasnapshot} +%setup -q -n icedtea6-%{icedteaver}%{icedteasnapshot} -T -D -a 2 +%patch0 +%patch7 -p1 +%patch10 -p1 +%patch12 -p1 +%patch13 -p1 + +cp %{SOURCE4} . + +%build +# How many cpu's do we have? +export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :` +export NUM_PROC=${NUM_PROC:-1} + + +# Build IcedTea and OpenJDK. +%ifarch sparc64 alpha +export ARCH_DATA_MODEL=64 +%endif +%ifarch alpha +export CFLAGS="$CFLAGS -mieee" +%endif +./autogen.sh +%configure %{bootstrapopt} --prefix=%{_jvmdir}/%{sdkdir} --exec-prefix=%{_jvmdir}/%{sdkdir} \ + --bindir=%{_jvmdir}/%{sdkdir}/bin --includedir=%{_jvmdir}/%{sdkdir}/include \ + --docdir=%{_defaultdocdir}/%{name} --mandir=%{_jvmdir}/%{sdkdir}/man \ + --htmldir=%{_javadocdir}/%{name} %{icedteaopt} %{stapopt} --with-openjdk-src-zip=%{SOURCE1} \ + --with-pkgversion=rhel-%{release}-%{_arch} --enable-pulse-java \ + --with-abs-install-dir=%{_jvmdir}/%{sdkdir} --disable-downloading \ + --with-rhino --with-parallel-jobs=$NUM_PROC --disable-lcms2 \ + --disable-tests --disable-systemtap-tests + +make DISTRIBUTION_PATCHES="patches/add-final-location-rpaths.patch patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch patches/openjdk/8078823-disabledalgorithms_fails_intermittently.patch patches/pr2808-fix_disabled_algorithms_test.patch" patch + +patch -l -p0 < %{PATCH3} +patch -l -p0 < %{PATCH4} + +%if %{debug} +patch -l -p0 < %{PATCH5} +patch -l -p0 < %{PATCH6} +%endif + +make %{debugbuild} INSTALL_LOCATION="%{_jvmdir}/%{sdkdir}" + +%ifarch %{jit_arches} +chmod 644 $(pwd)/%{buildoutputdir}/j2sdk-image/lib/sa-jdi.jar +%endif + +export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image + +# Build Java Access Bridge for GNOME. +pushd java-access-bridge-%{accessver} + patch -l -p1 < %{PATCH1} + patch -l -p1 < %{PATCH2} + OLD_PATH=$PATH + export PATH=$JAVA_HOME/bin:$OLD_PATH + ./configure + make + export PATH=$OLD_PATH + cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib + chmod 644 gnome-java-bridge.jar + cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext +popd + +%check + +# Should be 'make check' but IcedTea 1.13.x doesn't support disabling SystemTap tests +# Enable when we switch to 1.14.x +#make check +make check-mimetype +make check-java-debug +make check-java-src + +%install +rm -rf $RPM_BUILD_ROOT +STRIP_KEEP_SYMTAB=libjvm* + +pushd %{buildoutputdir}/j2sdk-image + + # Install main files. + install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + cp -a bin include lib src.zip $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} + cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} + +%ifarch %{jit_arches} + # Install systemtap support files. + cp -a tapset $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir} + pushd $RPM_BUILD_ROOT%{tapsetdir} + RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir}) + ln -sf $RELATIVE/*.stp . + popd +%endif + + # Install cacerts symlink. + rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/cacerts + pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security + RELATIVE=$(%{abs2rel} %{_sysconfdir}/pki/java \ + %{_jvmdir}/%{jredir}/lib/security) + ln -sf $RELATIVE/cacerts . + popd + + # Install extension symlinks. + install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir} + pushd $RPM_BUILD_ROOT%{jvmjardir} + RELATIVE=$(%{abs2rel} %{_jvmdir}/%{jredir}/lib %{jvmjardir}) + ln -sf $RELATIVE/jsse.jar jsse-%{version}.jar + ln -sf $RELATIVE/jce.jar jce-%{version}.jar + ln -sf $RELATIVE/rt.jar jndi-%{version}.jar + ln -sf $RELATIVE/rt.jar jndi-ldap-%{version}.jar + ln -sf $RELATIVE/rt.jar jndi-cos-%{version}.jar + ln -sf $RELATIVE/rt.jar jndi-rmi-%{version}.jar + ln -sf $RELATIVE/rt.jar jaas-%{version}.jar + ln -sf $RELATIVE/rt.jar jdbc-stdext-%{version}.jar + ln -sf jdbc-stdext-%{version}.jar jdbc-stdext-3.0.jar + ln -sf $RELATIVE/rt.jar sasl-%{version}.jar + for jar in *-%{version}.jar + do + if [ x%{version} != x%{javaver} ] + then + ln -sf $jar $(echo $jar | sed "s|-%{version}.jar|-%{javaver}.jar|g") + fi + ln -sf $jar $(echo $jar | sed "s|-%{version}.jar|.jar|g") + done + popd + + # Install JCE policy symlinks. + install -d -m 755 $RPM_BUILD_ROOT%{_jvmprivdir}/%{archname}/jce/vanilla + + # Install versionless symlinks. + pushd $RPM_BUILD_ROOT%{_jvmdir} + ln -sf %{jredir} %{jrelnk} + ln -sf %{sdkdir} %{sdklnk} + popd + + pushd $RPM_BUILD_ROOT%{_jvmjardir} + ln -sf %{sdkdir} %{jrelnk} + ln -sf %{sdkdir} %{sdklnk} + popd + + # Remove javaws man page + rm -f man/man1/javaws* + + # Install man pages. + install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1 + for manpage in man/man1/* + do + # Convert man pages to UTF8 encoding. + iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp + mv -f $manpage.tmp $manpage + install -m 644 -p $manpage $RPM_BUILD_ROOT%{_mandir}/man1/$(basename \ + $manpage .1)-%{name}.1 + done + + # Install demos and samples. + cp -a demo $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + mkdir -p sample/rmi + mv bin/java-rmi.cgi sample/rmi + cp -a sample $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + + # Run execstack on libjvm.so. + %ifarch i386 i686 + execstack -c $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{archinstall}/client/libjvm.so + %endif + execstack -c $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{archinstall}/server/libjvm.so + +popd + +# Install Javadoc documentation. +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} +cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +# Install icons and menu entries. +for s in 16 24 32 48 ; do + install -D -p -m 644 \ + openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png +done + +# Install desktop files. +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} +for e in jconsole policytool ; do + desktop-file-install --vendor=%{name} --mode=644 \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop +done + +# Find JRE directories. +find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \ + | grep -v jre/lib/security \ + | sed 's|'$RPM_BUILD_ROOT'|%dir |' \ + > %{name}.files +# Find JRE files. +find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \ + | grep -v jre/lib/security \ + | sed 's|'$RPM_BUILD_ROOT'||' \ + >> %{name}.files +# Find demo directories. +find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \ + $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample -type d \ + | sed 's|'$RPM_BUILD_ROOT'|%dir |' \ + > %{name}-demo.files + +# FIXME: remove SONAME entries from demo DSOs. See +# https://bugzilla.redhat.com/show_bug.cgi?id=436497 + +# Find non-documentation demo files. +find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \ + $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample \ + -type f -o -type l | sort \ + | grep -v README \ + | sed 's|'$RPM_BUILD_ROOT'||' \ + >> %{name}-demo.files +# Find documentation demo files. +find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \ + $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample \ + -type f -o -type l | sort \ + | grep README \ + | sed 's|'$RPM_BUILD_ROOT'||' \ + | sed 's|^|%doc |' \ + >> %{name}-demo.files + +%clean +rm -rf $RPM_BUILD_ROOT + +# FIXME: identical binaries are copied, not linked. This needs to be +# fixed upstream. +%post +ext=.gz +alternatives \ + --install %{_bindir}/java java %{jrebindir}/java %{priority} \ + --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \ + --slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \ + --slave %{_bindir}/keytool keytool %{jrebindir}/keytool \ + --slave %{_bindir}/orbd orbd %{jrebindir}/orbd \ + --slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \ + --slave %{_bindir}/rmid rmid %{jrebindir}/rmid \ + --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir}/rmiregistry \ + --slave %{_bindir}/servertool servertool %{jrebindir}/servertool \ + --slave %{_bindir}/tnameserv tnameserv %{jrebindir}/tnameserv \ + --slave %{_bindir}/unpack200 unpack200 %{jrebindir}/unpack200 \ + --slave %{_mandir}/man1/java.1$ext java.1$ext \ + %{_mandir}/man1/java-%{name}.1$ext \ + --slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \ + %{_mandir}/man1/keytool-%{name}.1$ext \ + --slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \ + %{_mandir}/man1/orbd-%{name}.1$ext \ + --slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \ + %{_mandir}/man1/pack200-%{name}.1$ext \ + --slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \ + %{_mandir}/man1/rmid-%{name}.1$ext \ + --slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \ + %{_mandir}/man1/rmiregistry-%{name}.1$ext \ + --slave %{_mandir}/man1/servertool.1$ext servertool.1$ext \ + %{_mandir}/man1/servertool-%{name}.1$ext \ + --slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \ + %{_mandir}/man1/tnameserv-%{name}.1$ext \ + --slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \ + %{_mandir}/man1/unpack200-%{name}.1$ext + +alternatives \ + --install %{_jvmdir}/jre-%{origin} \ + jre_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \ + --slave %{_jvmjardir}/jre-%{origin} \ + jre_%{origin}_exports %{_jvmjardir}/%{jrelnk} + +alternatives \ + --install %{_jvmdir}/jre-%{javaver} \ + jre_%{javaver} %{_jvmdir}/%{jrelnk} %{priority} \ + --slave %{_jvmjardir}/jre-%{javaver} \ + jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk} + +# Update for jnlp handling. +update-desktop-database %{_datadir}/applications &> /dev/null || : + +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi + +exit 0 + +%postun +if [ $1 -eq 0 ] +then + alternatives --remove java %{jrebindir}/java + alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk} + alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk} +fi + +# Update for jnlp handling. +update-desktop-database %{_datadir}/applications &> /dev/null || : + +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi + +exit 0 + +%post devel +ext=.gz +alternatives \ + --install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \ + --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdklnk} \ + --slave %{_jvmjardir}/java java_sdk_exports %{_jvmjardir}/%{sdklnk} \ + --slave %{_bindir}/appletviewer appletviewer %{sdkbindir}/appletviewer \ + --slave %{_bindir}/apt apt %{sdkbindir}/apt \ + --slave %{_bindir}/extcheck extcheck %{sdkbindir}/extcheck \ + --slave %{_bindir}/jar jar %{sdkbindir}/jar \ + --slave %{_bindir}/jarsigner jarsigner %{sdkbindir}/jarsigner \ + --slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \ + --slave %{_bindir}/javah javah %{sdkbindir}/javah \ + --slave %{_bindir}/javap javap %{sdkbindir}/javap \ + --slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \ + --slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \ + --slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \ + --slave %{_bindir}/jinfo jinfo %{sdkbindir}/jinfo \ + --slave %{_bindir}/jmap jmap %{sdkbindir}/jmap \ + --slave %{_bindir}/jps jps %{sdkbindir}/jps \ + --slave %{_bindir}/jrunscript jrunscript %{sdkbindir}/jrunscript \ + --slave %{_bindir}/jsadebugd jsadebugd %{sdkbindir}/jsadebugd \ + --slave %{_bindir}/jstack jstack %{sdkbindir}/jstack \ + --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \ + --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \ + --slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \ + --slave %{_bindir}/policytool policytool %{sdkbindir}/policytool \ + --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \ + --slave %{_bindir}/schemagen schemagen %{sdkbindir}/schemagen \ + --slave %{_bindir}/serialver serialver %{sdkbindir}/serialver \ + --slave %{_bindir}/wsgen wsgen %{sdkbindir}/wsgen \ + --slave %{_bindir}/wsimport wsimport %{sdkbindir}/wsimport \ + --slave %{_bindir}/xjc xjc %{sdkbindir}/xjc \ + --slave %{_mandir}/man1/appletviewer.1$ext appletviewer.1$ext \ + %{_mandir}/man1/appletviewer-%{name}.1$ext \ + --slave %{_mandir}/man1/apt.1$ext apt.1$ext \ + %{_mandir}/man1/apt-%{name}.1$ext \ + --slave %{_mandir}/man1/extcheck.1$ext extcheck.1$ext \ + %{_mandir}/man1/extcheck-%{name}.1$ext \ + --slave %{_mandir}/man1/jar.1$ext jar.1$ext \ + %{_mandir}/man1/jar-%{name}.1$ext \ + --slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \ + %{_mandir}/man1/jarsigner-%{name}.1$ext \ + --slave %{_mandir}/man1/javac.1$ext javac.1$ext \ + %{_mandir}/man1/javac-%{name}.1$ext \ + --slave %{_mandir}/man1/javadoc.1$ext javadoc.1$ext \ + %{_mandir}/man1/javadoc-%{name}.1$ext \ + --slave %{_mandir}/man1/javah.1$ext javah.1$ext \ + %{_mandir}/man1/javah-%{name}.1$ext \ + --slave %{_mandir}/man1/javap.1$ext javap.1$ext \ + %{_mandir}/man1/javap-%{name}.1$ext \ + --slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \ + %{_mandir}/man1/jconsole-%{name}.1$ext \ + --slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \ + %{_mandir}/man1/jdb-%{name}.1$ext \ + --slave %{_mandir}/man1/jhat.1$ext jhat.1$ext \ + %{_mandir}/man1/jhat-%{name}.1$ext \ + --slave %{_mandir}/man1/jinfo.1$ext jinfo.1$ext \ + %{_mandir}/man1/jinfo-%{name}.1$ext \ + --slave %{_mandir}/man1/jmap.1$ext jmap.1$ext \ + %{_mandir}/man1/jmap-%{name}.1$ext \ + --slave %{_mandir}/man1/jps.1$ext jps.1$ext \ + %{_mandir}/man1/jps-%{name}.1$ext \ + --slave %{_mandir}/man1/jrunscript.1$ext jrunscript.1$ext \ + %{_mandir}/man1/jrunscript-%{name}.1$ext \ + --slave %{_mandir}/man1/jsadebugd.1$ext jsadebugd.1$ext \ + %{_mandir}/man1/jsadebugd-%{name}.1$ext \ + --slave %{_mandir}/man1/jstack.1$ext jstack.1$ext \ + %{_mandir}/man1/jstack-%{name}.1$ext \ + --slave %{_mandir}/man1/jstat.1$ext jstat.1$ext \ + %{_mandir}/man1/jstat-%{name}.1$ext \ + --slave %{_mandir}/man1/jstatd.1$ext jstatd.1$ext \ + %{_mandir}/man1/jstatd-%{name}.1$ext \ + --slave %{_mandir}/man1/native2ascii.1$ext native2ascii.1$ext \ + %{_mandir}/man1/native2ascii-%{name}.1$ext \ + --slave %{_mandir}/man1/policytool.1$ext policytool.1$ext \ + %{_mandir}/man1/policytool-%{name}.1$ext \ + --slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \ + %{_mandir}/man1/rmic-%{name}.1$ext \ + --slave %{_mandir}/man1/schemagen.1$ext schemagen.1$ext \ + %{_mandir}/man1/schemagen-%{name}.1$ext \ + --slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \ + %{_mandir}/man1/serialver-%{name}.1$ext \ + --slave %{_mandir}/man1/wsgen.1$ext wsgen.1$ext \ + %{_mandir}/man1/wsgen-%{name}.1$ext \ + --slave %{_mandir}/man1/wsimport.1$ext wsimport.1$ext \ + %{_mandir}/man1/wsimport-%{name}.1$ext \ + --slave %{_mandir}/man1/xjc.1$ext xjc.1$ext \ + %{_mandir}/man1/xjc-%{name}.1$ext + +alternatives \ + --install %{_jvmdir}/java-%{origin} \ + java_sdk_%{origin} %{_jvmdir}/%{sdklnk} %{priority} \ + --slave %{_jvmjardir}/java-%{origin} \ + java_sdk_%{origin}_exports %{_jvmjardir}/%{sdklnk} + +alternatives \ + --install %{_jvmdir}/java-%{javaver} \ + java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} %{priority} \ + --slave %{_jvmjardir}/java-%{javaver} \ + java_sdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk} + +exit 0 + +%postun devel +if [ $1 -eq 0 ] +then + alternatives --remove javac %{sdkbindir}/javac + alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdklnk} + alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} +fi + +exit 0 + +%post javadoc +alternatives \ + --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{name}/api \ + %{priority} + +exit 0 + +%postun javadoc +if [ $1 -eq 0 ] +then + alternatives --remove javadocdir %{_javadocdir}/%{name}/api +fi + +exit 0 + + +%files -f %{name}.files +%defattr(-,root,root,-) +%doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION +%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE +%doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README +# FIXME: The TRADEMARK file should be in j2sdk-image. +%doc openjdk/TRADEMARK +%doc AUTHORS +%doc COPYING +%doc ChangeLog +%doc NEWS +%doc README +%dir %{_jvmdir}/%{sdkdir} +%{_jvmdir}/%{jrelnk} +%{_jvmjardir}/%{jrelnk} +%{_jvmprivdir}/* +%{jvmjardir} +%dir %{_jvmdir}/%{jredir}/lib/security +%{_jvmdir}/%{jredir}/lib/security/cacerts +%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar +%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/local_policy.jar +%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy +%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security +%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security.old +%{_datadir}/icons/hicolor/*x*/apps/java.png +%{_mandir}/man1/java-%{name}.1* +%{_mandir}/man1/keytool-%{name}.1* +%{_mandir}/man1/orbd-%{name}.1* +%{_mandir}/man1/pack200-%{name}.1* +%{_mandir}/man1/rmid-%{name}.1* +%{_mandir}/man1/rmiregistry-%{name}.1* +%{_mandir}/man1/servertool-%{name}.1* +%{_mandir}/man1/tnameserv-%{name}.1* +%{_mandir}/man1/unpack200-%{name}.1* +%{_jvmdir}/%{jredir}/lib/security/nss.cfg + +%files devel +%defattr(-,root,root,-) +%doc %{buildoutputdir}/j2sdk-image/ASSEMBLY_EXCEPTION +%doc %{buildoutputdir}/j2sdk-image/LICENSE +#%doc %{buildoutputdir}/j2sdk-image/README.html +%doc %{buildoutputdir}/j2sdk-image/THIRD_PARTY_README +# FIXME: The TRADEMARK file should be in j2sdk-image. +%doc openjdk/TRADEMARK +%dir %{_jvmdir}/%{sdkdir}/bin +%dir %{_jvmdir}/%{sdkdir}/include +%dir %{_jvmdir}/%{sdkdir}/lib +%ifarch %{jit_arches} +%dir %{_jvmdir}/%{sdkdir}/tapset +%endif +%{_jvmdir}/%{sdkdir}/bin/* +%{_jvmdir}/%{sdkdir}/include/* +%{_jvmdir}/%{sdkdir}/lib/* +%ifarch %{jit_arches} +%{_jvmdir}/%{sdkdir}/tapset/*.stp +%endif +%{_jvmdir}/%{sdklnk} +%{_jvmjardir}/%{sdklnk} +%{_datadir}/applications/*jconsole.desktop +%{_datadir}/applications/*policytool.desktop +%{_mandir}/man1/appletviewer-%{name}.1* +%{_mandir}/man1/apt-%{name}.1* +%{_mandir}/man1/extcheck-%{name}.1* +%{_mandir}/man1/idlj-%{name}.1* +%{_mandir}/man1/jar-%{name}.1* +%{_mandir}/man1/jarsigner-%{name}.1* +%{_mandir}/man1/javac-%{name}.1* +%{_mandir}/man1/javadoc-%{name}.1* +%{_mandir}/man1/javah-%{name}.1* +%{_mandir}/man1/javap-%{name}.1* +%{_mandir}/man1/jconsole-%{name}.1* +%{_mandir}/man1/jdb-%{name}.1* +%{_mandir}/man1/jhat-%{name}.1* +%{_mandir}/man1/jinfo-%{name}.1* +%{_mandir}/man1/jmap-%{name}.1* +%{_mandir}/man1/jps-%{name}.1* +%{_mandir}/man1/jrunscript-%{name}.1* +%{_mandir}/man1/jsadebugd-%{name}.1* +%{_mandir}/man1/jstack-%{name}.1* +%{_mandir}/man1/jstat-%{name}.1* +%{_mandir}/man1/jstatd-%{name}.1* +%{_mandir}/man1/native2ascii-%{name}.1* +%{_mandir}/man1/policytool-%{name}.1* +%{_mandir}/man1/rmic-%{name}.1* +%{_mandir}/man1/schemagen-%{name}.1* +%{_mandir}/man1/serialver-%{name}.1* +%{_mandir}/man1/wsgen-%{name}.1* +%{_mandir}/man1/wsimport-%{name}.1* +%{_mandir}/man1/xjc-%{name}.1* +%ifarch %{jit_arches} +%{tapsetdir}/*.stp +%endif + +%files demo -f %{name}-demo.files +%defattr(-,root,root,-) + +%files src +%defattr(-,root,root,-) +%doc README.src +%{_jvmdir}/%{sdkdir}/src.zip + +%files javadoc +%defattr(-,root,root,-) +%doc %{_javadocdir}/%{name} + +%changelog +* Wed Jan 04 2017 Andrew Hughes - 1:1.6.0.41-1.13.13.1 +- Update to new 1.13.13 and b41 tarballs to correct TCK failure. +- Resolves: rhbz#1381990 + +* Tue Jan 03 2017 Andrew Hughes - 1:1.6.0.41-1.13.13.0 +- Update to new 1.13.13 tarball with PR3275 and PR3276 fixes. +- Resolves: rhbz#1381990 + +* Tue Jan 03 2017 Andrew Hughes - 1:1.6.0.41-1.13.13.0 +- Update to IcedTea 1.13.13 & OpenJDK 6 b41. +- Fix context for rpath patch following PR3213. +- Resolves: rhbz#1381990 + +* Mon Sep 05 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.9 +- Require a JDK with RH1334465/PR2956 fixed and turn off bootstrapping for Zero architectures. +- Resolves: rhbz#1350047 + +* Thu Sep 01 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.8 +- Set install directories in configure so that @prefix@ is substituted correctly in tapset +- Resolves: rhbz#1350047 + +* Mon Aug 22 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.7 +- Bump source tarballs to try and really fix TCK failures this time. +- Resolves: rhbz#1350047 + +* Mon Aug 22 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.6 +- Bump source tarballs to missing -DNDEBUG on JDK native code. +- Resolves: rhbz#1350047 + +* Fri Aug 19 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.5 +- Non-JIT architectures have not been bootstrapping, due to RPM reading commented macros +- Resolves: rhbz#1350047 + +* Fri Aug 19 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.4 +- Bump source tarballs to fix TCK failures. +- Resolves: rhbz#1350047 + +* Thu Aug 18 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.3 +- Separate bootstrap option as it should not be tied to the JDK used. +- Enable bootstrapping on JIT architectures going forward. +- Temporarily enable bootstrapping on all architectures to work around RH1334465/PR2956. +- Resolves: rhbz#1350047 + +* Wed Aug 17 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.2 +- Require mailcap at build time as well, so configure finds /etc/mime.types +- Resolves: rhbz#1350047 + +* Wed Aug 17 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.1 +- Add RHEL version of b40 tarball. +- Resolves: rhbz#1350047 + +* Wed Aug 17 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.1 +- Update to IcedTea 1.13.12 & OpenJDK 6 b40. +- Separate SystemTap option from bootstrap options. +- Depend on mailcap for /etc/mime.types (PR2800) +- Use configure macro and disable long-running JTreg & SystemTap tests from make check +- Remove redundant patch-ecj target invocation for bootstrap build. +- Add check section to run the new tests introduced in 1.13.12. +- Fix context for rpath patch following PR3140. +- Resolves: rhbz#1350047 + +* Wed May 04 2016 Andrew Hughes - 1:1.6.0.39-1.13.11.1 +- Update to IcedTea 1.13.11 & OpenJDK 6 b39. +- Resolves: rhbz#1325433 + +* Mon Feb 15 2016 Andrew Hughes - 1:1.6.0.38-1.13.10.3 +- Remove dependencies no longer needed by modern IcedTea 1.x and current RPM build. +- Explicitly disable downloading, removing the need for wget. +- Resolves: rhbz#1308687 + +* Mon Jan 25 2016 Andrew Hughes - 1:1.6.0.38-1.13.10.2 +- Disable RC4 by default. +- Resolves: rhbz#1302383 + +* Thu Jan 21 2016 Andrew Hughes - 1:1.6.0.38-1.13.10.1 +- Update to IcedTea 1.13.10 & OpenJDK 6 b38. +- Resolves: rhbz#1295776 + +* Wed Nov 11 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.5 +- Update with new IcedTea & b37 tarballs, including fix for appletviewer regression. +- Resolves: rhbz#1271931 + +* Tue Nov 10 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.4 +- Update with new IcedTea & b37 tarballs, including more Kerberos fixes for TCK regression. +- Resolves: rhbz#1271931 + +* Wed Nov 04 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.3 +- Update with new IcedTea & b37 tarballs, including Kerberos fixes for TCK regression. +- Resolves: rhbz#1271931 + +* Mon Nov 02 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.2 +- Update with newer tarball, including 6763122 fix for TCK regression. +- Use release + 1 to avoid having a lower version than the 6.7 version. +- Resolves: rhbz#1271931 + +* Tue Oct 27 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.0 +- Update to IcedTea 1.13.9 +- Resolves: rhbz#1271931 + +* Tue Jul 28 2015 Andrew Hughes - 1:1.6.0.36-1.13.8.1 +- Update tarball to fix TCK regression (PR2565) +- Resolves: rhbz#1235154 + +* Wed Jul 22 2015 Andrew Hughes - 1:1.6.0.36-1.13.8.0 +- Update to IcedTea 1.13.8 +- Update no_pr2125.patch to work against new version. +- Resolves: rhbz#1235154 + +* Fri Apr 10 2015 Andrew Hughes - 1:1.6.0.35-1.13.7.1 +- Repackaged source files +- Resolves: rhbz#1209068 + +* Thu Apr 09 2015 Andrew Hughes - 1:1.6.0.35-1.13.7.0 +- Update to IcedTea 1.13.7 +- Regenerate add-final-location-rpaths patch so as to be less disruptive. +- Add ExcludeArch directive for RH1209326 +- Resolves: rhbz#1209068 + +* Thu Jan 22 2015 Andrew Hughes - 1:1.6.0.34-1.13.6.1 +- Update to latest 1.13.6 release candidate tarball +- Fixes a number of issues found with b34: +- * OJ51, PR2187: Sync patch for 4873188 with 7 version +- * OJ52, PR2185: Application of 6786276 introduces compatibility issue +- * OJ53, PR2181: strict-aliasing warnings issued on PPC32 +- * OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport +- * S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" +- * S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine +- Regenerate add-final-location-rpaths patch against new release. +- Resolves: rhbz#1180293 + +* Tue Jan 20 2015 Andrew Hughes - 1:1.6.0.34-1.13.6.0 +- Update to IcedTea 1.13.6 +- Remove upstream patch type_hsx23_patch4.patch. +- Regenerate add-final-location-rpaths patch against new release. +- Apply pr2125.patch in generate_rhel_zip.sh to remove unwanted elliptic curves. +- Add no_pr2125.patch to avoid repeating the procedure during the IcedTea build. +- Avoid duplicating the OpenJDK build version by making more use of %%{openjdkver}. +- Add US_export_policy.jar and local_policy.jar to packages. +- Resolves: rhbz#1180293 + +* Thu Oct 09 2014 Andrew Hughes - 1:1.6.0.33-1.13.5.0 +- Update to IcedTea 1.13.5 +- Remove upstreamed patches. +- Regenerate add-final-location-rpaths patch against new release. +- Change versioning to match java-1.7.0-openjdk so revisions work. +- Use xz for tarballs to reduce file size. +- No need to explicitly disable system LCMS any more (bug fixed upstream). +- Add icedteasnapshot to setup lines so they work with pre-release tarballs. +- Resolves: rhbz#1148902 + +* Mon Jul 14 2014 Jiri Vanek - 1:1.6.0.1-6.1.13.4 +- moved to icedteaver 1.13.4 +- moved to openjdkver b32 and openjdkdate 15_jul_2014 +- added upstreamed patch patch9 rh1115580-unsyncHashMap.patch +- Resolves: rhbz#1115870 +- forwardported from rhel 6.6, patch10, add-final-location-rpaths.patch (rh1059925) + - Work when capabilities are set on the binary + - Include hardcoded install path as well as $ORIGIN in RPATH + - Don't Expect LD_LIBRARY_PATH to be set in the launcher + +* Tue May 20 2014 Jiri Vanek - 1:1.6.0.1-6.1.13.3 +- updated to icedtea 1.13.3 +- updated to openjdk-6-src-b31-15_apr_2014 +- renmoved upstreamed patch7, 1.13_fixes.patch +- renmoved upstreamed patch9, 1051245.patch +- Resolves: rhbz#1099563 + +* Thu Mar 13 2014 Jiri Vanek - 1:1.6.0.1-7.1.13.1 +- added and applied patch9 1051245.patch +- Resolves: rhbz#1070816 + +* Fri Feb 21 2014 Jiri Vanek - 1:1.6.0.1-5.1.13.1 +- removed redundant (we have in tree copy) rhino requires +- Resolves: rhbz#1066873 + +* Fri Jan 24 2014 Daniel Mach - 1:1.6.0.0-4.1.13.1 +- Mass rebuild 2014-01-24 + +* Thu Jan 23 2014 Jiri Vanek - 1:1.6.0.1-3.1.13.0 +- updated to icedtea 1.13.1 + - http://blog.fuseyism.com/index.php/2014/01/23/security-icedtea-1-12-8-1-13-1-for-openjdk-6-released/ +- updated to jdk6, b30, 21_jan_2014 + - https://openjdk6.java.net/OpenJDK6-B30-Changes.html +- adapted patch7 1.13_fixes.patch +- pre 2011 changelog moved to (till now wrong) pre-2009-spec-changelog (rh1043611) +- added --disable-system-lcms to configure options to pass build +- adapted patch3 java-1.6.0-openjdk-java-access-bridge-security.patch +- removed upstreamed patch103 type_hsx23_patch3.patch +- Resolves: rhbz#1053279 + +* Fri Dec 27 2013 Daniel Mach - 1:1.6.0.0-2.1.13.0 +- Mass rebuild 2013-12-27 + +* Wed Oct 30 2013 Jiri Vanek - 1:1.6.0.1-1.66.1.13.0 +- updated to icedtea 1.13 +- updated to openjdk-6-src-b28-04_oct_2013 +- added --disable-lcms2 configure switch to fix tck +- removed upstreamed patch7,java-1.6.0-openjdk-jstack.patch +- removed patch100: 8000791-regression-fix.patch +- added patch7 1.13_fixes.patch to fix 1.13 build issues +- adapted patch0 java-1.6.0-openjdk-optflags.patch +- adapted patch3 java-1.6.0-openjdk-java-access-bridge-security.patch +- removed useless runtests parts +- included also java.security.old files +- added: + - Patch103 type_hsx23_patch3.patch + - Patch104 type_hsx23_patch4.patch + -to fix zero type error + -aplied everywhere, as should go upstream +- Resolves: rhbz#1018679 + +* Thu Aug 22 2013 Deepak Bhole - 1:1.6.0.0-1.64.1.11.12 +- Removed the temporary libffi-compat-5 requirement +- Updated BR to java6-1.6.0-devel +- Build with OpenJDK6 specifically + +* Fri Aug 16 2013 Deepak Bhole - 1:1.6.0.0-1.63.1.11.12 +- Merged with latest version from 6.5 branch + +* Tue Nov 01 2011 Jiri Vanek - 1:1.6.0.0-60.1.10.4 +- omajid have added Patch6 as (probably temporally) solution for S7103224 for buildability on newest glibc libraries. + +* Thu Oct 13 2011 Jiri Vanek - 1:1.6.0.0-60.1.10.4 +- updated to icedtea6 1.10.4 +- Security fixes + - S7000600, CVE-2011-3547: InputStream skip() information leak + - S7019773, CVE-2011-3548: mutable static AWTKeyStroke.ctor + - S7023640, CVE-2011-3551: Java2D TransformHelper integer overflow + - S7032417, CVE-2011-3552: excessive default UDP socket limit under SecurityManager + - S7046823, CVE-2011-3544: missing SecurityManager checks in scripting engine + - S7055902, CVE-2011-3521: IIOP deserialization code execution + - S7057857, CVE-2011-3554: insufficient pack200 JAR files uncompress error checks + - S7064341, CVE-2011-3389: HTTPS: block-wise chosen-plaintext attack against SSL/TLS (BEAST) + - S7070134, CVE-2011-3558: HotSpot crashes with sigsegv from PorterStemmer + - S7077466, CVE-2011-3556: RMI DGC server remote code execution + - S7083012, CVE-2011-3557: RMI registry privileged code execution + - S7096936, CVE-2011-3560: missing checkSetFactory calls in HttpsURLConnection +- Bug fixes + - RH727195 : Japanese font mappings are broken +- Backports + - S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog +- Zero/Shark + - PR690: Shark fails to JIT using hs20. + - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. + +* Fri Jul 22 2011 Jiri Vanek - 1:1.6.0.0-59.1.10.3 +- updated to icedtea6 1.10.3 +- http://blog.fuseyism.com/index.php/2011/07/21/icedtea6-1103-released/ + +* Fri Jun 10 2011 Jiri Vanek - 1:1.6.0.0-58.1.10.2 +- added requires: fontconfig +- resolves: rhbz#708201