Your message dated Wed, 21 Oct 2020 15:05:55 +0000
with message-id <[email protected]>
and subject line Bug#971247: fixed in openjdk-13 13.0.5+3-1
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-1
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:47:41 +0200
Source: openjdk-13
Architecture: source
Version: 13.0.5+3-1
Distribution: unstable
Urgency: medium
Maintainer: OpenJDK Team <[email protected]>
Changed-By: Matthias Klose <[email protected]>
Closes: 971247
Changes:
openjdk-13 (13.0.5+3-1) 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:
bdb2caf9260b9f399ec69f0a464b21c476c81795 4756 openjdk-13_13.0.5+3-1.dsc
6aa0ec0af6f607fcd2e497614cefb96f2a458e97 68950024
openjdk-13_13.0.5+3.orig.tar.xz
5c15852e9244f3f342848bee5eac26135c20591c 172812
openjdk-13_13.0.5+3-1.debian.tar.xz
e9e2461bf9d3b17fc20b3bce3af042b5ec666961 14477
openjdk-13_13.0.5+3-1_source.buildinfo
Checksums-Sha256:
fedd2c36a654bf3ffe95ff943c5664d95baf1aa99a56bd04a8d4ecee66a14742 4756
openjdk-13_13.0.5+3-1.dsc
a928af7b8857c70fefe6a1c0a9cce44d49175bb499162c31066fc8196d2e8c92 68950024
openjdk-13_13.0.5+3.orig.tar.xz
bf92957bba5c6d61255471173f05519d2202c6fffdbdaa239a9d100133c47553 172812
openjdk-13_13.0.5+3-1.debian.tar.xz
8a284296805724534d6b8120220a46471c9ecd98cc9835ab80e22698fe1cbe95 14477
openjdk-13_13.0.5+3-1_source.buildinfo
Files:
945eab4cbbfdce7706cd1ee11092c41b 4756 java optional openjdk-13_13.0.5+3-1.dsc
db1b866bc3cf32994c276b1859b8110c 68950024 java optional
openjdk-13_13.0.5+3.orig.tar.xz
0a6a83a9cdaab025a819cd0190a80dc6 172812 java optional
openjdk-13_13.0.5+3-1.debian.tar.xz
d6ddcf9fb11ecb1d5a5d4a6cfe997984 14477 java optional
openjdk-13_13.0.5+3-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCAAuFiEE1WVxuIqLuvFAv2PWvX6qYHePpvUFAl+QSl8QHGRva29AdWJ1
bnR1LmNvbQAKCRC9fqpgd4+m9QgpEADZIN1V3TjngmhDj2wIqZrz1JYq8ZFVOlFE
INQHsWs4LuvY1wwR59bEslAc+p56Nh/s58EEaiHaqoi+mNndzbkQpd4B7ldysQPI
/fezK3BCGuW3+N8pH45gbrbs4GlaZcwY6p1TLyA3o9KruDB2Og9H27xiM37UWFoY
j+YVUwSAovNb0wapxbyDpemZAbiXO/BdUxZ0s0T1zaVBM0QVGNpkwtMlf8VQTFXN
SEVS9vIZgXO2ATTdnjHuJnuhO7hR9HOFRqH0/vWycRo5OcyEjGe8IAKRQm/eQpuP
4/1+WmUbfxmDNkh3SZQnK5uOOjWpDqW9ERojK/eFlMG1O+r8GhTeuQAq/yxuQ8fG
7pgKpYgWygj4zp1pJfbHYPGVJtCG/TfwlMPoopGxhdyhYjFmDdmAMLlu3oSEc1dj
Own9MJ9IMlS9Ij7tdDusf6KKMfL/OcchNuURIE6TlS0TMCqjHqxo9K2jgqEtOqfK
JXka++t1dDRaVuFQosNFVZFxQMVNkdSgCQodJmyljLR6mZk2kdQDw3b9tOtRz7fe
7jpTYySjJglBsli6dpIGzGds4CHOqV2nR9oXT8gCBXsO+gKPmJEToz0YpggE7PGk
KjGw9MVaWKc98vysco7OiaMbouMtuJTdbDsSxhE1FWSoa6DfHtlFNC4Ak6nHWRQu
wCGh6+0yhA==
=FrFG
-----END PGP SIGNATURE-----
--- End Message ---
