Resending it with a .patch extension so hopefully BTS will identify it
as an actual text/plain file.
On Thu, 28 Sep 2017 15:18:20 -0700
=?UTF-8?Q?Tiago_St=C3=BCrmer_Daitx?= <tda...@gmail.com> wrote:
> Please consider removing the jvm.cfg checks. OpenJDK 7, 8, and 9 have
> been shipping a default jvm.cfg for quite some time now and it is used
> when a jvm.cfg is not present in the /etc/<jvm> directory.
>
> Patch is attached.
>
>
> thanks
diff -Nru ca-certificates-java-20170531+nmu1/debian/changelog ca-certificates-java-20170531+nmu1.1/debian/changelog
--- ca-certificates-java-20170531+nmu1/debian/changelog 2017-06-15 11:33:00.000000000 -0400
+++ ca-certificates-java-20170531+nmu1.1/debian/changelog 2017-09-28 16:54:50.000000000 -0400
@@ -1,3 +1,11 @@
+ca-certificates-java (20170531+nmu1.1) UNRELEASED; urgency=medium
+
+ * Remove jvm.cfg temporary generation as openjdk-8 already ships with a
+ default jvm.cfg for cases wihere the one in /etc is missing or not yet
+ setup. Closes: #874434.
+
+ -- Tiago Stürmer Daitx <tiago.da...@ubuntu.com> Thu, 28 Sep 2017 20:54:50 +0000
+
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-20170531+nmu1.1/debian/jks-keystore.hook.in
--- ca-certificates-java-20170531+nmu1/debian/jks-keystore.hook.in 2017-05-31 08:39:26.000000000 -0400
+++ ca-certificates-java-20170531+nmu1.1/debian/jks-keystore.hook.in 2017-09-28 10:44:15.000000000 -0400
@@ -48,14 +48,6 @@
export JAVA_HOME=/usr/lib/jvm/$jvm
PATH=$JAVA_HOME/bin:$PATH
-temp_jvm_cfg=
-if [ ! -f /etc/${jvm%-$arch}/jvm-$arch.cfg ]; then
- # 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
-fi
-
if dpkg-query --version >/dev/null; then
nsspkg=$(dpkg-query -L "$(nsslib_name)" | sed -n 's,\(.*\)/libnss3\.so$,\1,p'|head -n 1)
nsscfg=/etc/${jvm%-$arch}/security/nss.cfg
@@ -71,7 +63,6 @@
do_cleanup()
{
- [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg
if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ]
then
rm -f $nssjdk/libnss3.so
diff -Nru ca-certificates-java-20170531+nmu1/debian/postinst.in ca-certificates-java-20170531+nmu1.1/debian/postinst.in
--- ca-certificates-java-20170531+nmu1/debian/postinst.in 2017-05-31 08:39:26.000000000 -0400
+++ ca-certificates-java-20170531+nmu1.1/debian/postinst.in 2017-09-28 10:43:16.000000000 -0400
@@ -72,7 +72,6 @@
do_cleanup()
{
- [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg
if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ]
then
rm -f $nssjdk/libnss3.so
@@ -95,14 +94,6 @@
exit 1
fi
- temp_jvm_cfg=
- if [ ! -f /etc/${jvm%-$arch}/jvm-$arch.cfg ]; then
- # 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
- fi
-
trap do_cleanup EXIT
first_install
fi
