From 2af2a608080851a04a9791a8d2acddd223b96a44 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Jun 18 2014 13:28:16 +0000 Subject: Updated to icedtea7-forest 2.5.0 --- diff --git a/.gitignore b/.gitignore index 01da48c..747d810 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /openjdk-icedtea-2.4.5.tar.xz /systemtap-tapset-2014-03-19.tar.xz /openjdk-icedtea-2.4.7.tar.xz +/openjdk-icedtea-2.5.0.tar.xz diff --git a/gstackbounds.patch b/gstackbounds.patch deleted file mode 100644 index 39a066a..0000000 --- a/gstackbounds.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp -@@ -2763,39 +2763,47 @@ - // writing thread stacks don't use growable mappings (i.e. those - // creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this - // only applies to the main thread. -- --static --bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) { -- -- char buf[128]; -- int fd, sz; -- -- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) { -+static bool -+get_stack_bounds(uintptr_t *bottom, uintptr_t *top) -+{ -+ FILE *f = fopen("/proc/self/maps", "r"); -+ if (f == NULL) - return false; -- } -- -- const char kw[] = "[stack]"; -- const int kwlen = sizeof(kw)-1; -- -- // Address part of /proc/self/maps couldn't be more than 128 bytes -- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) { -- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) { -- // Extract addresses -- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { -- uintptr_t sp = (uintptr_t) __builtin_frame_address(0); -- if (sp >= *bottom && sp <= *top) { -- ::close(fd); -- return true; -- } -+ -+ while (!feof(f)) { -+ size_t dummy; -+ char *str = NULL; -+ ssize_t len = getline(&str, &dummy, f); -+ if (len == -1) { -+ fclose(f); -+ if (str != NULL) -+ free(str); -+ return false; -+ } -+ -+ if (len > 0 && str[len-1] == '\n') { -+ str[len-1] = 0; -+ len--; -+ } -+ -+ static const char *stack_str = "[stack]"; -+ if (len > (ssize_t)strlen(stack_str) -+ && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) { -+ if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { -+ uintptr_t sp = (uintptr_t)__builtin_frame_address(0); -+ if (sp >= *bottom && sp <= *top) { -+ free(str); -+ fclose(f); -+ return true; - } -- } -- } -- -- ::close(fd); -+ } -+ } -+ free(str); -+ } -+ fclose(f); - return false; - } - -- - // If the (growable) stack mapping already extends beyond the point - // where we're going to put our guard pages, truncate the mapping at - // that point by munmap()ping it. This ensures that when we later -diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp ---- openjdk/hotspot/src/share/vm/runtime/os.cpp -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp -@@ -1353,43 +1353,6 @@ - return result; - } - --// Read file line by line, if line is longer than bsize, --// skip rest of line. --int os::get_line_chars(int fd, char* buf, const size_t bsize){ -- size_t sz, i = 0; -- -- // read until EOF, EOL or buf is full -- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') { -- ++i; -- } -- -- if (buf[i] == '\n') { -- // EOL reached so ignore EOL character and return -- -- buf[i] = 0; -- return (int) i; -- } -- -- buf[i+1] = 0; -- -- if (sz != 1) { -- // EOF reached. if we read chars before EOF return them and -- // return EOF on next call otherwise return EOF -- -- return (i == 0) ? -1 : (int) i; -- } -- -- // line is longer than size of buf, skip to EOL -- char ch; -- while (read(fd, &ch, 1) == 1 && ch != '\n') { -- // Do nothing -- } -- -- // return initial part of line that fits in buf. -- // If we reached EOF, it will be returned on next call. -- -- return (int) i; --} - - void os::SuspendedThreadTask::run() { - assert(Threads_lock->owned_by_self() || (_thread == VMThread::vm_thread()), "must have threads lock to call this"); - -diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp ---- openjdk/hotspot/src/share/vm/runtime/os.hpp -+++ openjdk/hotspot/src/share/vm/runtime/os.hpp -@@ -672,10 +672,6 @@ - // Hook for os specific jvm options that we don't want to abort on seeing - static bool obsolete_option(const JavaVMOption *option); - -- // Read file line by line. If line is longer than bsize, -- // rest of line is skipped. Returns number of bytes read or -1 on EOF -- static int get_line_chars(int fd, char *buf, const size_t bsize); -- - // Extensions - #include "runtime/os_ext.hpp" - - diff --git a/java-1.7.0-openjdk-debugdocs.patch b/java-1.7.0-openjdk-debugdocs.patch index dbfebb2..8a130e4 100644 --- a/java-1.7.0-openjdk-debugdocs.patch +++ b/java-1.7.0-openjdk-debugdocs.patch @@ -1,12 +1,35 @@ --- oldMakefile 2008-07-02 17:48:01.000000000 -0400 +++ openjdk/Makefile 2008-07-02 17:48:09.000000000 -0400 -@@ -176,8 +176,7 @@ +@@ -199,19 +199,19 @@ - COMMON_DEBUG_FLAGS= \ - DEBUG_NAME=$(DEBUG_NAME) \ -- ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME) \ -- NO_DOCS=true -+ ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME) + create_fresh_product_bootdir: FRC + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + BOOT_CYCLE_SETTINGS= \ + build_product_image - product_build: setup - @$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'` + create_fresh_debug_bootdir: FRC + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + BOOT_CYCLE_DEBUG_SETTINGS= \ + build_debug_image + + create_fresh_fastdebug_bootdir: FRC + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + BOOT_CYCLE_DEBUG_SETTINGS= \ + build_fastdebug_image + +@@ -262,7 +262,7 @@ + $(MAKE) \ + ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \ + DEBUG_NAME=$(DEBUG_NAME) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + $(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \ + CREATE_DEBUGINFO_BUNDLES=true \ + $(BOOT_CYCLE_DEBUG_SETTINGS) \ + diff --git a/java-1.7.0-openjdk-debuginfo.patch b/java-1.7.0-openjdk-debuginfo.patch index 263d59e..11776ef 100644 --- a/java-1.7.0-openjdk-debuginfo.patch +++ b/java-1.7.0-openjdk-debuginfo.patch @@ -1,20 +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 -@@ -67,6 +67,7 @@ - -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \ +@@ -95,6 +95,7 @@ + $(ALT_SAINCDIR) \ $(SASRCFILES) \ $(SA_LFLAGS) \ -+ -g \ ++ -g \ + $(SA_DEBUG_CFLAGS) \ + $(EXTRA_CFLAGS) \ -o $@ \ - -lthread_db - --- 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 -@@ -44,6 +44,7 @@ +@@ -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) -o $@ $< -ldl - - install_jsig: $(LIBJSIG) ++ -g \ + $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl + $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec index 3abf3a3..aae8d8f 100644 --- a/java-1.7.0-openjdk.spec +++ b/java-1.7.0-openjdk.spec @@ -1,14 +1,17 @@ # If debug is 1, OpenJDK is built with all debug info present. %global debug 0 -%global icedtea_version 2.4.7 +%global icedtea_version 2.5.0 %global hg_tag icedtea-{icedtea_version} %global aarch64 aarch64 arm64 armv8 -%global multilib_arches %{power64} sparc64 x86_64 %{aarch64} -%global jit_arches %{ix86} x86_64 sparcv9 sparc64 +#sometimes we need to distinguish big and little endian PPC64 +%global ppc64le ppc64le +%global ppc64be ppc64 ppc64p7 +%global multilib_arches %{power64} sparc64 x86_64 +%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{ppc64be} %{aarch64} -#links are set forcibly, f19 32b fix +#if 0, then links are set forcibly, if 1 ten only if status is auto %global graceful_links 0 %ifarch x86_64 @@ -20,11 +23,16 @@ %global archinstall ppc %global archdef PPC %endif -%ifarch %{power64} +%ifarch %{ppc64be} %global archbuild ppc64 %global archinstall ppc64 %global archdef PPC %endif +%ifarch %{ppc64le} +%global archbuild ppc64le +%global archinstall ppc64le +%global archdef PPC64 +%endif %ifarch %{ix86} %global archbuild i586 %global archinstall i386 @@ -74,9 +82,16 @@ %global debugbuild %{nil} %endif +%if %{debug} +%global buildoutputdir openjdk/build/linux-%{archbuild}-debug +%else %global buildoutputdir openjdk/build/linux-%{archbuild} - +%endif +%ifnarch %{ppc64le} %global with_pulseaudio 1 +%else +%global with_pulseaudio 0 +%endif %ifarch %{jit_arches} %global with_systemtap 1 @@ -103,9 +118,8 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 55 -#Fedora have an bogus 60 instead of updatever. Fix when updatever>=60 in version: -%global buildver 13 +%global updatever 60 +%global buildver 30 # Keep priority on 6digits in case updatever>9 %global priority 1700%{updatever} %global javaver 1.7.0 @@ -148,7 +162,7 @@ %global __jar_repack 0 Name: java-%{javaver}-%{origin} -Version: %{javaver}.60 +Version: %{javaver}.%{updatever} Release: %{icedtea_version}.0%{?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 @@ -260,6 +274,7 @@ Patch300: pulse-soundproperties.patch Patch403: PStack-808293.patch # End of tmp patches + BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -433,7 +448,8 @@ Please note, the java-atk-wrapper is still in beta, and also OpenJDK itself is s Although working pretty fine, there are known issues with accessibility on, so do not rather install this package unless you really need. %prep -%setup -q -c -n %{uniquesuffix} -T -a 0 +%global source_num 0 +%setup -q -c -n %{uniquesuffix} -T -a %{source_num} cp %{SOURCE2} . # OpenJDK patches @@ -498,8 +514,6 @@ tar xzf %{SOURCE9} %patch403 - - %build # How many cpu's do we have? %ifarch aarch64 @@ -518,6 +532,8 @@ export ARCH_DATA_MODEL=64 export CFLAGS="$CFLAGS -mieee" %endif +export CFLAGS="$CFLAGS -fstack-protector-strong" + # Build the re-written rhino jar mkdir -p rhino/{old,new} @@ -550,7 +566,7 @@ java -cp rewriter com.redhat.rewriter.ClassRewriter \ jar cfm ../rhino.jar META-INF/MANIFEST.MF sun ) -export JDK_TO_BUILD_WITH=/usr/lib/jvm/java-openjdk +export JDK_TO_BUILD_WITH=/usr/lib/jvm/java-1.7.0-openjdk @@ -591,26 +607,15 @@ make \ DEBUG_CLASSFILES="true" \ DEBUG_BINARIES="true" \ STRIP_POLICY="no_strip" \ -%ifnarch %{jit_arches} - LIBFFI_CFLAGS="`pkg-config --cflags libffi` " \ - LIBFFI_LIBS="-lffi " \ - ZERO_BUILD="true" \ - ZERO_LIBARCH="%{archbuild}" \ - ZERO_ARCHDEF="%{archdef}" \ -%ifarch ppc %{power64} s390 s390x - ZERO_ENDIANNESS="big" \ -%else - ZERO_ENDIANNESS="little" \ - ZERO_ARCHFLAG="-D_LITTLE_ENDIAN" \ -%endif -%endif + JAVAC_WARNINGS_FATAL="false" \ + INSTALL_LOCATION=%{_jvmdir}/%{sdkdir} \ %{debugbuild} popd >& /dev/null -%ifarch %{jit_arches} -chmod 644 $(pwd)/%{buildoutputdir}/j2sdk-image/lib/sa-jdi.jar -%endif +if [ -e $(pwd)/%{buildoutputdir}/j2sdk-image/lib/sa-jdi.jar ]; then + chmod 644 $(pwd)/%{buildoutputdir}/j2sdk-image/lib/sa-jdi.jar; +fi export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image @@ -1190,6 +1195,11 @@ exit 0 %doc %{_jvmdir}/%{sdkdir}/LICENSE %doc %{_jvmdir}/%{sdkdir}/THIRD_PARTY_README %dir %{_jvmdir}/%{sdkdir} +%dir %{_jvmdir}/%{sdkdir}/jre/lib/ +%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall} +%ifarch x86_64 +%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt +%endif %{_jvmdir}/%{jrelnk} %{_jvmjardir}/%{jrelnk} %{_jvmprivdir}/* @@ -1298,6 +1308,9 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Wed Jun 18 2014 Jiri Vanek - 1.7.0.60-2.5.0.f19 +- updated to icedtea7-forest 2.5.0 + * Mon Apr 07 2014 Jiri Vanek - 1.7.0.55-2.4.7.0.fc19 - bumped to future icedtea-forest 2.4.7 - updatever set to 55, buildver se to 13, release reset to 0 diff --git a/rhino.patch b/rhino.patch index 3c11620..bd8ab68 100644 --- a/rhino.patch +++ b/rhino.patch @@ -140,9 +140,9 @@ diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLe -import sun.org.mozilla.javascript.internal.*; +import sun.org.mozilla.javascript.*; - import java.security.AccessControlContext; import javax.script.*; import java.security.AccessControlContext; + diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-02-14 16:12:49.000000000 -0500 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-02-22 14:10:53.327225198 -0500 diff --git a/sources b/sources index 7b90840..8bda95c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz +0ec4aa81608dc91aedd40650f13c8f70 openjdk-icedtea-2.5.0.tar.xz 1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz 013ddff65e090aafe9ff89d4ce767e8d systemtap-tapset-2014-03-19.tar.xz -abd112461c3840cf0b817b0b18208527 openjdk-icedtea-2.4.7.tar.xz