diff --git a/.gitignore b/.gitignore index d264e4b..aaa1ae1 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /systemtap-tapset-2014-03-19.tar.xz /openjdk-icedtea-2.5pre04.tar.xz /aarch64-port-jdk7u60-b04-aarch64-832.tar.xz +/openjdk-icedtea-2.5.0.tar.xz diff --git a/add-final-location-rpaths.patch b/add-final-location-rpaths.patch deleted file mode 100644 index 290e7f8..0000000 --- a/add-final-location-rpaths.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git openjdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ---- openjdk/jdk/make/common/Defs-linux.gmk -+++ openjdk/jdk/make/common/Defs-linux.gmk -@@ -343,8 +343,8 @@ - - LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY)) - -- LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN -- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%) -+ LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH) -+ LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)%) - - endif - -diff --git openjdk/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk ---- openjdk/jdk/make/common/Program.gmk -+++ openjdk/jdk/make/common/Program.gmk -@@ -110,7 +110,7 @@ - ifeq ($(PLATFORM), linux) - LDFLAGS += $(LDFLAG_Z_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 # PLATFORM LINUX - endif # PLATFORM linux solaris - -@@ -139,8 +139,8 @@ - endif # ARCH_DATA_MODEL - endif # PLATFORM SOLARIS - ifeq ($(PLATFORM), linux) -- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH) -- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH) -+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH):$(INSTALL_LOCATION)/lib/$(LIBARCH) -+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH):$(INSTALL_LOCATION)/jre/lib/$(LIBARCH) - endif # PLATFORM LINUX - - -diff --git openjdk/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile ---- openjdk/jdk/make/java/instrument/Makefile -+++ openjdk/jdk/make/java/instrument/Makefile -@@ -123,7 +123,7 @@ - ifeq ($(PLATFORM), linux) - LDFLAGS += $(LDFLAG_Z_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 - endif diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec index d85beab..3813cba 100644 --- a/java-1.7.0-openjdk.spec +++ b/java-1.7.0-openjdk.spec @@ -1,8 +1,7 @@ # If debug is 1, OpenJDK is built with all debug info present. %global debug 0 -%global icedtea_version_presuffix pre04 -%global icedtea_version 2.5 +%global icedtea_version 2.5.0 %global hg_tag icedtea-{icedtea_version} %global aarch64_release 832 @@ -121,10 +120,9 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 55 +%global updatever 60 %global aarch64_updatever 60 -#Fedora have an bogus 60 instead of updatever. Fix when updatever>=60 in version: -%global buildver 13 +%global buildver 30 %global aarch64_buildver 04 # Keep priority on 6digits in case updatever>9 %global priority 1700%{updatever} @@ -168,8 +166,8 @@ %global __jar_repack 0 Name: java-%{javaver}-%{origin} -Version: %{javaver}.60 -Release: %{icedtea_version}.0.22.%{icedtea_version_presuffix}%{?dist}.1 +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 # also included the epoch in their virtual provides. This created a @@ -202,7 +200,7 @@ URL: http://openjdk.java.net/ # find openjdk -name ".hg" -exec rm -rf '{}' \; # sh /git/java-1.7.0-openjdk/fX/fsg.sh # tar cJf openjdk-icedtea-%{icedtea_version}.tar.xz openjdk -Source0: openjdk-icedtea-%{icedtea_version}%{icedtea_version_presuffix}.tar.xz +Source0: openjdk-icedtea-%{icedtea_version}.tar.xz Source1: aarch64-port-jdk7u%{aarch64_updatever}-b%{aarch64_buildver}-aarch64-%{aarch64_release}.tar.xz # README file @@ -288,12 +286,9 @@ Patch300: pulse-soundproperties.patch Patch403: PStack-808293.patch Patch4030: PStack-808293-aarch64.patch # Add hardcoded RPATHS to ELF files -Patch412: add-final-location-rpaths.patch Patch4120: add-final-location-rpaths-aarch64.patch # End of tmp patches -# Temporary copy of RH1064383 fix; remove after release of 2.4.8 -Patch413: rh1064383-prelink_fix.patch BuildRequires: autoconf BuildRequires: automake @@ -584,11 +579,8 @@ tar xzf %{SOURCE9} %ifarch %{aarch64} %patch4120 -%else -%patch412 %endif -%patch413 %build # How many cpu's do we have? @@ -1573,6 +1565,13 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Wed Jun 18 2014 Jiri Vanek - 1.7.0.60-2.5.0.f21 +- updated to icedtea7-forest 2.5.0 +- removed icedtea_version_presuffix +- removed hardcoded 60 +- removed upstreamed patch412 add-final-location-rpaths.patch +- removed upstreamed patch413 rh1064383-prelink_fix.patch + * Sat Jun 07 2014 Fedora Release Engineering - 1:1.7.0.60-2.5.0.22.pre04.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -1598,7 +1597,7 @@ exit 0 - debug turned on (1) - added JAVAC_WARNINGS_FATAl="false" tomakefile options -* Thu Apr 22 2014 Jiri Vanek - 1.7.0.51-2.5.0.18.pre04.f21 +* Tue Apr 22 2014 Jiri Vanek - 1.7.0.51-2.5.0.18.pre04.f21 - Added Omair's fix for RH1059925 - added and used Source14, remove-origin-from-rpaths - added and applied patch412 add-final-location-rpaths.patch diff --git a/rh1064383-prelink_fix.patch b/rh1064383-prelink_fix.patch deleted file mode 100644 index 79b8f19..0000000 --- a/rh1064383-prelink_fix.patch +++ /dev/null @@ -1,79 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1400254787 -3600 -# Fri May 16 16:39:47 2014 +0100 -# Node ID ffef4049ab324d5be3caf829b40d49fb3aadea8a -# Parent 0c479601fd127d70cd414ba0b4e7fb68422e5450 -8038392: Generating prelink cache breaks JAVA 'jinfo' utility normal behavior -Summary: See RH1064383 (https://bugzilla.redhat.com/show_bug.cgi?id=1064383) -Contributed-by: Carlos Santos - -diff -r 0c479601fd12 -r ffef4049ab32 agent/src/os/linux/ps_proc.c ---- openjdk.orig/hotspot/agent/src/os/linux/ps_proc.c Thu Apr 17 17:20:17 2014 +0100 -+++ openjdk/hotspot/agent/src/os/linux/ps_proc.c Fri May 16 16:39:47 2014 +0100 -@@ -261,7 +261,7 @@ - - static bool read_lib_info(struct ps_prochandle* ph) { - char fname[32]; -- char buf[256]; -+ char buf[PATH_MAX]; - FILE *fp = NULL; - - sprintf(fname, "/proc/%d/maps", ph->pid); -@@ -271,10 +271,52 @@ - return false; - } - -- while(fgets_no_cr(buf, 256, fp)){ -- char * word[6]; -- int nwords = split_n_str(buf, 6, word, ' ', '\0'); -- if (nwords > 5 && find_lib(ph, word[5]) == false) { -+ while(fgets_no_cr(buf, PATH_MAX, fp)){ -+ char * word[7]; -+ int nwords = split_n_str(buf, 7, word, ' ', '\0'); -+ -+ if (nwords < 6) { -+ // not a shared library entry. ignore. -+ continue; -+ } -+ -+ if (word[5][0] == '[') { -+ // not a shared library entry. ignore. -+ if (strncmp(word[5],"[stack",6) == 0) { -+ continue; -+ } -+ if (strncmp(word[5],"[heap]",6) == 0) { -+ continue; -+ } -+ -+ // SA don't handle VDSO -+ if (strncmp(word[5],"[vdso]",6) == 0) { -+ continue; -+ } -+ if (strncmp(word[5],"[vsyscall]",6) == 0) { -+ continue; -+ } -+ } -+ -+ if (nwords > 6) { -+ // prelink altered mapfile when the program is running. -+ // Entries like one below have to be skipped -+ // /lib64/libc-2.15.so (deleted) -+ // SO name in entries like one below have to be stripped. -+ // /lib64/libpthread-2.15.so.#prelink#.EECVts -+ char *s = strstr(word[5],".#prelink#"); -+ if (s == NULL) { -+ // No prelink keyword. skip deleted library -+ print_debug("skip shared object %s deleted by prelink\n", word[5]); -+ continue; -+ } -+ -+ // Fall through -+ print_debug("rectifing shared object name %s changed by prelink\n", word[5]); -+ *s = 0; -+ } -+ -+ if (find_lib(ph, word[5]) == false) { - intptr_t base; - lib_info* lib; - #ifdef _LP64 diff --git a/sources b/sources index ddba0be..ed50f96 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz -7f72e72d85f3ab5e3f36719a17e132ec openjdk-icedtea-2.5pre04.tar.xz +0ec4aa81608dc91aedd40650f13c8f70 openjdk-icedtea-2.5.0.tar.xz 1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz 013ddff65e090aafe9ff89d4ce767e8d systemtap-tapset-2014-03-19.tar.xz 5fa84f6769117e1f582c779d888af468 aarch64-port-jdk7u60-b04-aarch64-832.tar.xz