Mercurial > hg > release > icedtea7-2.5
view fsg.sh.in @ 2795:de1a34f4a1a0
PR2390: Make elliptic curve removal optional
2015-07-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2390: Make elliptic curve removal
optional
* INSTALL:
Document --enable-non-nss-curves.
* Makefile.am:
(ICEDTEA_PATCHES): Only apply
the RH1022017 patch when non-NSS
curves are not enabled.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_NON_NSS_CURVES): New
macro to allow non-NSS curves to
be turned on.
* configure.ac:
Invoke IT_ENABLE_NON_NSS_CURVES.
* fsg.sh.in:
Don't alter the curve list when
non-NSS curves are enabled.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Fri, 17 Jul 2015 19:49:37 +0100 |
parents | 13b10ea1447c |
children |
line wrap: on
line source
#!/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 bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x) # PR146/S6713083 # Remove binaries rm -vf \ openjdk/jdk/test/sun/management/windows/revokeall.exe \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher rm -vf \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \ openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so rm -vf \ openjdk/jdk/test/java/util/Locale/data/deflocale.exe \ openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \ openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \ openjdk/jdk/test/java/util/Locale/data/deflocale.sh \ openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \ openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \ openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \ # Remove test sources with questionable license headers. rm -vf \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ openjdk/jdk/test/java/util/Locale/LocaleTest.java \ openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ openjdk/jdk/test/sun/text/resources/LocaleDataTest.java # Remove J2DBench sources, some of which have questionable license # headers. rm -rvf \ openjdk/jdk/src/share/demo/java2d/J2DBench # BEGIN Debian/Ubuntu additions # binary files rm -vf \ openjdk/jdk/test/sun/net/idn/nfscis.spp # TODO #$ find openjdk -name '*.jar' -o -name '*.class'|grep -v test # PR140, S6695776 # Also see patches/icedtea-jscheme.patch rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts # PR139, S6710791 rm -vf \ openjdk/hotspot/agent/kk/src/share/lib/maf-1_0.jar \ openjdk/hotspot/agent/kk/src/share/lib/jlfgr-1_0.jar \ # END Debian/Ubuntu additions 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 registration tests" rm -rvf openjdk/jdk/test/com/sun/servicetag 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 "Syncing EC list with NSS" patch -Np0 < @abs_top_srcdir@/patches/pr2124.patch fi