On Wed, Jun 12, 2019 at 12:37:11AM +0200, Moritz Mühlenhoff wrote:
> On Mon, Jun 10, 2019 at 09:46:41PM -0700, tony mancill wrote:
> > I am not a member of the OpenJDK team and contributed far less to the
> > JDK 8 -> 11 transition than Emmanuel has.  If he and Matthias are in
> > agreement and the plan is palatable to the Release and Security Teams,
> > that's ideal.
> 
> I don't have any preference either, just adding my 2 cents here; with
> our buster release set to 6th of July and the next Oracle CPU set for
> July 16, we'll ship a non-GA release of Java for maybe two, at most three
> weeks (as buster-security will rebase to the next openjdk-11 following
> the CPU). I'm also fairly sure we've shipped non-GA releases for openjdk-8
> before?
> 
> In any case, whether we go with t-p-u or unblocking the sid version,
> we should fix a solution before the release and not ship buster with
> the unfixed issues from the April CPU :-)

Regarding t-p-u and/or unstable, a source package and build of
11.0.4+4+really11.0.3+7 can be found here:

  https://people.debian.org/~tmancill/openjdk-11/

The interdiff [1] between this build and the 11.0.3+7-5 discussed
previously in this thread and this build is small (as would be
expected).  The debdiff [2] against 11.0.4+4-1 is (predictably) huge, as
it reverts all of the 11.0.4 development.  The packaging changes against
unstable are also attached.

I have done some basic smoke-testing of the 11.0.4+4+really11.0.3+7
packages - e.g. running zookeeper and building a few packages that
depend on the JDK.  The version reported by JVM is:

> $ java -version
> openjdk version "11.0.3" 2019-04-16
> OpenJDK Runtime Environment (build 11.0.3+7-post-Debian-1)
> OpenJDK 64-Bit Server VM (build 11.0.3+7-post-Debian-1, mixed mode, sharing)

Note that the date reported is part of JDK.  Even the current version in
buster, which was uploaded in February, reports the future "GA" date:

> $ java -version
> openjdk version "11.0.3" 2019-04-16
> OpenJDK Runtime Environment (build 11.0.3+1-Debian-1)
> OpenJDK 64-Bit Server VM (build 11.0.3+1-Debian-1, mixed mode, sharing)

Decision time... :)

Thanks,
tony

[1] 
https://people.debian.org/~tmancill/openjdk-11/interdiff_buster_11.0.3+7+5_vs_11.0.4+4+really11.0.3+7-1.diff
[2] 
https://people.debian.org/~tmancill/openjdk-11/11.0.4+4-1.dsc_vs_11.0.4+4+really11.0.3+7-1.dsc.debdiff
diff --git a/debian/changelog b/debian/changelog
index af1e3ee8a..eeba772dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openjdk-11 (11.0.4+4+really11.0.3+7-1) unstable; urgency=medium
+
+  * Team upload.
+  * Revert upstream sources to GA release 11.0.3+7.
+  * Disable workaround_expand_exec_shield_cs_limit.diff and
+    hotspot-disable-exec-shield-workaround.diff patches
+  * No longer try to install jspawnhelper.
+
+ -- tony mancill <tmanc...@debian.org>  Mon, 10 Jun 2019 19:16:00 -0700
+
 openjdk-11 (11.0.4+4-1) unstable; urgency=medium
 
   * OpenJDK 11.0.4+4 build (early access).
diff --git a/debian/patches/series b/debian/patches/series
index 8d10621eb..d057ce0af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,7 @@ icedtea-override-redirect-compiz.diff
 libpcsclite-dlopen.diff
 jexec.diff
 default-jvm-cfg.diff
-workaround_expand_exec_shield_cs_limit.diff
+#workaround_expand_exec_shield_cs_limit.diff
 adlc-parser.diff
 multiple-pkcs11-library-init.diff
 s390x-thread-stack-size.diff
@@ -20,7 +20,7 @@ machine-flag.diff
 zero-x32.diff
 mips-sigset.diff
 # s390x-zEC12.diff
-hotspot-disable-exec-shield-workaround.diff
+#hotspot-disable-exec-shield-workaround.diff
 atk-wrapper-security.diff
 # java-access-bridge-security.diff
 # jdk-pulseaudio.diff
diff --git a/debian/rules b/debian/rules
index 0a12fba23..3ee4fc237 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,9 @@ else
 endif
 jvmver		= 1.11.0
 shortver	= 11
-v_upstream	:= $(shell echo $(PKGVERSION) | sed 's/-[^-][^-]*$$//')
+#v_upstream	:= $(shell echo $(PKGVERSION) | sed 's/-[^-][^-]*$$//')
+#v_pkgrel	:= $(shell echo $(PKGVERSION) | sed 's/^.*-//')
+v_upstream	:= 11.0.3+7
 v_pkgrel	:= $(shell echo $(PKGVERSION) | sed 's/^.*-//')
 # FIXME. currently v_upstream like 11~4
 v_upbase	:= $(word 1, $(subst +, , $(v_upstream)))
@@ -100,9 +102,9 @@ v_upbuild	:= $(word 2, $(subst +, , $(v_upstream)))
 #v_upbuild	:= $(word 2, $(subst ~, , $(v_upstream)))
 # that should be the package version ...
 
-ifneq ($(PKGVERSION),$(v_upbase)+$(v_upbuild)-$(v_pkgrel))
-  $(error wrong version: $(v_upbase)+$(v_upbuild)-$(v_pkgrel) should be: $(PKGVERSION))
-endif
+#ifneq ($(PKGVERSION),$(v_upbase)+$(v_upbuild)-$(v_pkgrel))
+#  $(error wrong version: $(v_upbase)+$(v_upbuild)-$(v_pkgrel) should be: $(PKGVERSION))
+#endif
 #ifneq ($(PKGVERSION),$(v_upbase)~$(v_upbuild)-$(v_pkgrel))
 #  $(error wrong version: $(v_upbase)~$(v_upbuild)-$(v_pkgrel) should be: $(PKGVERSION))
 #endif
@@ -1201,7 +1203,6 @@ endif
 	  echo '$(basedir)/lib/jli/libjli.so'; \
 	  echo '$(basedir)/lib/ct.sym'; \
 	  echo '$(basedir)/lib/jexec'; \
-	  echo '$(basedir)/lib/jspawnhelper'; \
 	  echo '$(basedir)/lib/jrt-fs.jar'; \
 	  echo '$(basedir)/release'; \
 	  echo '$(basedir)/lib/tzdb.dat'; \

Attachment: signature.asc
Description: PGP signature

Reply via email to