|
|
60df80 |
#!/bin/sh
|
|
|
60df80 |
|
|
|
60df80 |
if [ "x$1" = "xhelp" ] ; then
|
|
|
60df80 |
echo "PR2124 - the path to the PR2124 patch to apply (optional; downloaded if unavailable)"
|
|
|
60df80 |
exit 1;
|
|
|
60df80 |
fi
|
|
|
60df80 |
|
|
|
60df80 |
if [ "x${TMPDIR}" = "x" ]; then
|
|
|
60df80 |
echo "Using default temporary directory of /tmp";
|
|
|
60df80 |
TMPDIR=/tmp
|
|
|
60df80 |
fi
|
|
|
60df80 |
|
|
|
60df80 |
echo "Further liberating OpenJDK..."
|
|
|
60df80 |
|
|
|
60df80 |
# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
|
|
|
60df80 |
# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
|
|
|
60df80 |
|
|
|
60df80 |
# PR146/S6713083
|
|
|
60df80 |
# Remove binaries
|
|
|
60df80 |
rm -vf \
|
|
|
60df80 |
openjdk/jdk/test/sun/management/windows/revokeall.exe \
|
|
|
60df80 |
openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
|
|
|
60df80 |
openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
|
|
|
60df80 |
openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
|
|
|
60df80 |
|
|
|
60df80 |
rm -vf \
|
|
|
60df80 |
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
|
|
|
60df80 |
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
|
|
|
60df80 |
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
|
|
|
60df80 |
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
|
|
|
60df80 |
openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
|
|
|
60df80 |
openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
|
|
|
60df80 |
openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
|
|
|
60df80 |
openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
|
|
|
60df80 |
openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
|
|
|
60df80 |
openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
|
|
|
60df80 |
|
|
|
60df80 |
rm -vf \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
|
|
|
60df80 |
|
|
|
60df80 |
# Remove test sources with questionable license headers.
|
|
|
60df80 |
rm -vf \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/LocaleTest.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
|
|
|
60df80 |
openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
|
|
|
60df80 |
openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
|
|
|
60df80 |
|
|
|
60df80 |
# Remove J2DBench sources, some of which have questionable license
|
|
|
60df80 |
# headers.
|
|
|
60df80 |
rm -rvf \
|
|
|
60df80 |
openjdk/jdk/src/share/demo/java2d/J2DBench
|
|
|
60df80 |
|
|
|
60df80 |
# BEGIN Debian/Ubuntu additions
|
|
|
60df80 |
|
|
|
60df80 |
# binary files
|
|
|
60df80 |
rm -vf \
|
|
|
60df80 |
openjdk/jdk/test/sun/net/idn/nfscis.spp
|
|
|
60df80 |
|
|
|
60df80 |
# TODO
|
|
|
60df80 |
#$ find openjdk -name '*.jar' -o -name '*.class'|grep -v test
|
|
|
60df80 |
|
|
|
60df80 |
# PR140, S6695776
|
|
|
60df80 |
# Also see patches/icedtea-jscheme.patch
|
|
|
60df80 |
rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib
|
|
|
60df80 |
rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts
|
|
|
60df80 |
|
|
|
60df80 |
# PR139, S6710791
|
|
|
60df80 |
rm -vf \
|
|
|
60df80 |
openjdk/hotspot/agent/kk/src/share/lib/maf-1_0.jar \
|
|
|
60df80 |
openjdk/hotspot/agent/kk/src/share/lib/jlfgr-1_0.jar \
|
|
|
60df80 |
|
|
|
60df80 |
# END Debian/Ubuntu additions
|
|
|
60df80 |
|
|
|
60df80 |
echo "Removing support for proprietary SNMP plug"
|
|
|
60df80 |
rm -rvf openjdk/jdk/src/share/classes/sun/management/snmp
|
|
|
60df80 |
rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
|
|
|
60df80 |
rm -rvf openjdk/jdk/test/com/sun/jmx/snmp
|
|
|
60df80 |
|
|
|
60df80 |
echo "Removing registration tests"
|
|
|
60df80 |
rm -rvf openjdk/jdk/test/com/sun/servicetag
|
|
|
60df80 |
|
|
|
60df80 |
echo "Removing EC source code we don't build"
|
|
|
60df80 |
rm -rvf openjdk/jdk/src/share/native/sun/security/ec/impl
|
|
|
60df80 |
|
|
|
60df80 |
# Requires IcedTea patch PR2124 (not included)
|
|
|
60df80 |
echo "Syncing EC list with NSS"
|
|
|
60df80 |
if [ "x$PR2124" = "x" ] ; then
|
|
|
60df80 |
# get pr2124.patch (from http://icedtea.classpath.org//hg/icedtea7)
|
|
|
60df80 |
# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2124)
|
|
|
60df80 |
TMPPR2124=${TMPDIR}/pr2124.patch
|
|
|
60df80 |
PR2124=${TMPPR2124}
|
|
|
60df80 |
wget -O ${PR2124} http://icedtea.classpath.org/hg/icedtea7/raw-file/tip/patches/pr2124.patch
|
|
|
60df80 |
fi
|
|
|
60df80 |
echo "Applying ${PR2124}"
|
|
|
60df80 |
if ! patch -Np0 < ${PR2124} ; then
|
|
|
60df80 |
echo "Patching failed.";
|
|
|
60df80 |
exit 1;
|
|
|
60df80 |
fi
|
|
|
60df80 |
echo "Cleaning up after patch application..."
|
|
|
60df80 |
find . -name '*.orig' | xargs rm -vf
|
|
|
60df80 |
if [ "x$TMPPR2124" != "x" ] ; then
|
|
|
60df80 |
rm -vf ${TMPPR2124}
|
|
|
60df80 |
fi
|
|
|
60df80 |
|