PR3679: Use the internal copy of the SunEC library rather than statically linking against NSS 2019-01-08 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3679: Use the internal copy of the SunEC library rather than statically linking against NSS * patches/disable-intree-ec.patch: Removed. * patches/nss-config.patch: Removed. * patches/nss-not-enabled-config.patch: Removed. * patches/nss-not-enabled-config-with-sunec.patch: Renamed to patches/pkcs11-nss-not-enabled-config.patch. * patches/nss-config-with-sunec.patch: Renamed to patches/pkcs11-nss-config.patch. * INSTALL: Remove --enable-sunec option. Update documentation to match current situation with SunEC. * Makefile.am: (ICEDTEA_PATCHES): Remove disable-intree-ec.patch. Remove PKCS11 config patches without the SunEC provider. Rename remaining two to make it clear they are for the PKCS11 provider. (ICEDTEA_CONFIGURE): Remove use of system-nss option which no longer exists, following PR3679. (ICEDTEA_ENV): Remove NSS_LIBS and NSS_CFLAGS. (check-ecc): Argument passed to the test should now be "yes". * NEWS: Updated. * acinclude.m4: (IT_ENABLE_SUNEC): Removed. * configure.ac: Replace IT_ENABLE_SUNEC call with IT_LOCATE_NSS. * fsg.sh.in: Remove unused source code and use new PR3679 patch instead of old PR2126 patch which only alters Java code. * patches/pr3679.patch: Renamed from patches/pr2126.patch, updated to OpenJDK 9 paths and extended to patch native code. * patches/rh1022017.patch: Updated to OpenJDK 9 paths. * remove-intree-libraries.sh.in: Drop conditional removal of SunEC code.

#!/bin/sh

echo "Further liberating OpenJDK..."

# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
# Sx denotes bug x in the Sun/Oracle bug database (https://bugs.openjdk.java.net/browse/JDK-X)

echo "Removing support for proprietary SNMP plug"
rm -rvf openjdk/jdk/src/share/classes/sun/management/snmp
rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
rm -rvf openjdk/jdk/test/com/sun/jmx/snmp

echo "Removing EC source code we don't build"
rm -rvf openjdk/jdk/src/share/native/sun/security/ec/impl

if test "x@ENABLE_NON_NSS_CURVES@" = "xno"; then
  echo "Removing non-NSS ECC curves"
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2.h
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_163.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_193.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_233.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_aff.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_mont.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ecp_192.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ecp_224.c
  patch -Np0 < @abs_top_srcdir@/patches/pr3679.patch
fi