Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2014-01-17 12:00:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes
2013-12-22 19:33:44.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes
2014-01-23 15:45:49.000000000 +0100
@@ -1,0 +2,66 @@
+Wed Jan 15 11:30:01 UTC 2014 - mvysko...@suse.com
+
+- Fix a file conflict between -devel and -headless package
+
+-------------------------------------------------------------------
+Wed Jan 15 09:17:02 UTC 2014 - mvysko...@suse.com
+
+- Update to 2.4.4 (bnc#858818)
+ * changed from xz to gzipped tarball as the first was not available
+ during update
+ * changed a keyring file due release manager change
+ new one is signed by 66484681 from oma...@redhat.com, see
+
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-January/025800.html
+* Security fixes
+ - S6727821: Enhance JAAS Configuration
+ - S7068126, CVE-2014-0373: Enhance SNMP statuses
+ - S8010935: Better XML handling
+ - S8011786, CVE-2014-0368: Better applet networking
+ - S8021257, S8025022, CVE-2013-5896 : com.sun.corba.se.** should be on
restricted package list
+ - S8021271, S8021266, CVE-2014-0408: Better buffering in ObjC code
+ - S8022904: Enhance JDBC Parsers
+ - S8022927: Input validation for byte/endian conversions
+ - S8022935: Enhance Apache resolver classes
+ - S8022945: Enhance JNDI implementation classes
+ - S8023057: Enhance start up image display
+ - S8023069, CVE-2014-0411: Enhance TLS connections
+ - S8023245, CVE-2014-0423: Enhance Beans decoding
+ - S8023301: Enhance generic classes
+ - S8023338: Update jarsigner to encourage timestamping
+ - S8023672: Enhance jar file validation
+ - S8024302: Clarify jar verifications
+ - S8024306, CVE-2014-0416: Enhance Subject consistency
+ - S8024530: Enhance font process resilience
+ - S8024867: Enhance logging start up
+ - S8025014: Enhance Security Policy
+ - S8025018, CVE-2014-0376: Enhance JAX-P set up
+ - S8025026, CVE-2013-5878: Enhance canonicalization
+ - S8025034, CVE-2013-5907: Improve layout lookups
+ - S8025448: Enhance listening events
+ - S8025758, CVE-2014-0422: Enhance Naming management
+ - S8025767, CVE-2014-0428: Enhance IIOP Streams
+ - S8026172: Enhance UI Management
+ - S8026176: Enhance document printing
+ - S8026193, CVE-2013-5884: Enhance CORBA stub factories
+ - S8026204: Enhance auth login contexts
+ - S8026417, CVE-2013-5910: Enhance XML canonicalization
+ - S8026502: java/lang/invoke/MethodHandleConstants.java fails on all
platforms
+ - S8027201, CVE-2014-0376: Enhance JAX-P set up
+ - S8029507, CVE-2013-5893: Enhance JVM method processing
+ - S8029533: REGRESSION: closed/java/lang/invoke/8008140/Test8008140.java
fails agains
+* Backports
+ - S8025255: (tz) Support tzdata2013g
+ - S8026826: JDK 7 fix for 8010935 broke the build
+* Bug fixes
+ - PR1618: Include defs.make in vm.make so VM_LITTLE_ENDIAN is defined on
Zero builds
+ - D729448: 32-bit alignment on mips and mipsel
+ - PR1623: Collision between OpenJDK 6 & 7 classes when bootstrapping with
OpenJDK 6
+- Add update.py, helper script to download openjdk tarballs from hg repo
+
+-------------------------------------------------------------------
+Mon Jan 13 14:50:03 UTC 2014 - m...@suse.de
+
+- Buildrequire quilt unconditionally as it's used unconditionally.
+- Really disable tests on non-JIT architectures. (from Ulrich Weigand)
+
+-------------------------------------------------------------------
Old:
----
3c8eb52a32ea.tar.gz
652eb396f959.tar.gz
7958751eb9ef.tar.gz
8ed5df839fbc.tar.gz
8f220f7b51c7.tar.gz
b59e02d9e72b.tar.gz
e2f5917da3c1.tar.gz
icedtea-2.4.3.tar.xz
icedtea-2.4.3.tar.xz.sig
New:
----
1fe539ed00bc.tar.gz
2e2bf2d8be16.tar.gz
3f5408abf14b.tar.gz
5aceb5a787b1.tar.gz
796d1bf47b24.tar.gz
a8a33cc2dd4b.tar.gz
e540fd592221.tar.gz
icedtea-2.4.4.tar.gz
icedtea-2.4.4.tar.gz.sig
update.py
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.Xb6kTa/_old 2014-01-23 15:45:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Xb6kTa/_new 2014-01-23 15:45:51.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package java-1_7_0
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -46,12 +46,11 @@
# Reduce build time from 27 hours to 12 hours by only running test
# suites on JIT architectures.
-%ifnarch %{jit_arches}
-%global _with_tests 0
-%endif
+%ifarch %{jit_arches}
%bcond_with tests
+%endif
-%global icedtea_version 2.4.3
+%global icedtea_version 2.4.4
%global hg_tag icedtea-{icedtea_version}-branchpoint
%global openjdkdate 27_jun_2011
@@ -138,20 +137,20 @@
Group: Development/Languages/Java
Url: http://icedtea.classpath.org
-Source0:
http://icedtea.wildebeest.org/download/source/icedtea-%{icedtea_version}.tar.xz
+Source0:
http://icedtea.wildebeest.org/download/source/icedtea-%{icedtea_version}.tar.gz
# Mauve test suite
# FIXME: Is this applicable for 7?
Source3: mauve-%{mauvedate}.tar.gz
Source4: mauve_tests
-Source5:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/archive/e2f5917da3c1.tar.gz
-Source6:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba/archive/8ed5df839fbc.tar.gz
-Source7:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp/archive/8f220f7b51c7.tar.gz
-Source8:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws/archive/652eb396f959.tar.gz
-Source9:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/archive/7958751eb9ef.tar.gz
-Source10:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/archive/3c8eb52a32ea.tar.gz
-Source11:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive/b59e02d9e72b.tar.gz
+Source5:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/archive/796d1bf47b24.tar.gz
+Source6:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba/archive/e540fd592221.tar.gz
+Source7:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp/archive/2e2bf2d8be16.tar.gz
+Source8:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws/archive/5aceb5a787b1.tar.gz
+Source9:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/archive/1fe539ed00bc.tar.gz
+Source10:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/archive/3f5408abf14b.tar.gz
+Source11:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive/a8a33cc2dd4b.tar.gz
# zero compatible hotspot
#TODO: not needed Source12:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/2c4981784101.tar.gz
Source13:
http://icedtea.classpath.org/download/drops/jamvm/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz
@@ -160,8 +159,10 @@
# those properties are for opeSUSE only
Source1001: fontconfig.SuSE.properties
-Source2000: icedtea-%{icedtea_version}.tar.xz.sig
+Source2000: icedtea-%{icedtea_version}.tar.gz.sig
Source2001: java-1_7_0-openjdk.keyring
+# helper script for performing updates
+Source2002: update.py
# RPM/distribution specific patches
@@ -221,7 +222,6 @@
%if %{without bootstrap}
# special for hacking inside build dir
-BuildRequires: quilt
BuildRequires: vim
%endif
@@ -234,6 +234,7 @@
BuildRequires: jpackage-utils >= 1.7.5
BuildRequires: krb5-devel
BuildRequires: libjpeg-devel
+BuildRequires: quilt
# since 2.4.1 release, newest lcms2 is needed
BuildRequires: liblcms2-devel >= 2.5
BuildRequires: libpng-devel
@@ -1193,7 +1194,6 @@
%dir %{_jvmdir}/%{sdkdir}/bin
%dir %{_jvmdir}/%{sdkdir}/include
%dir %{_jvmdir}/%{sdkdir}/lib
-%{_jvmdir}/%{sdklnk}
%dir %{_datadir}/systemtap/tapset
%dir %{tapsetdir}
++++++ 3c8eb52a32ea.tar.gz -> 1fe539ed00bc.tar.gz ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/3c8eb52a32ea.tar.gz
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/1fe539ed00bc.tar.gz differ:
char 5, line 1
++++++ 3c8eb52a32ea.tar.gz -> 2e2bf2d8be16.tar.gz ++++++
++++ 1018434 lines of diff (skipped)
++++++ 3c8eb52a32ea.tar.gz -> 3f5408abf14b.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/langtools-3c8eb52a32ea/.hgtags
new/langtools-3f5408abf14b/.hgtags
--- old/langtools-3c8eb52a32ea/.hgtags 2013-10-16 16:17:06.000000000 +0200
+++ new/langtools-3f5408abf14b/.hgtags 2014-01-14 22:26:37.000000000 +0100
@@ -391,3 +391,5 @@
b9aeec6b9d5aac0746f8d1764a7740f8b83334ab jdk7u45-b17
ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
+3c8eb52a32ea6a119657487c40e24c21c1020e51 icedtea-2.4.3
+3d9f5aad3f497f5b2bedad6c77f5cacaf721648f icedtea-2.4.4
Files old/langtools-3c8eb52a32ea/test/tools/javac/T5090006/broken.jar and
new/langtools-3f5408abf14b/test/tools/javac/T5090006/broken.jar differ
++++++ 3c8eb52a32ea.tar.gz -> 5aceb5a787b1.tar.gz ++++++
++++ 905673 lines of diff (skipped)
++++++ 3c8eb52a32ea.tar.gz -> 796d1bf47b24.tar.gz ++++++
++++ 428774 lines of diff (skipped)
++++++ 3c8eb52a32ea.tar.gz -> a8a33cc2dd4b.tar.gz ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/3c8eb52a32ea.tar.gz
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/a8a33cc2dd4b.tar.gz differ:
char 5, line 1
++++++ 3c8eb52a32ea.tar.gz -> e540fd592221.tar.gz ++++++
++++ 660822 lines of diff (skipped)
++++++ java-1_7_0-openjdk.keyring ++++++
--- /var/tmp/diff_new_pack.Xb6kTa/_old 2014-01-23 15:45:59.000000000 +0100
+++ /var/tmp/diff_new_pack.Xb6kTa/_new 2014-01-23 15:45:59.000000000 +0100
@@ -1,84 +1,56 @@
-pub 4096R/248BDC07 2011-09-28 [expires: 2013-10-12]
-uid Andrew John Hughes <gnu.and...@redhat.com>
-uid Dr Andrew John Hughes <ahug...@redhat.com>
-uid Dr Andrew John Hughes <gnu_and...@member.fsf.org>
-sub 4096R/954E386D 2011-09-28 [expires: 2013-10-12]
+pub 4096R/66484681 2012-01-18 [expires: 2017-01-16]
+uid Omair Majid <oma...@redhat.com>
+sub 4096R/7CC8AAC6 2012-01-18 [expires: 2017-01-16]
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
-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
-JLGXasD0ex7Eg+JtenBjCyxa9A==
-=GBrO
+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
+LeD7leWY9s9tmQ==
+=/H3v
-----END PGP PUBLIC KEY BLOCK-----
++++++ update.py ++++++
#!/usr/bin/python
#
# generates the script updates tarballs and update working copy
#
# Copyright (C) 2013-2014, Michal Vyskocil<mvysko...@suse.com>
#
# Released under terms of MIT, see
# http://opensource.org/licenses/MIT
#
# Changelog:
# 2014-01-15: require icedtea-dir, instead of Makefile.am and hotspot.map
paths
# 2013-05-13: initial version
from __future__ import print_function
import re
import collections
import sys
import os.path
if len(sys.argv) < 3:
print("Usage: update.py spec icedtea-dir")
sys.exit(1)
SPEC=sys.argv[1]
ITDIR=sys.argv[2]
if not os.path.isdir(ITDIR):
print("Usage: update.py spec icedtea-dir")
sys.exit(1)
MAKEFILE=os.path.join(ITDIR, "Makefile.am")
HOTSPOT_MAP=os.path.join(ITDIR, "hotspot.map")
SOURCE_RE = re.compile(r'^Source([5-9]|1[0-3]):')
MAKEFILE_DEF_PATTERN = (r"(?P<def>[A-Z_]+)")
MAKEFILE_DEF_RE = re.compile(r"\$\({}\)".format(MAKEFILE_DEF_PATTERN))
MAKEFILE_DEFLINE_RE = re.compile(r"^{} =
(?P<value>.*)".format(MAKEFILE_DEF_PATTERN))
defs = None
class MakefileDefs(object):
def __init__(self, d):
self._d = d
@classmethod
def fromio(cls, io):
ret = dict()
for line in io:
m = MAKEFILE_DEFLINE_RE.match(line)
if m:
ret[m.group('def')] = m.group('value')
return cls(ret)
def __getitem__(self, key):
v = self._d[key]
m = MAKEFILE_DEF_RE.search(v)
while m:
#unless makefile, we ends with an error on undefined variable
v = v.replace(m.group(), defs[m.groups()[0]], 1)
self._d[key] = v
m = MAKEFILE_DEF_RE.search(v)
return v
def get(self, key, default=None):
try:
return self.__getitem__(key)
except KeyError:
return default
def __setitem__(self, key, value):
return self._d.__setitem__(key, value)
def update_from_map(self, io):
for line in hm:
key, url, changeset, sha = line.split(' ', 3)
if key == 'default':
self._d['HOTSPOT_CHANGESET'] = changeset
self._d['HOTSPOT_URL'] = url
elif key == 'zero':
self._d['ZERO_CHANGESET'] = changeset
self._d['ZERO_URL'] = url
return self
with open(MAKEFILE, "rt") as make:
defs = MakefileDefs.fromio(make)
if HOTSPOT_MAP is not None:
with open(HOTSPOT_MAP, 'rt') as hm:
defs.update_from_map(hm)
MAP = {
'Source5:' : 'OPENJDK',
'Source6:' : 'CORBA',
'Source7:' : 'JAXP',
'Source8:' : 'JAXWS',
'Source9:' : 'JDK',
'Source10:' : 'LANGTOOLS',
'Source11:' : 'HOTSPOT',
'Source12:' : 'ZERO',
'Source13:' : 'JAMVM'
}
def generate_update_script_dict(spec_io, defs, MAP):
us = collections.defaultdict(list)
for line in spec:
m = SOURCE_RE.match(line)
if not m:
continue
# things from spec file
source, url = line.split(' ', 1)
url = url.strip()
f = url.rsplit('/', 1)[1]
# find matching Makefile.am defs
dpref = MAP[source]
if dpref not in ("JAMVM", ):
changeset = defs.get("{}_CHANGESET".format(dpref))
if not changeset:
print("WARNING: {}_CHANGESET not available".format(dpref),
file=sys.stderr)
continue
m_url = "{}/archive/{}.tar.gz".format(
defs["{}_URL".format(dpref)],
changeset)
else:
changeset = defs["{}_VERSION".format(dpref)]
m_url = defs["{}_URL".format(dpref)]
if m_url != url:
us['wget'].append(m_url)
us['osc'].append(f)
us['sed'].append((source, m_url))
return us
def print_update_script(out, us):
if not us:
pass
out.write("""#!/bin/bash
#
# an openjdk.spec update script generated by update.py
#
# this downloads all files, removes old ones, adds new ones and change spec
#
# be verbose
set -x
if [[ -n "$(osc status | grep '^?')" ]]; then
echo "ERROR: osc status shows come uncommited changes, please fix-em-first"
exit 1
fi
""")
for url in us['wget']:
out.write("[[ ! -f \"{file}\" ]] && wget -q '{url}'\n".format(url=url,
file=url.split("/")[-1:][0]))
for f in us['osc']:
out.write("osc rm -f '{}'\n".format(f))
for source, url in us['sed']:
out.write("sed -i 's@^{s}.*@{s} {u}@' {spec}\n".format(
s=source,
space=(17-len(source))*' ',
u=url,
spec=SPEC))
out.write("osc addremove\n")
with open(SPEC, "rt") as spec:
us = generate_update_script_dict(spec, defs, MAP)
print_update_script(sys.stdout, us)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
