------------------------------------------------------------
revno: 605
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk7
timestamp: Fri 2016-11-04 19:16:17 +0100
message:
- check-in remaining changes for 7u111-2.6.7-1 upload
added:
patches/hotspot-aarch64-nopch.diff
modified:
JB-jre-headless.prerm.in
changelog
control
generate-debian-orig.sh
rules
--
lp:~openjdk/openjdk/openjdk7
https://code.launchpad.net/~openjdk/openjdk/openjdk7
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk7.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk7/+edit-subscription
=== modified file 'JB-jre-headless.prerm.in'
--- JB-jre-headless.prerm.in 2013-02-10 23:46:12 +0000
+++ JB-jre-headless.prerm.in 2016-11-04 18:16:17 +0000
@@ -15,7 +15,7 @@
if which update-binfmts >/dev/null; then
# try to remove and ignore the error
- if [ -e /var/lib/binfmts/@basename@ ]; then
+ if [ -e /var/lib/binfmts/jar ]; then
update-binfmts --package @basename@ \
--remove jar /usr/bin/jexec || true
fi
=== modified file 'changelog'
--- changelog 2016-05-04 17:34:55 +0000
+++ changelog 2016-11-04 18:16:17 +0000
@@ -1,3 +1,35 @@
+openjdk-7 (7u111-2.6.7-1) experimental; urgency=medium
+
+ [ Matthias Klose ]
+ * Fix handling of /usr/lib/jvm/*/jre/lib/zi if internal tzdata is used
+ (Andreas Beckmann). Closes: #821858.
+ * Add missing includes for aarch64 hotspot backport (building without pch).
+ * Use in-tree lcms for backports.
+
+ [ Tiago Stürmer Daitx ]
+ * IcedTea release 2.6.7 (based on 7u111):
+ * Security fixes
+ - S8079718, CVE-2016-3458: IIOP Input Stream Hooking
+ - S8145446, CVE-2016-3485: Perfect pipe placement (Windows only)
+ - S8147771: Construction of static protection domains under Javax
+ custom policy
+ - S8148872, CVE-2016-3500: Complete name checking
+ - S8149962, CVE-2016-3508: Better delineation of XML processing
+ - S8150752: Share Class Data
+ - S8151925: Font reference improvements
+ - S8152479, CVE-2016-3550: Coded byte streams
+ - S8155981, CVE-2016-3606: Bolster bytecode verification
+ - S8155985, CVE-2016-3598: Persistent Parameter Processing
+ - S8158571, CVE-2016-3610: Additional method handle validation
+ * debian/rules:
+ - Create symbolic link in source package (thanks Avinash).
+ Closes: #832720.
+ * debian/JB-jre-headless.prerm.in: check for /var/lib/binfmts/jar
+ instead of /var/lib/binfmts/@basename@ before removing jar entry
+ from binfmts. Closes: #821146.
+
+ -- Matthias Klose <d...@ubuntu.com> Sat, 30 Jul 2016 08:13:07 +0200
+
openjdk-7 (7u101-2.6.6-2) experimental; urgency=medium
* Configure with --disable-arm32-jit, broken by the security update.
=== modified file 'control'
--- control 2016-05-04 17:34:55 +0000
+++ control 2016-11-04 18:16:17 +0000
@@ -10,7 +10,7 @@
fastjar (>= 2:0.96-0ubuntu2), dh-autoreconf, quilt,
ant, ant-optional, libtool, g++-5,
ecj-gcj [amd64 armel arm64 armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64], gcj-jdk [amd64 armel arm64 armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64], openjdk-7-jdk (>= 6b18) [alpha mips mips64 mips64el],
- libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxinerama-dev, libkrb5-dev, xsltproc, librhino-java (>= 1.7R3~), libpcsclite-dev, fonts-ipafont-mincho,
+ libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, liblcms2-dev, libxinerama-dev, libkrb5-dev, xsltproc, librhino-java (>= 1.7R3~), libpcsclite-dev, fonts-ipafont-mincho,
libffi-dev,
zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, libsctp-dev [linux-any],
libpulse-dev (>= 0.9.12),
=== modified file 'generate-debian-orig.sh'
--- generate-debian-orig.sh 2016-05-04 17:29:22 +0000
+++ generate-debian-orig.sh 2016-11-04 18:16:17 +0000
@@ -8,16 +8,16 @@
cacaotb=cacao-c182f119eaad.tar.gz
# tarballs location
-tarballdir=7u101
+tarballdir=7u111
# icedtea upstream location (as extracted from icedtea's tarball)
-icedtea_checkout=icedtea-2.6.6
+icedtea_checkout=icedtea-2.6.7
# openjdk's debian location (usually fetched from bzr or the latest openjdk)
debian_checkout=openjdk7
base=openjdk-7
-version=7u101-2.6.6
+version=7u111-2.6.7
# output directory
pkgdir=$base-$version
=== added file 'patches/hotspot-aarch64-nopch.diff'
--- patches/hotspot-aarch64-nopch.diff 1970-01-01 00:00:00 +0000
+++ patches/hotspot-aarch64-nopch.diff 2016-11-04 18:16:17 +0000
@@ -0,0 +1,24 @@
+# DP: Add missing includes for aarch64 hotspot backport
+
+--- openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
++++ openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
+@@ -64,6 +64,7 @@
+ #include "gc_implementation/g1/heapRegion.hpp"
+ #endif
+
++#include "opto/compile.hpp"
+
+ extern "C" void entry(CodeBuffer *cb);
+
+--- openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
++++ openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
+@@ -25,6 +25,9 @@
+ */
+
+ #include "precompiled.hpp"
++#include "asm/assembler.hpp"
++#include "asm/assembler.inline.hpp"
++#include "utilities/sizes.hpp"
+ #include "assembler_aarch64.hpp"
+ #include "memory/resourceArea.hpp"
+ #include "runtime/java.hpp"
=== modified file 'rules'
--- rules 2016-05-04 17:34:55 +0000
+++ rules 2016-11-04 18:16:17 +0000
@@ -383,6 +383,10 @@
else
lcms_version = 2
endif
+with_system_lcms = yes
+ifneq (,$(filter $(distrel),lenny squeeze wheezy xenial wily vivid utopic trusty precise lucid))
+ with_system_lcms =
+endif
on_buildd := $(shell [ -f /CurrentlyBuilding -o "$$LOGNAME" = buildd ] && echo yes)
@@ -412,7 +416,7 @@
with_systemtap = yes
endif
-ifneq (,$(filter $(DEB_HOST_ARCH), sparc64))
+ifneq (,$(filter $(DEB_HOST_ARCH), aarch64 sparc64))
USE_PRECOMPILED_HEADER = 0
export USE_PRECOMPILED_HEADER
endif
@@ -458,6 +462,7 @@
debian/patches/dnd-files.patch \
debian/patches/jdk-bold-swing-fonts.patch \
debian/patches/javadoc-sort-enum-and-annotation-types.patch \
+ debian/patches/hotspot-aarch64-nopch.diff \
ifeq (,$(filter $(DEB_HOST_ARCH),arm64))
DISTRIBUTION_PATCHES += \
@@ -654,10 +659,10 @@
# causes corrupt bold fonts in 2.5.0
CONFIGURE_ARGS += --disable-infinality
-ifneq ($(lcms_version),2)
+ifeq ($(with_system_lcms),yes)
+ CONFIGURE_ARGS += --enable-system-lcms
+else
CONFIGURE_ARGS += --disable-system-lcms
-else
- CONFIGURE_ARGS += --enable-system-lcms
endif
CONFIGURE_ARGS += --enable-system-kerberos
@@ -780,9 +785,11 @@
bd_openjdk = \
libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, \
$(if $(filter $(distrel), etch hardy),libcupsys2-dev,libcups2-dev), \
- libasound2-dev, liblcms$(lcms_version)-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, \
+ libasound2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, \
+ $(if $(filter yes, $(with_system_lcms)),liblcms$(lcms_version)-dev), \
libxinerama-dev, libkrb5-dev, xsltproc, $(bd_rhino) \
libpcsclite-dev,
+
ifeq (,$(filter $(distrel),lenny squeeze quantal precise oneiric natty maverick lucid karmic jaunty intrepid hardy gutsy feisty edgy dapper))
rhino_source := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W librhino-java)
endif
@@ -859,7 +866,8 @@
dlopen_hl_depends = \
$(if $(filter $(distrel), etch),libcupsys2,libcups2), \
- liblcms$(if $(filter 1,$(lcms_version)),1,2-2),
+ $(if $(filter yes, $(with_system_lcms)),liblcms$(if $(filter 1,$(lcms_version)),1,2-2)),
+
ifneq (,$(filter $(distrel),lenny squeeze oneiric natty maverick lucid karmic jaunty intrepid hardy gutsy feisty edgy dapper))
dlopen_hl_depends += libjpeg62,
else ifneq (,$(filter $(distrel), jessie sid))
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
