summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
authorAlex Gonzalez <alex.gonzalez@digi.com>2014-12-31 16:24:46 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2014-12-31 19:20:11 -0200
commita7461bf7393c516c63c49a4b099d659ee467e93e (patch)
tree532a1658d6138989ceabf6f51e4132401d33e3c8 /recipes-core/openjdk
parentab51e51d9a9a51bedd19de09bcba4ce830dfc5e7 (diff)
downloadmeta-java-a7461bf7393c516c63c49a4b099d659ee467e93e.tar.gz
openjdk: Remove currency data generation expiration date.
The currency data generation class makes a 10 years expiration date check. It might be reasonable to make sure the input data is updated periodically, but on an embedded system we don't want to have this type of built in time expirations. This commit removes the date expiration check. Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-openjdk-remove-currency-data-generation-expi.patch25
-rw-r--r--recipes-core/openjdk/openjdk-7-release-25b30.inc2
2 files changed, 27 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-openjdk-remove-currency-data-generation-expi.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-openjdk-remove-currency-data-generation-expi.patch
new file mode 100644
index 0000000..6dd36af
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-openjdk-remove-currency-data-generation-expi.patch
@@ -0,0 +1,25 @@
1From 7df2fd1014a0c31f518be4f6a0018533f469d584 Mon Sep 17 00:00:00 2001
2From: Alex Gonzalez <alex.gonzalez@digi.com>
3Date: Wed, 31 Dec 2014 16:07:32 +0100
4Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration
5 date
6
7Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
8---
9 .../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 ---
10 1 file changed, 3 deletions(-)
11
12diff --git openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
13index bf335fa22c1d..0e421360fef9 100644
14--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
15+++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
16@@ -281,9 +281,6 @@ public class GenerateCurrencyData {
17 checkCurrencyCode(newCurrency);
18 String timeString = currencyInfo.substring(4, length - 4);
19 long time = format.parse(timeString).getTime();
20- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
21- throw new RuntimeException("time is more than 10 years from present: " + time);
22- }
23 specialCaseCutOverTimes[specialCaseCount] = time;
24 specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
25 specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency);
diff --git a/recipes-core/openjdk/openjdk-7-release-25b30.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc
index ccb6381..3b7d84e 100644
--- a/recipes-core/openjdk/openjdk-7-release-25b30.inc
+++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc
@@ -80,6 +80,7 @@ ICEDTEAPATCHES = "\
80 file://icedtea-zero-hotspotfix.patch;apply=no \ 80 file://icedtea-zero-hotspotfix.patch;apply=no \
81 file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ 81 file://icedtea-jdk-nio-use-host-cc.patch;apply=no \
82 file://icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch;apply=no \ 82 file://icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch;apply=no \
83 file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no \
83 " 84 "
84ICEDTEAPATCHES_append_powerpc = " \ 85ICEDTEAPATCHES_append_powerpc = " \
85 file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ 86 file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \
@@ -110,6 +111,7 @@ DISTRIBUTION_PATCHES = "\
110 patches/icedtea-zero-hotspotfix.patch \ 111 patches/icedtea-zero-hotspotfix.patch \
111 patches/icedtea-jdk-nio-use-host-cc.patch \ 112 patches/icedtea-jdk-nio-use-host-cc.patch \
112 patches/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch \ 113 patches/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch \
114 patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \
113 " 115 "
114 116
115DISTRIBUTION_PATCHES_append_libc-uclibc = "\ 117DISTRIBUTION_PATCHES_append_libc-uclibc = "\