------------------------------------------------------------
revno: 711
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk8
timestamp: Wed 2017-08-23 19:57:58 +0200
message:
openjdk-8 (8u141-b15-4) UNRELEASED; urgency=medium
* Fix libjvm.so's .debug file names. LP: #1548434.
-- Matthias Klose <d...@ubuntu.com> Wed, 23 Aug 2017 18:46:31 +0200
openjdk-8 (8u141-b15-3) unstable; urgency=high
* Fix building the javadocs, build error introduced by the m68k changes.
* Update the kfreebsd patches (Adrian Glaubitz). Closes: #869643, #869672.
-- Matthias Klose <d...@ubuntu.com> Tue, 25 Jul 2017 17:03:27 +0200
modified:
debian/changelog
debian/control
debian/control.in
debian/patches/kfreebsd-support-hotspot.diff
debian/patches/kfreebsd-support-jdk.diff
debian/patches/m68k-support.diff
debian/rules
--
lp:~openjdk/openjdk/openjdk8
https://code.launchpad.net/~openjdk/openjdk/openjdk8
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk8.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog 2017-07-24 21:02:59 +0000
+++ debian/changelog 2017-08-23 17:57:58 +0000
@@ -1,17 +1,31 @@
-openjdk-8 (8u141-b15-2) UNRELEASED; urgency=medium
+openjdk-8 (8u141-b15-4) UNRELEASED; urgency=medium
+
+ * Fix libjvm.so's .debug file names. LP: #1548434.
+
+ -- Matthias Klose <d...@ubuntu.com> Wed, 23 Aug 2017 18:46:31 +0200
+
+openjdk-8 (8u141-b15-3) unstable; urgency=high
+
+ * Fix building the javadocs, build error introduced by the m68k changes.
+ * Update the kfreebsd patches (Adrian Glaubitz). Closes: #869643, #869672.
+
+ -- Matthias Klose <d...@ubuntu.com> Tue, 25 Jul 2017 17:03:27 +0200
+
+openjdk-8 (8u141-b15-2) unstable; urgency=high
[ Matthias Klose ]
* Update the m68k-support patch (Adrian Glaubitz). Closes: #864180.
* Disable generation of jvmti.html on m68k (Adrian Glaubitz).
Closes: #864205.
* Disable the jamvm autopkg tests.
+ * CVE-2017-10243 is also fixed in 8u141-b15 (S8182054).
[ Tiago Stürmer Daitx ]
* patches/hotspot-ppc64el-S8181055-use-numa-v2-api.patch: mbind invalid
argument message is still seen after S8175813; use numa_interleave_memory
v2 api when available. LP: #1705763.
- -- Matthias Klose <d...@ubuntu.com> Sat, 22 Jul 2017 11:39:47 +0200
+ -- Matthias Klose <d...@ubuntu.com> Mon, 24 Jul 2017 23:09:09 +0200
openjdk-8 (8u141-b15-1) unstable; urgency=high
=== modified file 'debian/control'
--- debian/control 2017-07-21 13:59:23 +0000
+++ debian/control 2017-08-23 17:57:58 +0000
@@ -7,14 +7,14 @@
sharutils, gawk, cpio, pkg-config, procps, wdiff, tzdata,
fastjar (>= 2:0.96-0ubuntu2),
autoconf (>= 2.69), automake, autotools-dev, ant, ant-optional,
- g++-6,
+ g++-4.8,
openjdk-8-jdk | openjdk-7-jdk,
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, libpcsclite-dev,
libffi-dev,
- zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, libpulse-dev (>= 0.9.12) [!alpha], systemtap-sdt-dev [!sh4],
- libnss3-dev (>= 2:3.17.1),
+ zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, libpulse-dev (>= 0.9.12) [!alpha],
+ libnss3-dev (>= 2:3.12.3),
mauve, jtreg, xvfb, xauth, xfonts-base, libgl1-mesa-dri [!x32], twm | metacity, twm | dbus-x11, x11-xkb-utils,
- time, openjdk-8-jdk-headless <cross>, dpkg-dev (>= 1.17.14),
+ time,
Standards-Version: 3.9.8
Homepage: http://openjdk.java.net/
Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk8
@@ -51,13 +51,12 @@
Suggests: ${jamvm:Suggests},
libnss-mdns,
fonts-dejavu-extra,
- fonts-ipafont-gothic, fonts-ipafont-mincho, fonts-wqy-microhei, fonts-wqy-zenhei, fonts-indic,
+ fonts-ipafont-gothic, fonts-ipafont-mincho, fonts-wqy-microhei, fonts-wqy-zenhei, ttf-indic-fonts-core, ttf-telugu-fonts, ttf-oriya-fonts, ttf-kannada-fonts, ttf-bengali-fonts,
Provides: java2-runtime-headless,
java5-runtime-headless, java6-runtime-headless,
java7-runtime-headless, java8-runtime-headless,
${defaultvm:Provides}, ${jvm:Provides}
Breaks: oracle-java8-installer (<< 8u77+8u77arm-1),
- ca-certificates-java (<< 20160321~)
Description: OpenJDK Java runtime, using ${vm:Name} (headless)
Minimal Java runtime - needed for executing non GUI Java programs,
using ${vm:Name}.
=== modified file 'debian/control.in'
--- debian/control.in 2017-07-21 13:59:23 +0000
+++ debian/control.in 2017-08-23 17:57:58 +0000
@@ -57,7 +57,6 @@
java7-runtime-headless, java8-runtime-headless,
${defaultvm:Provides}, ${jvm:Provides}
Breaks: oracle-java8-installer (<< 8u77+8u77arm-1),
- ca-certificates-java (<< 20160321~)
Description: OpenJDK Java runtime, using ${vm:Name} (headless)
Minimal Java runtime - needed for executing non GUI Java programs,
using ${vm:Name}.
=== modified file 'debian/patches/kfreebsd-support-hotspot.diff'
--- debian/patches/kfreebsd-support-hotspot.diff 2016-10-25 14:31:29 +0000
+++ debian/patches/kfreebsd-support-hotspot.diff 2017-08-23 17:57:58 +0000
@@ -140,7 +140,23 @@
+#endif
st->cr();
}
-
+
+--- a/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-12 08:27:13.000000000 +0200
++++ b/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-25 13:13:21.333303596 +0200
+@@ -3422,8 +3422,12 @@
+ return NULL;
+ }
+
++#ifndef __FreeBSD_kernel__
+ // SHM_REMAP is needed to allow shmat to map over an existing mapping.
+ char* addr = (char*)shmat(shmid, pre_reserved_addr, SHM_REMAP);
++#else
++ char* addr = (char*)shmat(shmid, pre_reserved_addr, 0);
++#endif
+
+ if ((intptr_t)addr == -1) {
+ int err = errno;
+
Index: b/hotspot/src/os/linux/vm/osThread_linux.cpp
===================================================================
--- a/hotspot/src/os/linux/vm/osThread_linux.cpp
=== modified file 'debian/patches/kfreebsd-support-jdk.diff'
--- debian/patches/kfreebsd-support-jdk.diff 2016-10-25 14:31:29 +0000
+++ debian/patches/kfreebsd-support-jdk.diff 2017-08-23 17:57:58 +0000
@@ -1112,16 +1112,16 @@
if (ioctl(sock, SIOCGLIFHWADDR, &lif) != -1) {
struct sockaddr_dl *sp;
-@@ -1907,7 +1911,7 @@ static int getFlags(int sock, const char
+@@ -1861,7 +1861,7 @@
/** BSD **/
-#ifdef _ALLBSD_SOURCE
+#if defined(_ALLBSD_SOURCE) || defined(__FreeBSD_kernel__)
- /* Open socket for further ioct calls, try v4 socket first and
- * if it falls return v6 socket
- */
-@@ -2036,7 +2040,11 @@ static netif *enumIPv6Interfaces(JNIEnv
+
+ /*
+ * Opens a socket for further ioct calls. Tries AF_INET socket first and
+@@ -1976,6 +1976,10 @@
continue;
memset(&ifr6, 0, sizeof(ifr6));
@@ -1130,9 +1130,9 @@
+#else
strlcpy(ifr6.ifr_name, ifa->ifa_name, sizeof(ifr6.ifr_name));
+#endif
- memcpy(&ifr6.ifr_addr, ifa->ifa_addr, MIN(sizeof(ifr6.ifr_addr), ifa->ifa_addr->sa_len));
-
- if (ioctl(sock, SIOCGIFNETMASK_IN6, (caddr_t)&ifr6) < 0) {
+ memcpy(&ifr6.ifr_addr, ifa->ifa_addr,
+ MIN(sizeof(ifr6.ifr_addr), ifa->ifa_addr->sa_len));
+
Index: b/jdk/src/solaris/native/java/net/net_util_md.c
===================================================================
--- a/jdk/src/solaris/native/java/net/net_util_md.c
@@ -4491,7 +4491,7 @@
LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
endif
-@@ -478,7 +478,7 @@ $(eval $(call SetupNativeCompilation,BUI
+@@ -478,7 +478,7 @@
MAPFILE := $(LIBAWT_MAPFILE), \
LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_solaris := -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
@@ -4509,7 +4509,7 @@
$(call SET_SHARED_LIBRARY_ORIGIN,/..), \
LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
-L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
-@@ -687,7 +687,7 @@ $(eval $(call SetupNativeCompilation,BUI
+@@ -687,7 +687,7 @@
LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
=== modified file 'debian/patches/m68k-support.diff'
--- debian/patches/m68k-support.diff 2017-07-22 09:43:45 +0000
+++ debian/patches/m68k-support.diff 2017-08-23 17:57:58 +0000
@@ -1269,16 +1269,3 @@
+XTextProperty.format 8
+XTextProperty.nitems 12
+XTextProperty 16
-Index: jdk8u-c684352da3e3/make/Javadoc.gmk
-===================================================================
---- jdk8u-c684352da3e3.orig/make/Javadoc.gmk
-+++ jdk8u-c684352da3e3/make/Javadoc.gmk
-@@ -47,7 +47,7 @@ HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPU
- BUILD_NUMBER=$(JDK_BUILD_NUMBER)
-
- JAVADOC_CMD = $(JAVA) \
-- -Xmx1024m \
-+ -Xmx512m \
- -Djava.awt.headless=true \
- $(NEW_JAVADOC) \
- -bootclasspath $(JDK_OUTPUTDIR)/classes
=== modified file 'debian/rules'
--- debian/rules 2017-07-24 21:04:36 +0000
+++ debian/rules 2017-08-23 17:57:58 +0000
@@ -2238,7 +2238,7 @@
for i in {$(d_jrehl),$(d_jre),$(d_jrez)}/$(basedir)/jre/lib/$(archdir)/*/libjvm.so; do \
[ -f $$i ] || continue; \
b_id=$$(LC_ALL=C readelf -n $$i | sed -n 's/ *Build ID: *\([0-9a-f][0-9a-f]*\)/\1/p'); \
- if [ -z "$$b_id" ] || [ "$(dh_version)" -lt 9 ]; then \
+ if [ -z "$$b_id" ]; then \
id=$$(echo $$i | sed -r 's,debian/[^/]+,$(d_dbg)/usr/lib/debug,'); \
echo strip $$i; \
mkdir -p $$(dirname $$id); \
@@ -2254,9 +2254,6 @@
objcopy --only-keep-debug --compress-debug-sections $$i $(d_dbg)/$$d/$$f; \
chmod 644 $(d_dbg)/$$d/$$f; \
strip --remove-section=.comment --remove-section=.note $$i; \
- pushd $(d_dbg)/$$d >/dev/null; \
- objcopy --add-gnu-debuglink $$f $(CURDIR)/$$i; \
- popd >/dev/null; \
fi; \
done
endif
__
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.
