diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
--- icedtea-2.6.3.orig/Makefile.in 2015-11-13 07:59:43.238447031 +0100
+++ icedtea-2.6.3/Makefile.in 2015-12-30 23:44:40.378409714 +0100
@@ -635,7 +635,6 @@
STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
-CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar
STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar
FONTCONFIG_PATH = openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs
@@ -776,7 +775,7 @@
$(am__append_14) $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
-ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
+ICEDTEA_BOOT_PATCHES = patches/openadk.patch patches/boot/javafiles.patch \
patches/boot/corba-idlj.patch patches/boot/corba-no-gen.patch \
patches/boot/corba-orb.patch patches/boot/demos.patch \
patches/boot/fphexconstants.patch \
@@ -1489,7 +1488,7 @@
clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
clean-add-systemtap clean-add-systemtap-debug clean-add-nss clean-add-tzdata-support \
- clean-add-tzdata-support-debug clean-cryptocheck clean-policytool-@JAVA_VER@.desktop \
+ clean-add-tzdata-support-debug clean-policytool-@JAVA_VER@.desktop \
clean-jconsole-@JAVA_VER@.desktop
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
@@ -1522,8 +1521,7 @@
clean-add-systemtap-debug clean-add-systemtap-boot \
clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \
clean-add-tzdata-support-boot \
- clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
- clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
+ clean-add-archive clean-add-archive-debug clean-add-archive-boot \
clean-download-hotspot clean-download-corba clean-download-jaxp \
clean-download-jaxws clean-download-langtools clean-download-jdk clean-download-openjdk \
clean-extract-corba clean-extract-jaxp clean-extract-jaxws clean-extract-jdk \
@@ -2499,16 +2497,6 @@
fi
rm -f stamps/add-tzdata-support.stamp
-stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
- if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
- $(BUILD_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
- fi
- mkdir -p stamps
- touch $@
-
-clean-check-crypto:
- rm -f stamps/check-crypto.stamp
-
stamps/add-archive.stamp: stamps/icedtea.stamp
@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
@@ -2605,16 +2593,6 @@
fi
rm -f stamps/add-tzdata-support-debug.stamp
-stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
- if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \
- $(BUILD_DEBUG_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
- fi
- mkdir -p stamps
- touch $@
-
-clean-check-crypto-debug:
- rm -f stamps/check-crypto-debug.stamp
-
stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \
@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
@@ -2647,22 +2625,22 @@
stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \
- stamps/add-tzdata-support.stamp stamps/check-crypto.stamp stamps/add-archive.stamp \
+ stamps/add-tzdata-support.stamp stamps/add-archive.stamp \
stamps/split-debuginfo.stamp
mkdir -p stamps
touch $@
-clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive clean-split-debuginfo
+clean-icedtea-stage2: clean-add-jamvm clean-add-archive clean-split-debuginfo
rm -f stamps/icedtea-stage2.stamp
stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \
stamps/add-systemtap-debug.stamp stamps/add/tzdata-support-debug.stamp \
- stamps/check-crypto-debug.stamp stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp
+ stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp
mkdir -p stamps
touch $@
-clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug \
+clean-icedtea-debug-stage2: clean-add-jamvm-debug \
clean-add-archive-debug clean-split-debuginfo-debug
rm -f stamps/icedtea-debug-stage2.stamp
@@ -2727,16 +2705,6 @@
fi
rm -f stamps/add-tzdata-support-boot.stamp
-stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp
- if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \
- $(BUILD_BOOT_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BU
|