------------------------------------------------------------ revno: 739 committer: Matthias Klose <[email protected]> branch nick: openjdk8 timestamp: Mon 2019-04-29 14:53:16 +0200 message: merge 8u212-b03-0ubuntu1 modified: corba.tar.xz debian/changelog debian/control debian/control.in debian/rules debian/tests/jtdiff-autopkgtest.sh debian/tests/jtreg-autopkgtest.in debian/tests/jtreg-autopkgtest.sh hotspot-aarch32.tar.xz hotspot-aarch64.tar.xz hotspot.tar.xz jaxp.tar.xz jaxws.tar.xz jdk.tar.xz langtools.tar.xz nashorn.tar.xz root.tar.xz
-- 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 'corba.tar.xz' Binary files corba.tar.xz 2019-03-18 21:38:41 +0000 and corba.tar.xz 2019-04-29 12:53:16 +0000 differ === modified file 'debian/changelog' --- debian/changelog 2019-03-28 07:25:41 +0000 +++ debian/changelog 2019-04-29 12:53:16 +0000 @@ -1,8 +1,39 @@ -openjdk-8 (8u212-b01-2) UNRELEASED; urgency=medium +openjdk-8 (8u212-b03-1) UNRELEASED; urgency=medium + [ Matthias Klose ] * Configure --with-vendor-name. - -- Matthias Klose <[email protected]> Thu, 28 Mar 2019 08:20:50 +0100 + [ Tiago Stürmer Daitx ] + * Update to 8u212-b03. LP: #1826001. + * Security fixes: + - S8211936, CVE-2019-2602: Better String parsing. + - S8218453, CVE-2019-2684: More dynamic RMI interactions. + - S8219066, CVE-2019-2698: Fuzzing TrueType fonts: setCurrGlyphID(). + * Revert to GTK2 as default since GTK3 still has padding and component + issues: + - debian/rules: always Build-Depends on libgtk2.0-dev and Depends on + libgtk2.0-0 instead of relying on gtk3 for some releases. + * debian/control: add missing dependency on testng (required by the + testsuites). + + [ Andrej Shadura ] + * debian/rules: check for nodoc instead of nodocs in DEB_BUILD_OPTIONS. + Closes: 922757. + + [ Matthias Klose ] + * debian/rules, debian/tests/jtdiff-autopkgtest.sh, + debian/tests/jtreg-autopkgtest.in, debian/tests/jtreg-autopkgtest.sh: + only set the JDK under test and allow jtreg to use its default JDK + for running the tests. + + [ Thorsten Glaser ] + * Improve compatibility with older releases. Closes: #925407. + - debian/rules: determine source date using backwards-compatible + dpkg-parsechangelog call. + - debian/control.in: put @bd_cross@ onto same line as @bd_nss@ as + it can be empty. + + -- Matthias Klose <[email protected]> Mon, 29 Apr 2019 14:51:40 +0200 openjdk-8 (8u212-b01-1) unstable; urgency=medium === modified file 'debian/control' --- debian/control 2019-03-28 07:25:41 +0000 +++ debian/control 2019-04-29 12:53:16 +0000 @@ -6,16 +6,15 @@ Build-Depends: debhelper (>= 9), quilt, m4, lsb-release, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, wdiff, tzdata, xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, - jtreg <!nocheck>, time, + jtreg <!nocheck>, testng <!nocheck>, time, fastjar (>= 2:0.96-0ubuntu2), autoconf (>= 2.69), automake, autotools-dev, ant, ant-optional, g++-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), libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libgtk-3-dev, + libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libgtk2.0-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), - openjdk-8-jdk-headless <cross>, dpkg-dev (>= 1.17.14), + libnss3-dev (>= 2:3.17.1), openjdk-8-jdk-headless <cross>, dpkg-dev (>= 1.17.14), Standards-Version: 4.3.0 Homepage: http://openjdk.java.net/ Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk8 === modified file 'debian/control.in' --- debian/control.in 2019-03-28 07:25:41 +0000 +++ debian/control.in 2019-04-29 12:53:16 +0000 @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), quilt, m4, lsb-release, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, wdiff, tzdata, xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, - jtreg <!nocheck>, time, + jtreg <!nocheck>, testng <!nocheck>, time, @bd_fastjar@ @bd_autotools@ @bd_ant@ @bd_gcc@ @@ -14,8 +14,7 @@ @bd_openjdk@ @bd_zero@ @bd_shark@ @bd_syslibs@ @bd_pulsejava@ @bd_systemtap@ - @bd_nss@ - @bd_cross@ + @bd_nss@ @bd_cross@ Standards-Version: 4.3.0 Homepage: http://openjdk.java.net/ Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk8 === modified file 'debian/rules' --- debian/rules 2019-03-28 07:25:41 +0000 +++ debian/rules 2019-04-29 12:53:16 +0000 @@ -129,7 +129,7 @@ with_check = disabled running check on $(DEB_HOST_ARCH) endif -with_docs = $(if $(findstring nodocs, $(DEB_BUILD_OPTIONS)),,yes) +with_docs = $(if $(findstring nodoc, $(DEB_BUILD_OPTIONS)),,yes) ifneq (,$(findstring shark, $(PKGSOURCE))) with_docs = disabled for shark endif @@ -681,11 +681,11 @@ libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, \ libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), \ libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, -ifneq (,$(filter $(distrel),wheezy xenial artful)) +#ifneq (,$(filter $(distrel),wheezy xenial artful)) bd_openjdk += libgtk2.0-dev, -else - bd_openjdk += libgtk-3-dev, -endif +#else +# bd_openjdk += libgtk-3-dev, +#endif pkg_ffidev = libffi-dev @@ -760,11 +760,11 @@ dlopen_hl_recommends = dlopen_jre_depends = \ libglib2.0-0 (>= 2.24), libxrandr2, libxinerama1, libgl1-mesa-glx | libgl1, -ifneq (,$(filter $(distrel),wheezy xenial artful)) +#ifneq (,$(filter $(distrel),wheezy xenial artful)) dlopen_jre_depends += libgtk2.0-0 (>= 2.14), -else - dlopen_jre_depends += libgtk-3-0, -endif +#else +# dlopen_jre_depends += libgtk-3-0, +#endif dlopen_jre_recommends = @@ -926,8 +926,10 @@ fi debian/tests/%.sh: debian/tests/%.in debian/rules - sed -e 's/@jtreg_archs@/$(jtreg_archs)/g' \ - $< > $@; + sed \ + -e 's,@JDK_TO_TEST@,/$(basedir),g' \ + -e 's/@jtreg_archs@/$(jtreg_archs)/g' \ + $< > $@; chmod +x $@ gen-autopkgtests: debian/tests/jtreg-autopkgtest.sh @@ -1251,19 +1253,19 @@ check-hotspot: stamps/build mkdir -p jtreg-test-output/hotspot - JTREG_OPTIONS=$(JTREG_OPTIONS) VMNAME=$(VMNAME) JDK_DIR=$(builddir)/$(sdkimg) \ + JTREG_OPTIONS=$(JTREG_OPTIONS) VMNAME=$(VMNAME) JDK_TO_TEST=$(builddir)/$(sdkimg) \ AUTOPKGTEST_TMP=/tmp/ AUTOPKGTEST_ARTIFACTS=jtreg-test-output/hotspot/ \ $(TIME) debian/tests/hotspot | tee jtreg-test-output/[email protected] check-langtools: stamps/build mkdir -p jtreg-test-output/langtools - JTREG_OPTIONS=$(JTREG_OPTIONS) VMNAME=$(VMNAME) JDK_DIR=$(builddir)/$(sdkimg) \ + JTREG_OPTIONS=$(JTREG_OPTIONS) VMNAME=$(VMNAME) JDK_TO_TEST=$(builddir)/$(sdkimg) \ AUTOPKGTEST_TMP=/tmp/ AUTOPKGTEST_ARTIFACTS=jtreg-test-output/langtools/ \ $(TIME) debian/tests/langtools | tee jtreg-test-output/[email protected] check-jdk: stamps/build mkdir -p jtreg-test-output/jdk - JTREG_OPTIONS=$(JTREG_OPTIONS) VMNAME=$(VMNAME) JDK_DIR=$(builddir)/$(sdkimg) \ + JTREG_OPTIONS=$(JTREG_OPTIONS) VMNAME=$(VMNAME) JDK_TO_TEST=$(builddir)/$(sdkimg) \ AUTOPKGTEST_TMP=/tmp/ AUTOPKGTEST_ARTIFACTS=jtreg-test-output/jdk/ \ $(TIME) debian/tests/jdk | tee jtreg-test-output/[email protected] @@ -1849,7 +1851,7 @@ install -D -m644 $$FILE debian/$$PKG/usr/share/lintian/overrides/$$PKG; \ done -nodocs = $(if $(findstring nodocs, $(DEB_BUILD_OPTIONS)),-N$(p_doc)) +nodocs = $(if $(findstring nodoc, $(DEB_BUILD_OPTIONS)),-N$(p_doc)) nojrez = $(if $(filter shark zero, $(alternate_vms)),,-N$(p_jrez)) # Build architecture independant packages @@ -1976,20 +1978,20 @@ is_release = is_release = yes hg_project = jdk8u -hg_tag = jdk8u212-b01 +hg_tag = jdk8u212-b03 package_version = $(subst jdk,,$(hg_tag)) ifneq ($(is_release),yes) package_version := $(subst -,~,$(package_version)) endif hg_url = http://hg.openjdk.java.net/jdk8u/$(hg_project) hg_project_aarch64 = jdk8u-shenandoah -hg_tag_aarch64 = aarch64-shenandoah-jdk8u201-b12 +hg_tag_aarch64 = aarch64-shenandoah-jdk8u212-b04 hg_url_aarch64 = http://hg.openjdk.java.net/aarch64-port/$(hg_project_aarch64) hg_project_aarch32 = jdk8u hg_tag_aarch32 = jdk8u202-b08-aarch32-190124 hg_url_aarch32 = http://hg.openjdk.java.net/aarch32-port/$(hg_project_aarch32) origdir = ../openjdk-8-$(package_version).orig -source_date := $(shell dpkg-parsechangelog --show-field=Date) +source_date := $(shell dpkg-parsechangelog | sed -n '/^Date: /{s///p;q;}') fetch-orig: mkdir -p $(origdir) wget -O $(origdir)/root.tar.bz2 $(hg_url)/archive/$(hg_tag).tar.bz2 === modified file 'debian/tests/jtdiff-autopkgtest.sh' --- debian/tests/jtdiff-autopkgtest.sh 2019-03-17 17:29:36 +0000 +++ debian/tests/jtdiff-autopkgtest.sh 2019-04-29 12:53:16 +0000 @@ -14,12 +14,17 @@ host_arch=${DEB_HOST_ARCH:-$(dpkg --print-architecture)} -export JTREG_HOME=/usr/share/java -export JT_JAVA="${JT_JAVA:-/usr/lib/jvm/java-8-openjdk-${host_arch}}" +# don't mess around with JT_* env vars. If JDK_TO_TEST is set, then the +# script is called from the build, if not, from the autopkg tests +if [ -z "$JDK_TO_TEST" ]; then + JDK_TO_TEST=@JDK_TO_TEST@ +fi +JVERSION=$($JDK_TO_TEST/bin/java -version 2>&1| sed -n '1s/.*"\(.*\)".*/\1/p') +JMAJOR=$(echo $JVERSION | sed 's/\..*//') vmname=${VMNAME:-hotspot} -jt_report_tb="/usr/share/doc/openjdk-8-jdk/test-${host_arch}/jtreport-${vmname}.tar.gz" +jt_report_tb="/usr/share/doc/openjdk-$JMAJOR-jdk/test-${host_arch}/jtreport-${vmname}.tar.gz" build_report_dir="${AUTOPKGTEST_TMP}/jtreg-test-output/${testsuite}/JTreport" if [ ! -f "${jt_report_tb}" ]; then === modified file 'debian/tests/jtreg-autopkgtest.in' --- debian/tests/jtreg-autopkgtest.in 2019-03-17 17:29:36 +0000 +++ debian/tests/jtreg-autopkgtest.in 2019-04-29 12:53:16 +0000 @@ -11,9 +11,11 @@ host_arch=${DEB_HOST_ARCH:-$(dpkg --print-architecture)} -export JTREG_HOME=/usr/share/java -export JT_JAVA="${JT_JAVA:-/usr/lib/jvm/java-8-openjdk-${host_arch}}" -JDK_DIR="${JDK_DIR:-$JT_JAVA}" +# don't mess around with JT_* env vars. If JDK_TO_TEST is set, then the +# script is called from the build, if not, from the autopkg tests +if [ -z "$JDK_TO_TEST" ]; then + JDK_TO_TEST=$(echo @JDK_TO_TEST@ | sed "s/-[^-]*$/-$host_arch/") +fi jtreg_version="$(dpkg-query -W jtreg | cut -f2)" @@ -27,8 +29,8 @@ fi # check java binary -if [ ! -x "${JDK_DIR}/bin/java" ]; then - echo "Error: '${JDK_DIR}/bin/java' is not an executable." >&2 +if [ ! -x "${JDK_TO_TEST}/bin/java" ]; then + echo "Error: '${JDK_TO_TEST}/bin/java' is not an executable." >&2 exit 1 fi @@ -41,12 +43,12 @@ jtreg_processes() { ps x -ww -o pid,ppid,args \ | awk '$2 == 1 && $3 ~ /^\/scratch/' \ - | sed "s,${JDK_DIR},<sdkimg>,g;s,$(pwd),<pwd>,g" + | sed "s,${JDK_TO_TEST},<sdkimg>,g;s,$(pwd),<pwd>,g" } jtreg_pids() { ps x --no-headers -ww -o pid,ppid,args \ - | awk "\$2 == 1 && \$3 ~ /^${JDK_DIR//\//\\/}/ {print \$1}" + | awk "\$2 == 1 && \$3 ~ /^${JDK_TO_TEST//\//\\/}/ {print \$1}" } cleanup() { @@ -85,5 +87,5 @@ -timeout:5 \ -workDir:"${AUTOPKGTEST_ARTIFACTS}/JTwork" \ -reportDir:"${AUTOPKGTEST_ARTIFACTS}/JTreport" \ - -jdk:${JDK_DIR} \ + -jdk:${JDK_TO_TEST} \ $@ === modified file 'debian/tests/jtreg-autopkgtest.sh' --- debian/tests/jtreg-autopkgtest.sh 2019-03-17 17:29:36 +0000 +++ debian/tests/jtreg-autopkgtest.sh 2019-04-29 12:53:16 +0000 @@ -11,9 +11,11 @@ host_arch=${DEB_HOST_ARCH:-$(dpkg --print-architecture)} -export JTREG_HOME=/usr/share/java -export JT_JAVA="${JT_JAVA:-/usr/lib/jvm/java-8-openjdk-${host_arch}}" -JDK_DIR="${JDK_DIR:-$JT_JAVA}" +# don't mess around with JT_* env vars. If JDK_TO_TEST is set, then the +# script is called from the build, if not, from the autopkg tests +if [ -z "$JDK_TO_TEST" ]; then + JDK_TO_TEST=$(echo /usr/lib/jvm/java-8-openjdk-amd64 | sed "s/-[^-]*$/-$host_arch/") +fi jtreg_version="$(dpkg-query -W jtreg | cut -f2)" @@ -27,8 +29,8 @@ fi # check java binary -if [ ! -x "${JDK_DIR}/bin/java" ]; then - echo "Error: '${JDK_DIR}/bin/java' is not an executable." >&2 +if [ ! -x "${JDK_TO_TEST}/bin/java" ]; then + echo "Error: '${JDK_TO_TEST}/bin/java' is not an executable." >&2 exit 1 fi @@ -41,12 +43,12 @@ jtreg_processes() { ps x -ww -o pid,ppid,args \ | awk '$2 == 1 && $3 ~ /^\/scratch/' \ - | sed "s,${JDK_DIR},<sdkimg>,g;s,$(pwd),<pwd>,g" + | sed "s,${JDK_TO_TEST},<sdkimg>,g;s,$(pwd),<pwd>,g" } jtreg_pids() { ps x --no-headers -ww -o pid,ppid,args \ - | awk "\$2 == 1 && \$3 ~ /^${JDK_DIR//\//\\/}/ {print \$1}" + | awk "\$2 == 1 && \$3 ~ /^${JDK_TO_TEST//\//\\/}/ {print \$1}" } cleanup() { @@ -85,5 +87,5 @@ -timeout:5 \ -workDir:"${AUTOPKGTEST_ARTIFACTS}/JTwork" \ -reportDir:"${AUTOPKGTEST_ARTIFACTS}/JTreport" \ - -jdk:${JDK_DIR} \ + -jdk:${JDK_TO_TEST} \ $@ === modified file 'hotspot-aarch32.tar.xz' Binary files hotspot-aarch32.tar.xz 2019-03-18 21:38:41 +0000 and hotspot-aarch32.tar.xz 2019-04-29 12:53:16 +0000 differ === modified file 'hotspot-aarch64.tar.xz' Binary files hotspot-aarch64.tar.xz 2019-03-18 21:38:41 +0000 and hotspot-aarch64.tar.xz 2019-04-29 12:53:16 +0000 differ === modified file 'hotspot.tar.xz' Binary files hotspot.tar.xz 2019-03-18 21:38:41 +0000 and hotspot.tar.xz 2019-04-29 12:53:16 +0000 differ === modified file 'jaxp.tar.xz' Binary files jaxp.tar.xz 2019-03-18 21:38:41 +0000 and jaxp.tar.xz 2019-04-29 12:53:16 +0000 differ === modified file 'jaxws.tar.xz' Binary files jaxws.tar.xz 2019-03-18 21:38:41 +0000 and jaxws.tar.xz 2019-04-29 12:53:16 +0000 differ === modified file 'jdk.tar.xz' Binary files jdk.tar.xz 2019-03-18 21:38:41 +0000 and jdk.tar.xz 2019-04-29 12:53:16 +0000 differ === modified file 'langtools.tar.xz' Binary files langtools.tar.xz 2019-03-18 21:38:41 +0000 and langtools.tar.xz 2019-04-29 12:53:16 +0000 differ === modified file 'nashorn.tar.xz' Binary files nashorn.tar.xz 2019-03-18 21:38:41 +0000 and nashorn.tar.xz 2019-04-29 12:53:16 +0000 differ === modified file 'root.tar.xz' Binary files root.tar.xz 2019-03-18 21:38:41 +0000 and root.tar.xz 2019-04-29 12:53:16 +0000 differ
__ This is the maintainer address of Debian's Java team <https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use [email protected] for discussions and questions.
