Bug#921997: stretch-pu: package ca-certificates-java/20170929~deb9u1

2019-02-11 Thread Andreas Beckmann
On 2019-02-11 12:43, Adam D. Barratt wrote:
> As long as the upload can happen today, please go ahead; thanks.

Done.

Andreas



Bug#921997: stretch-pu: package ca-certificates-java/20170929~deb9u1

2019-02-11 Thread Adam D. Barratt

Control: tags -1 + confirmed

On 2019-02-11 04:48, Andreas Beckmann wrote:

ca-certificates-java is uninstallable on armhf: #874276

The proposed patch has only been build-tested (on amd64), the resulting
(arch:all) package has *not* been tested on armhf at all.
But it does not look like it could make the situation worse.
The package has *not* been uploaded, waiting for an explicit ACK.


As long as the upload can happen today, please go ahead; thanks.

(I'm aware that the solution in question was disapproved of by the 
OpenJDK maintainers, but this is the obvious least-change option for 
stable and we don't really want to be waiting on an OpenJDK upload / 
rebuild to include the relevant change there.)


Regards,

Adam



Bug#921997: stretch-pu: package ca-certificates-java/20170929~deb9u1

2019-02-10 Thread Andreas Beckmann
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@packages.debian.org
Usertags: pu
Control: block 921748 with -1

Hi,

ca-certificates-java is uninstallable on armhf: #874276

The proposed patch has only been build-tested (on amd64), the resulting
(arch:all) package has *not* been tested on armhf at all.
But it does not look like it could make the situation worse.
The package has *not* been uploaded, waiting for an explicit ACK.


Andreas
diff -Nru ca-certificates-java-20170531+nmu1/debian/changelog 
ca-certificates-java-20170929~deb9u1/debian/changelog
--- ca-certificates-java-20170531+nmu1/debian/changelog 2017-06-15 
17:33:00.0 +0200
+++ ca-certificates-java-20170929~deb9u1/debian/changelog   2019-02-11 
05:34:52.0 +0100
@@ -1,3 +1,21 @@
+ca-certificates-java (20170929~deb9u1) stretch; urgency=medium
+
+  * Rebuild for stretch.
+
+ -- Andreas Beckmann   Mon, 11 Feb 2019 05:34:52 +0100
+
+ca-certificates-java (20170929) unstable; urgency=low
+
+  [ Gianfranco Costamagna ]
+  * Team upload.
+  * Ack previous NMU, thanks
+
+  [ Rico Tzschichholz ]
+  * Fix temporary jvm-*.cfg generation on armhf (Closes: #874276)
+- the armhf installation path is different from other architectures.
+
+ -- Rico Tzschichholz   Wed, 27 Sep 2017 17:17:59 +0200
+
 ca-certificates-java (20170531+nmu1) unstable; urgency=high
 
   * Non-maintainer upload.
diff -Nru ca-certificates-java-20170531+nmu1/debian/jks-keystore.hook.in 
ca-certificates-java-20170929~deb9u1/debian/jks-keystore.hook.in
--- ca-certificates-java-20170531+nmu1/debian/jks-keystore.hook.in  
2017-05-31 14:39:26.0 +0200
+++ ca-certificates-java-20170929~deb9u1/debian/jks-keystore.hook.in
2017-09-27 17:17:59.0 +0200
@@ -53,7 +53,11 @@
 # the jre is not yet configured, but jvm.cfg is needed to run it
 temp_jvm_cfg=/etc/${jvm%-$arch}/jvm-$arch.cfg
 mkdir -p /etc/${jvm%-$arch}
-printf -- "-server KNOWN\n" > $temp_jvm_cfg
+if [ "$arch" == "armhf" ]; then
+printf -- "-client KNOWN\n-server ALIASED_TO -client\n" > $temp_jvm_cfg
+else
+printf -- "-server KNOWN\n" > $temp_jvm_cfg
+fi
 fi
 
 if dpkg-query --version >/dev/null; then
diff -Nru ca-certificates-java-20170531+nmu1/debian/postinst.in 
ca-certificates-java-20170929~deb9u1/debian/postinst.in
--- ca-certificates-java-20170531+nmu1/debian/postinst.in   2017-05-31 
14:39:26.0 +0200
+++ ca-certificates-java-20170929~deb9u1/debian/postinst.in 2017-09-27 
17:17:59.0 +0200
@@ -100,7 +100,11 @@
 # the jre is not yet configured, but jvm.cfg is needed to run 
it
 temp_jvm_cfg=/etc/${jvm%-$arch}/jvm-$arch.cfg
 mkdir -p /etc/${jvm%-$arch}
-printf -- "-server KNOWN\n" > $temp_jvm_cfg
+if [ "$arch" == "armhf" ]; then
+   printf -- "-client KNOWN\n-server ALIASED_TO -client\n" 
> $temp_jvm_cfg
+else
+   printf -- "-server KNOWN\n" > $temp_jvm_cfg
+fi
 fi
 
 trap do_cleanup EXIT