Hello community,
here is the log from the commit of package java-1_7_0-openjdk.zero for
openSUSE:Factory checked in at 2012-07-22 10:28:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk.zero (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.zero.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk.zero", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk.zero/java-1_7_0-openjdk.changes
2012-07-12 12:06:58.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.zero.new/java-1_7_0-openjdk.changes
2012-07-22 10:28:29.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Jul 12 17:25:55 UTC 2012 - [email protected]
+
+- update patch
+- drop obsolete patches
+ * java-1.7.0-openjdk-arm-ftbfs.patch patch
+ * java-1.7.0-openjdk-system-zlib.patch
+ * java-1.7.0-openjdk-remove-mimpure-opt.patch
+- add %arm settings
+
+-------------------------------------------------------------------
Old:
----
java-1.7.0-openjdk-arm-ftbfs.patch
java-1.7.0-openjdk-remove-mimpure-opt.patch
java-1.7.0-openjdk-system-zlib.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.6jMxVV/_old 2012-07-22 10:28:32.000000000 +0200
+++ /var/tmp/diff_new_pack.6jMxVV/_new 2012-07-22 10:28:32.000000000 +0200
@@ -125,7 +125,7 @@
#XXX: this is older version of icedtea, which can be build with zerovm - this
is intended
# for arm and powerpc only
-ExclusiveArch: %{arm} ppc ppc64
+#ExclusiveArch: %{arm} ppc ppc64
# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/ openjdk -r
%{hg_tag}
# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/corba/
openjdk/corba -r %{hg_tag}
@@ -204,18 +204,11 @@
# Patches for Arm
Patch103: java-1.7.0-openjdk-arm-fixes.patch
-Patch104: java-1.7.0-openjdk-arm-ftbfs.patch
# Patch for PPC/PPC64
Patch105: java-1.7.0-openjdk-ppc-zero-jdk.patch
Patch106: java-1.7.0-openjdk-ppc-zero-hotspot.patch
-# Fix bug in jdk_generic_profile.sh
-Patch107: java-1.7.0-openjdk-system-zlib.patch
-
-# Remove option no longer accepted by GCC
-Patch108: java-1.7.0-openjdk-remove-mimpure-opt.patch
-
#
# Bootstrap patches (code with this is never shipped)
#
@@ -396,7 +389,7 @@
Provides: jre1.7.x
# bnc#542545
# 32-bit versus 64-bit specific provides:
-%ifarch %ix86 ppc s390
+%ifarch %ix86 ppc s390 %arm
%define bits 32
%endif
%ifarch x86_64 ia64 s390x
@@ -583,7 +576,6 @@
# Arm fixes
qpatch -p0 %{PATCH103}
-qpatch -p0 %{PATCH104}
%ifarch ppc ppc64
# PPC fixes
@@ -591,10 +583,6 @@
qpatch -p0 %{PATCH106}
%endif
-# Misc. fixes
-qpatch -p0 %{PATCH107}
-qpatch -p0 %{PATCH108}
-
#SUSE specific fixes
qpatch -p1 %{PATCH1001}
qpatch -p1 %{PATCH1002}
++++++ java-1.7.0-openjdk-java-access-bridge-security.patch ++++++
--- /var/tmp/diff_new_pack.6jMxVV/_old 2012-07-22 10:28:32.000000000 +0200
+++ /var/tmp/diff_new_pack.6jMxVV/_new 2012-07-22 10:28:32.000000000 +0200
@@ -4,8 +4,8 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
--package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
+-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
#
# List of comma-separated packages that start with or equal this string
++++++ systemtap-alloc-size-workaround.patch ++++++
--- /var/tmp/diff_new_pack.6jMxVV/_old 2012-07-22 10:28:32.000000000 +0200
+++ /var/tmp/diff_new_pack.6jMxVV/_new 2012-07-22 10:28:32.000000000 +0200
@@ -1,7 +1,8 @@
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
2011-04-11 12:33:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp 2011-04-11
16:40:57.825703429 +0100
-@@ -890,7 +890,7 @@
+Index: openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp.orig
++++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+@@ -955,7 +955,7 @@ int SharedRuntime::dtrace_object_alloc_b
int size = o->size();
Symbol* name = klass->name();
HS_DTRACE_PROBE4(hotspot, object__alloc, get_java_tid(thread),
++++++ systemtap.patch ++++++
--- /var/tmp/diff_new_pack.6jMxVV/_old 2012-07-22 10:28:32.000000000 +0200
+++ /var/tmp/diff_new_pack.6jMxVV/_new 2012-07-22 10:28:32.000000000 +0200
@@ -1,6 +1,7 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/dtrace.make
openjdk/hotspot/make/linux/makefiles/dtrace.make
---- openjdk.orig/hotspot/make/linux/makefiles/dtrace.make 2010-07-29
21:54:46.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/dtrace.make 2011-03-16
20:52:47.269527251 +0000
+Index: openjdk/hotspot/make/linux/makefiles/dtrace.make
+===================================================================
+--- openjdk/hotspot/make/linux/makefiles/dtrace.make.orig
++++ openjdk/hotspot/make/linux/makefiles/dtrace.make
@@ -25,3 +25,7 @@
# Linux does not build jvm_db
LIBJVM_DB =
@@ -9,10 +10,11 @@
+CFLAGS += -DDTRACE_ENABLED
+
+# It doesn't support HAVE_DTRACE_H though.
-diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
openjdk/hotspot/src/share/vm/prims/jni.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2011-03-14
22:09:03.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2011-03-16 20:52:47.277527381
+0000
-@@ -1817,10 +1817,7 @@
+Index: openjdk/hotspot/src/share/vm/prims/jni.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/prims/jni.cpp.orig
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp
+@@ -1824,10 +1824,7 @@ JNI_END
JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj,
jfieldID fieldID, Argument value)) \
JNIWrapper("Set" XSTR(Result) "Field"); \
\
@@ -24,7 +26,7 @@
\
oop o = JNIHandles::resolve_non_null(obj); \
klassOop k = o->klass(); \
-@@ -1994,10 +1991,7 @@
+@@ -1997,10 +1994,7 @@ JNI_END
\
JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz,
jfieldID fieldID, Argument value)) \
JNIWrapper("SetStatic" XSTR(Result) "Field"); \
@@ -36,10 +38,11 @@
\
JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \
assert(id->is_static_field_id(), "invalid static field id"); \
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp
openjdk/hotspot/src/share/vm/runtime/arguments.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2011-03-16
20:51:33.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2011-03-16
20:52:47.277527381 +0000
-@@ -2634,16 +2634,16 @@
+Index: openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp.orig
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -2598,16 +2598,16 @@ SOLARIS_ONLY(
FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true);
} else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) {
@@ -60,9 +63,10 @@
#ifdef ASSERT
} else if (match_option(option, "-XX:+FullGCALot", &tail)) {
FLAG_SET_CMDLINE(bool, FullGCALot, true);
-diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp
openjdk/hotspot/src/share/vm/utilities/dtrace.hpp
---- openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp 2011-03-14
22:09:03.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp 2011-03-16
20:53:58.314683506 +0000
+Index: openjdk/hotspot/src/share/vm/utilities/dtrace.hpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/utilities/dtrace.hpp.orig
++++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights
reserved.
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
