From: Raspbian forward pporter Date: Thu, 31 Aug 2017 12:19:43 +0000 (+0100) Subject: Merge version 7u131-2.6.9-2~deb7u1+rpi1 and 7u151-2.6.11-1+deb7u1 to produce 7u151... X-Git-Tag: archive/raspbian/7u151-2.6.11-1+deb7u1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fc6a11bbb0ffe37452a30cfefbfe16e1dbaae25b;p=openjdk-7.git Merge version 7u131-2.6.9-2~deb7u1+rpi1 and 7u151-2.6.11-1+deb7u1 to produce 7u151-2.6.11-1+deb7u1+rpi1 --- fc6a11bbb0ffe37452a30cfefbfe16e1dbaae25b diff --cc debian/changelog index cfe4b7a,b393c4f..3ba2ca3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,18 -1,104 +1,113 @@@ - openjdk-7 (7u131-2.6.9-2~deb7u1+rpi1) wheezy-staging; urgency=medium ++openjdk-7 (7u151-2.6.11-1+deb7u1+rpi1) wheezy-staging; urgency=medium + + [changes brought forward from 7u75-2.5.4-3+rpi1 by Peter Michael Green at Sat, 11 Apr 2015 23:21:38 +0000] + * Tag assembler as armv6 to avoid setting off armv7 contamination checker. + * Add patch to disable currency timebomb. + * Allow docs to be built on any architecture. + - -- Raspbian forward porter Sun, 28 May 2017 11:09:53 +0000 ++ -- Raspbian forward porter Thu, 31 Aug 2017 12:19:42 +0000 + - openjdk-7 (7u131-2.6.9-2~deb7u1) wheezy-security; urgency=medium + openjdk-7 (7u151-2.6.11-1+deb7u1) wheezy-security; urgency=medium * Non-maintainer upload by the LTS team. - * Backport to wheezy-security. + * Backport to wheezy. + * Keep using libjpeg8-dev in wheezy; libjpeg-dev is not available there. - -- Emilio Pozuelo Monfort Tue, 23 May 2017 17:46:05 +0200 + -- Emilio Pozuelo Monfort Thu, 24 Aug 2017 17:37:58 +0200 + + openjdk-7 (7u151-2.6.11-1) experimental; urgency=medium + + * IcedTea release 2.6.11 (based on 7u151). Closes: #869816. + * Security fixes: + - S8163958, CVE-2017-10102: Improved garbage collection. + - S8167228: Update to libpng 1.6.28. + - S8169209, CVE-2017-10053: Improved image post-processing steps. + - S8169392, CVE-2017-10067: Additional jar validation steps. + - S8170966, CVE-2017-10081: Right parenthesis issue. + - S8172204, CVE-2017-10087: Better Thread Pool execution. + - S8172461, CVE-2017-10089: Service Registration Lifecycle. + - S8172465, CVE-2017-10090: Better handling of channel groups. + - S8172469, CVE-2017-10096: Transform Transformer Exceptions. + - S8173286, CVE-2017-10101: Better reading of text catalogs. + - S8173697, CVE-2017-10107: Less Active Activations. + - S8173770, CVE-2017-10074: Image conversion improvements. + - S8174098, CVE-2017-10110: Better image fetching. + - S8174105, CVE-2017-10108: Better naming attribution. + - S8174113, CVE-2017-10109: Better sourcing of code. + - S8174770: Check registry registration location. + - S8174873: Improved certificate processing. + - S8175106, CVE-2017-10115: Higher quality DSA operations. + - S8175110, CVE-2017-10118: Higher quality ECDSA operations. + - S8176055: JMX diagnostic improvements. + - S8176067, CVE-2017-10116: Proper directory lookup processing. + - S8176760, CVE-2017-10135: Better handling of PKCS8 material. + - S8178135, CVE-2017-10176: Additional elliptic curve support. + - S8181420, CVE-2017-10074: PPC: Image conversion improvements. + - S8182054, CVE-2017-10243: Improve wsdl support. + - S8183551, CVE-2017-10074, PR3423: AArch64: Image conversion improvements. + - S8184119, CVE-2017-10111: Incorrect return processing for the LF editor + of MethodHandles.permuteArguments. + + [ Tiago Stürmer Daitx ] + * d/control.in: + - remove @bd_compress@ dependency. + - replace @bd_autotools@ with fixed dependencies. + * d/control.tests: package to hold all tests artifacts and logs. + * d/repack: fixed and simplified download script. + * d/rules: + - include openjdk-7-tests package on Ubuntu derivatives only. + - only save the full jtreg results when the openjdk-7-tests package + is being built, otherwise stick to old behaviour (keep compressed + test summaries + failed test results). Closes: #863007, #865533. + - only run the long jdk testsuite when default vm is a hotspot. + - only run the full testsuite for zero alternative vm on very fast + systems, otherwise stick to the hotspot testsuite to avoid long + build times. + - remove with_nss as all supported releases have it now. + - remove gcc/g++ configurations for EOL releases. + - keep libjpeg8 dependency on wheezy, replace it with libjpeg62-turbo + on other Debian releases and libjpeg-turbo8 on Ubuntu. Closes: #766601. + - remove old logic to depend on libcupsys2. + - always set rhino_source, all supported releases have dpkg > 1.16.2. + - remove bd_compress and pkg_compress as they haven't been used for + quite a while. + - remove with_wgy_zenhai logic, lenny is EOL. + - remove bd_autotools logic if/then, call dh_autoreconf and + dh_autoreconf_clean. + - simplify bootstrap dependency logic and remove EOL releases. + - remove EOL releases from gcc/g++ dependency logic. + - remove unused jamvm_defaults and simplify jamvm_archs logic. + - use ttf-indic-fonts for trusty, otherwise stick to fonts-indic. + - patch configure after dh_autoreconf call to include additional + /usr/lib/jvm directories; setting DEB_HOST_ARCH=alpha to check + if patches apply correctly fails because alpha requires a jdk for + bootstrap and IcedTea does not look into our usual directories. + * d/p/fontconfig-arphic-uming.diff: removed, not used since lenny. + * d/p/jdk-getAccessibleValue.diff: libatk-wrapper-java: File selection + dialog not refreshed when changing directory. Kindly provided by + Samuel Thibault. Closes: #827741. + * d/p/jdk-S8173783-fix-illegalargumentexception-regression.patch: + deleted, included in IcedTea 2.6.10. + * d/p/kfreebsd-support-jdk.diff: updated, was failing to apply due to + jdk changes in NetworkInterface.c. + * d/p/sec-webrev-8u131-*.patch: deleted, included in IcedTea 2.6.10. + * d/p/zero-sparc.diff: commented out chaitin.hpp hunk #1 as that #ifdef + has been removed by JDK-8011621 (backported by IcedTea 2.6.10); this + was also backported to 7u131 through JDK-8160961 but then backed out, + better keep the hunk in case IcedTea decides to back it out as well. + + [ Matthias Klose ] + * Build using gcc-6 on recent releases. + * Fix libjvm.so's .debug file names. Closes: #865749. LP: #1548434. + + -- Matthias Klose Wed, 23 Aug 2017 16:02:57 +0200 + + openjdk-7 (7u131-2.6.9-3) experimental; urgency=medium + + * Only include the failing tests in the packages, not the whole test world. + * openjdk-7-jdk: Provide openjdk-7-jdk-headless. + + -- Matthias Klose Sat, 20 May 2017 15:52:17 -0700 openjdk-7 (7u131-2.6.9-2) experimental; urgency=high diff --cc debian/rules index cfe4310,bb45c44..1750383 --- a/debian/rules +++ b/debian/rules @@@ -364,8 -331,8 +332,9 @@@ DISTRIBUTION_PATCHES += debian/patches/libpcsclite-dlopen.diff \ debian/patches/dnd-files.patch \ debian/patches/jdk-bold-swing-fonts.patch \ + debian/patches/disable-currency-timebomb.diff \ debian/patches/javadoc-sort-enum-and-annotation-types.patch \ + debian/patches/jdk-getAccessibleValue.diff \ ifeq (,$(filter $(DEB_HOST_ARCH),arm64)) DISTRIBUTION_PATCHES += \