[8u] RFR: 8218780: Update MUSCLE PCSC-Lite header files

Andrew John Hughes gnu.andrew at redhat.com
Wed Aug 28 17:15:30 UTC 2019

On 26/08/2019 14:23, Severin Gehwolf wrote:
> Hi,
> Could I please get a review of this MUSCLE header files update in
> OpenJDK 8u? I'd like to backport this bug as it's also going to be in
> Oracle JDK 8u231 (equiv to OpenJDK 8u232) as well. The OpenJDK 11 patch
> applies almost cleanly post path-unshuffelling. Changes which didn't
> apply were a copyright header update in pcsc.c. I've omitted these.
> Bug: https://bugs.openjdk.java.net/browse/JDK-8218780
> webrev: http://cr.openjdk.java.net/~sgehwolf/webrevs/JDK-8218780/jdk8/01/webrev/
> JDK 11u changeset: https://hg.openjdk.java.net/jdk-updates/jdk11u-dev/rev/0bcc59a50c88
> There is going to be a follow-up fix adding back COPYING via 
> JDK-8226607 which I propose for backport to OpenJDK 8u as well.
> Testing: smartcardio sanity and build on Linux x86_64 (Fedora 30 and RHEL 6)
> Thanks to Aleksey Shipilev who helped test this patch.
> Thoughts?
> Thanks,
> Severin

Most of this looks good. I was a little confused at first because the
patch in your webrev looks quite different to the 11u changeset.
However, once applied locally to the 8u repo, the diff between the two
was as suggested and the PCSC library files (those in MUSCLE) were
identical. I don't know what webrev did in creating that patch.

The bit I don't understand is why you've decided to drop the copyright
header change on the floor. Just because the original in 8u has 2014,
while the original in 11u had 2015, does not make the change inapplicable.

A better alternative may actually be to backport JDK-8207233 [0] first
which is a nice little cleanup patch. I suspect this patch would then
apply cleanly as these PCSC files are rarely touched.

[0] https://bugs.openjdk.java.net/browse/JDK-8207233

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

More information about the jdk8u-dev mailing list