RFR (S): 8217305: Missing 0 in java.dll file version cause issues with patch management software

[Andrew John Hughes]

On 12/03/2019 07:57, Kevin Walls wrote:
> Hi,
> 
> I'd like to get a review for an 8u fix for:
> 
> 8217305: Missing 0 in java.dll file version cause issues with patch
> management software
> JBS:https://bugs.openjdk.java.net/browse/JDK-8217305
> 
> Diff pasted below as it is a one-liner (plus regenerating
> common/autoconf/generated-configure.sh).
> 
> We need to correct the JDK_FVER setting in flags.m4, which dropped some
> use of "COOKED" version during a previous change. Important to change
> back as this is a regression, breaking the version format expected by
> some people and tools.
> 
> Low risk, manual testing.
> 
> Thanks
> Kevin
> 
> 
> bash-4.2$ hg diff
> diff -r 9da665f87c4b common/autoconf/flags.m4
> --- a/common/autoconf/flags.m4  Wed Oct 25 13:11:07 2017 -0700
> +++ b/common/autoconf/flags.m4  Mon Mar 11 15:48:15 2019 -0700
> @@ -111,7 +111,7 @@
>          -d
> \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\"
> \
>          -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
>          -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME)
> \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
> -        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if
> \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
> +        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if
> \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
> 
>    fi
>    AC_SUBST(RC_FLAGS)
> 
> diff -r 9da665f87c4b common/autoconf/generated-configure.sh
> --- a/common/autoconf/generated-configure.sh    Wed Oct 25 13:11:07 2017
> -0700
> +++ b/common/autoconf/generated-configure.sh    Mon Mar 11 15:48:15 2019
> -0700
> @@ -4358,7 +4358,7 @@
>  #CUSTOM_AUTOCONF_INCLUDE
> 
>  # Do not change or remove the following line, it is needed for
> consistency checks:
> -DATE_WHEN_GENERATED=1551441508
> +DATE_WHEN_GENERATED=1552344461
> 
>  ###############################################################################
> 
>  #
> @@ -40540,7 +40540,7 @@
>          -d
> \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\"
> \
>          -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
>          -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME)
> \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
> -        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if
> \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
> +        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if
> \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
> 
>    fi
> 
> 
> 

Looks good to me.

Thanks,
-- 
Andrew :)

Senior Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222
https://keybase.io/gnu_andrew