Your message dated Wed, 21 Oct 2020 15:18:52 +0000
with message-id <[email protected]>
and subject line Bug#971247: fixed in openjdk-13 13.0.5+3-2
has caused the Debian Bug report #971247,
regarding openjdk-13: diff for NMU version 13.0.4+8-1.1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
971247: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971247
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: openjdk-13
Version: 13.0.4+8-1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for openjdk-13 (versioned as 13.0.4+8-1.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I should
delay it longer or remove it from the queue.
Please see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944738 for
context.
Thank you,
tony
diff -Nru openjdk-13-13.0.4+8/debian/changelog openjdk-13-13.0.4+8/debian/changelog
--- openjdk-13-13.0.4+8/debian/changelog 2020-07-17 11:24:46.000000000 -0700
+++ openjdk-13-13.0.4+8/debian/changelog 2020-09-27 13:38:20.000000000 -0700
@@ -1,3 +1,13 @@
+openjdk-13 (13.0.4+8-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply patch to strip nondeterminism before computing jmod hash.
+ Thank you to Julian Gilbey for the patch.
+ See Debian bugs #944738 and #968991.
+ Add Build-Depends on strip-nondeterminism.
+
+ -- tony mancill <[email protected]> Sun, 27 Sep 2020 13:38:20 -0700
+
openjdk-13 (13.0.4+8-1) unstable; urgency=medium
* OpenJDK 13.0.4 release, build 8.
diff -Nru openjdk-13-13.0.4+8/debian/control openjdk-13-13.0.4+8/debian/control
--- openjdk-13-13.0.4+8/debian/control 2020-07-17 09:25:05.000000000 -0700
+++ openjdk-13-13.0.4+8/debian/control 2020-09-27 13:37:50.000000000 -0700
@@ -15,6 +15,7 @@
zlib1g-dev:native, zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev,
libnss3-dev (>= 2:3.17.1),
openjdk-13-jdk-headless <cross>,
+ strip-nondeterminism,
Build-Depends-Indep: graphviz, pandoc,
Standards-Version: 4.4.0
Homepage: http://openjdk.java.net/
diff -Nru openjdk-13-13.0.4+8/debian/patches/reproducible-build-jmod.diff openjdk-13-13.0.4+8/debian/patches/reproducible-build-jmod.diff
--- openjdk-13-13.0.4+8/debian/patches/reproducible-build-jmod.diff 1969-12-31 16:00:00.000000000 -0800
+++ openjdk-13-13.0.4+8/debian/patches/reproducible-build-jmod.diff 2020-09-27 13:36:33.000000000 -0700
@@ -0,0 +1,33 @@
+Description: jlink: Hash of module differs to expected hash recorded in java.base
+ The cause is the use of dh_strip_nondeterminism late in the build
+ process. This reorganises the jmod files, which in turn changes their
+ SHA256 checksums. This would not be a problem, except that the
+ checksums are saved in java.base.jmod *before* the use of
+ dh_strip_nondeterminism. Performing this stripping immediately after
+ each jmod file is created results in the checksums being consistent
+ throughout.
+Author: Julian Gilbey <[email protected]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944738
+Forwarded: not-needed
+
+--- a/make/CreateJmods.gmk
++++ b/make/CreateJmods.gmk
+@@ -216,6 +216,9 @@
+
+ # Create jmods in the support dir and then move them into place to keep the
+ # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.
++# strip-nondeterminism requires the same timestamp as
++# dh_strip_nondeterminism uses, so we determine this first.
++DSN_TIMESTAMP := $(shell perl -MDebian::Debhelper::Dh_Lib -e 'print get_source_date_epoch()')
+ $(eval $(call SetupExecute, create_$(JMOD_FILE), \
+ WARN := Creating $(INTERIM_MSG)$(JMOD_FILE), \
+ DEPS := $(DEPS), \
+@@ -226,7 +229,7 @@
+ --target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \
+ --module-path $(JMODS_DIR) $(JMOD_FLAGS) \
+ $(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \
+- POST_COMMAND := $(MV) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE) $(JMODS_DIR)/$(JMOD_FILE), \
++ POST_COMMAND := strip-nondeterminism --timestamp $(DSN_TIMESTAMP) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE) && $(MV) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE) $(JMODS_DIR)/$(JMOD_FILE), \
+ ))
+
+ TARGETS += $(create_$(JMOD_FILE))
diff -Nru openjdk-13-13.0.4+8/debian/patches/series openjdk-13-13.0.4+8/debian/patches/series
--- openjdk-13-13.0.4+8/debian/patches/series 2020-04-14 23:41:08.000000000 -0700
+++ openjdk-13-13.0.4+8/debian/patches/series 2020-09-27 13:36:27.000000000 -0700
@@ -43,3 +43,4 @@
reproducible-copyright-headers.diff
reproducible-build-user.diff
JDK-8230708.diff
+reproducible-build-jmod.diff
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Source: openjdk-13
Source-Version: 13.0.5+3-2
Done: Matthias Klose <[email protected]>
We believe that the bug you reported is fixed in the latest version of
openjdk-13, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Matthias Klose <[email protected]> (supplier of updated openjdk-13 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Wed, 21 Oct 2020 16:54:07 +0200
Source: openjdk-13
Architecture: source
Version: 13.0.5+3-2
Distribution: unstable
Urgency: medium
Maintainer: OpenJDK Team <[email protected]>
Changed-By: Matthias Klose <[email protected]>
Closes: 971247
Changes:
openjdk-13 (13.0.5+3-2) unstable; urgency=medium
.
* OpenJDK 13.0.5 release, build 3.
* Call strip-nondeterminism before computing jmod hashes (Julian Gilbey).
Closes: #971247.
* Bump standards version.
* Build with GCC 10 in current development versions.
* Don't run the jdk tests as an autopkg test, taking too long.
Checksums-Sha1:
5c58fa581582690837100cb9632b036e93c2af0d 4757 openjdk-13_13.0.5+3-2.dsc
6aa0ec0af6f607fcd2e497614cefb96f2a458e97 68950024
openjdk-13_13.0.5+3.orig.tar.xz
5ec98d373addf961a619f0407e28f11607308205 172888
openjdk-13_13.0.5+3-2.debian.tar.xz
c7c9aadd6216344a281dd63f2c7576f180505205 14425
openjdk-13_13.0.5+3-2_source.buildinfo
Checksums-Sha256:
831d484d2790379cbf8821b22b5498f951fb7a71e8b60c06d8863cf8c7b38469 4757
openjdk-13_13.0.5+3-2.dsc
a928af7b8857c70fefe6a1c0a9cce44d49175bb499162c31066fc8196d2e8c92 68950024
openjdk-13_13.0.5+3.orig.tar.xz
2eebbc529a164de121f2aa9a407125965df9fc182e123cdbd662d95f421bf6d9 172888
openjdk-13_13.0.5+3-2.debian.tar.xz
c5e91750e8df192dadd99f19ed2ca219c70d5a378f25fdef969efadee7769aaf 14425
openjdk-13_13.0.5+3-2_source.buildinfo
Files:
3a7e93dfda87d960fd3f83733ae05653 4757 java optional openjdk-13_13.0.5+3-2.dsc
db1b866bc3cf32994c276b1859b8110c 68950024 java optional
openjdk-13_13.0.5+3.orig.tar.xz
abffe67c229e1e67404f7901f19fd317 172888 java optional
openjdk-13_13.0.5+3-2.debian.tar.xz
cb294aa95146518b5be59226f1436b65 14425 java optional
openjdk-13_13.0.5+3-2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCAAuFiEE1WVxuIqLuvFAv2PWvX6qYHePpvUFAl+QS7sQHGRva29AdWJ1
bnR1LmNvbQAKCRC9fqpgd4+m9YVVEACslpEI5C2PneB7dQ5/VN8w1TXWId8Uwbkl
2jzr6Dm0m8CwOcVTuk/Ib5/AW6mVPZbHAVtijzBwGxxMLMsYevV6X3ezeFnV54K/
IWlRZSPaApRPVPICq/Q00j8+u/uoni7wrqHxTPe3oHXAjIiw93uEmNMsVSHBjmiu
8h2hNQqo5wSY+9Prs2ZaEbF3qOpjfXoaJDDmQiwRpuap+XUGKc0GUrfjMaSgpPik
OppJQ7Is7/T0POkVI52wwk6cERxzGk+KsbSy87zaQYTvQUL6HJLvBLIiIpbn7PLe
Lv4ee7cqIHEFOB1CDkWKuIFgQMDdn294qqq3uHIsuigcC7kpW9nHVMTGpLOPv/uF
kRi1ei9mo4R/O0zcVji2h+Hsg3xWFiLnWoOcfswGIV8H9JZi8s7+a/TKhEleJnP8
Sjx7opOAEW+iU0OvYkOKeHZptD6XHnPiohCRd4xy4lm/xXg+4gaoqG0C/xOkuzUm
WnhLbYZxZQAfVm69nq2BTMpTisne69RBDzEgFmEQcYhC9A/q9NvRuLRz/yXk2Y12
44Wg71JBHAuoX3et+BSh1N3uvg75LBsP9z3HAz9Z+5nmdz3MuIYPnyISMezAxszU
UzrAN8fRIACXeGCCLHml2RVmj8s6E76m63ZcwprYTiiLqU5Nle51b1q9UU7Bya5Z
5tGl9B4omw==
=reBP
-----END PGP SIGNATURE-----
--- End Message ---
