Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2012-10-12 08:05:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes
2012-09-23 21:05:51.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes
2012-10-12 08:11:56.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Oct 8 08:20:51 UTC 2012 - mvysko...@suse.com
+
+- %posttrans java-cacerts and cacerts are now recreated if missing, are not
+ properly linked and does not contain/point to file with correct mime-type
+ application/x-java-keystore
+ * fixes bnc#781690: NoSuchAlgorithmException: SunJSSE
+ * fixes bnc#727223 - Exceptions during certificate import
+
+-------------------------------------------------------------------
@@ -9,0 +19,5 @@
+
+-------------------------------------------------------------------
+Tue Sep 11 11:04:47 UTC 2012 - dmuel...@suse.com
+
+- fix two further "uninitialized return" warnings for zero builds
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.EUeLd5/_old 2012-10-12 08:12:01.000000000 +0200
+++ /var/tmp/diff_new_pack.EUeLd5/_new 2012-10-12 08:12:01.000000000 +0200
@@ -120,8 +120,10 @@
# Prevent brp-java-repack-jars from being run.
%define __jar_repack 0
-# cacert file
+# cacert symlink
%define cacerts %{_jvmdir}/%{jredir}/lib/security/cacerts
+# real file made by update-ca-certificates
+%define javacacerts %{_var}/lib/ca-certificates/java-cacerts
Name: java-1_7_0-openjdk
Version: %{javaver}.%{buildver}
@@ -148,7 +150,8 @@
Source8:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/c89c6ac953e7.tar.gz
Source9:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/f78eb7e08ee1.tar.gz
Source10:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/867d5041bee6.tar.gz
-Source11:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/ea39d76b3bde.tar.gz
+# originally fetched from here, does not exist anymore
+Source11: ea39d76b3bde.tar.gz
Source12:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/47a867dd3005.tar.gz
Source13:
http://icedtea.classpath.org/download/drops/jamvm/jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.tar.gz
@@ -304,6 +307,7 @@
%if %{suse_version} >= 1130
BuildRequires: java-ca-certificates
Requires(post): java-ca-certificates
+Requires(post): file
#bnc#634793
Requires(post): mozilla-nss
%else
@@ -810,10 +814,10 @@
fi
%if 0%{?suse_version} >= 1130
-
%posttrans
-# if there's no java, certificates are not generated
-if [ ! -f /var/lib/ca-certificates/java-cacerts ]; then
+# check if the java-cacerts is a valid keystore (bnc#781690)
+if [ "`/usr/bin/file --mime-type -b %{javacacerts}`" \
+ != "xapplication/x-java-keystore;" ]; then
/usr/sbin/update-ca-certificates
fi
@@ -822,8 +826,13 @@
rm -f %{cacerts}
fi
-if [ ! -e %{cacerts} ]; then
- ln -s /var/lib/ca-certificates/java-cacerts %{cacerts}
+# if cacerts does exists, neither does not contain/point to a
+# valid keystore (bnc#781690) ...
+if [ "`/usr/bin/file --mime-type -b -L %{cacerts}`" \
+ != "xapplication/x-java-keystore;" ]; then
+ # bnc#727223
+ rm -f %{cacerts}
+ ln -s %{javacacerts} %{cacerts}
fi
%endif
++++++ java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch ++++++
--- /var/tmp/diff_new_pack.EUeLd5/_old 2012-10-12 08:12:01.000000000 +0200
+++ /var/tmp/diff_new_pack.EUeLd5/_new 2012-10-12 08:12:01.000000000 +0200
@@ -44,6 +44,24 @@
}
int SafeFetch32(int *adr, int errValue) {
+--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+@@ -142,6 +142,7 @@ jboolean XShared_initIDs(JNIEnv *env, jb
+ #endif /* MITSHM */
+
+ #endif /* !HEADLESS */
++return JNI_FALSE;
+ }
+
+
+@@ -491,6 +492,7 @@ jboolean XShared_initSurface(JNIEnv *env
+
+ return JNI_TRUE;
+ #endif /* !HEADLESS */
++return JNI_FALSE;
+ }
+
+
--- openjdk/hotspot/src/share/vm/utilities/debug.hpp
+++ openjdk/hotspot/src/share/vm/utilities/debug.hpp
@@ -166,14 +166,14 @@
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
