Skip to content

GitLab

I
icedtea
Commit 0a09534e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fixed GenerateCurrencyData in icedtea7

parent 599498f7
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 17 deletions
icedtea-2.6.10-fixed.patch
View file @ 0a09534e
diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure
--- icedtea-2.6.10/configure 2017-05-17 12:48:59.353452900 +0930
+++ icedtea-2.6.10-fixed/configure 2023-08-15 13:39:41.588036682 +0930
+++ icedtea-2.6.10-fixed/configure 2024-01-18 15:41:01.177672233 +1030
@@ -15851,7 +15851,7 @@
fi
done
......@@ -21,31 +21,31 @@ diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure
done
diff -uNr icedtea-2.6.10/Makefile.am icedtea-2.6.10-fixed/Makefile.am
--- icedtea-2.6.10/Makefile.am 2017-05-17 12:48:00.046401098 +0930
+++ icedtea-2.6.10-fixed/Makefile.am 2023-08-15 13:48:06.572034401 +0930
+++ icedtea-2.6.10-fixed/Makefile.am 2024-01-18 15:50:14.608044670 +1030
@@ -372,7 +372,7 @@
# Patch list
-ICEDTEA_PATCHES =
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch patches/sharedRuntime_aarch64-fix.patch
# Conditional patches
diff -uNr icedtea-2.6.10/Makefile.in icedtea-2.6.10-fixed/Makefile.in
--- icedtea-2.6.10/Makefile.in 2017-05-17 12:49:00.769430260 +0930
+++ icedtea-2.6.10-fixed/Makefile.in 2023-08-15 13:48:19.695060329 +0930
+++ icedtea-2.6.10-fixed/Makefile.in 2024-01-18 15:50:27.907765231 +1030
@@ -786,7 +786,7 @@
MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
# Patch list
-ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch patches/sharedRuntime_aarch64-fix.patch $(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11) $(am__append_12) $(am__append_13) \
$(am__append_14) $(DISTRIBUTION_PATCHES)
diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.10/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch 2023-08-15 13:39:41.589036684 +0930
+++ icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch 2024-01-18 15:41:01.182672128 +1030
@@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
......@@ -83,7 +83,7 @@ diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/pa
+ # CUPS_HEADERS_PATH must be valid
diff -uNr icedtea-2.6.10/patches/glibc-deprecated-sysctl.patch icedtea-2.6.10-fixed/patches/glibc-deprecated-sysctl.patch
--- icedtea-2.6.10/patches/glibc-deprecated-sysctl.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/glibc-deprecated-sysctl.patch 2023-08-15 13:46:07.440799031 +0930
+++ icedtea-2.6.10-fixed/patches/glibc-deprecated-sysctl.patch 2024-01-18 15:41:01.182672128 +1030
@@ -0,0 +1,22 @@
+diff -uNr openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk.fixed/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-05-03 12:20:28.000000000 +0930
......@@ -109,7 +109,7 @@ diff -uNr icedtea-2.6.10/patches/glibc-deprecated-sysctl.patch icedtea-2.6.10-fi
+ #include "jvm.h"
diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.10/patches/jdk-fixed_xattr.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch 2023-08-15 13:39:41.589036684 +0930
+++ icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch 2024-01-18 15:41:01.182672128 +1030
@@ -0,0 +1,12 @@
+diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930
......@@ -123,9 +123,27 @@ diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patc
+ #else
+ #include <syscalls_fp.h>
+ #endif
diff -uNr icedtea-2.6.10/patches/jdk-fix_GenerateCurrencyData.patch icedtea-2.6.10-fixed/patches/jdk-fix_GenerateCurrencyData.patch
--- icedtea-2.6.10/patches/jdk-fix_GenerateCurrencyData.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/jdk-fix_GenerateCurrencyData.patch 2024-01-18 15:49:03.375541262 +1030
@@ -0,0 +1,14 @@
+diff -uNr openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk-fix_GenerateCurrencyData/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
+--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2017-05-03 12:20:28.000000000 +0930
++++ openjdk.fixed/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2024-01-18 15:37:02.602656803 +1030
+@@ -283,8 +283,8 @@
+ checkCurrencyCode(newCurrency);
+ String timeString = currencyInfo.substring(4, length - 4);
+ long time = format.parse(timeString).getTime();
+- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+- throw new RuntimeException("time is more than 10 years from present: " + time);
++ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
++ throw new RuntimeException("time is more than 20 years from present: " + time);
+ }
+ specialCaseCutOverTimes[specialCaseCount] = time;
+ specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
diff -uNr icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch
--- icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch 2023-08-15 13:39:41.589036684 +0930
+++ icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch 2024-01-18 15:41:01.183672107 +1030
@@ -0,0 +1,14 @@
+diff -uNr openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp 2017-05-03 02:50:28.000000000 +0000
......
icedtea-2.6.25-fixed.patch
View file @ 0a09534e
diff -uNr icedtea-2.6.25/configure icedtea-2.6.25-fixed/configure
--- icedtea-2.6.25/configure 2021-02-12 14:42:53.012788536 +1030
+++ icedtea-2.6.25-fixed/configure 2023-08-16 07:30:55.936652600 +0930
+++ icedtea-2.6.25-fixed/configure 2024-01-18 15:58:48.458252504 +1030
@@ -16089,7 +16089,7 @@
fi
done
......@@ -21,32 +21,32 @@ diff -uNr icedtea-2.6.25/configure icedtea-2.6.25-fixed/configure
done
diff -uNr icedtea-2.6.25/Makefile.am icedtea-2.6.25-fixed/Makefile.am
--- icedtea-2.6.25/Makefile.am 2021-02-12 14:41:14.067670731 +1030
+++ icedtea-2.6.25-fixed/Makefile.am 2023-08-16 07:33:48.741208740 +0930
+++ icedtea-2.6.25-fixed/Makefile.am 2024-01-18 16:00:36.393991087 +1030
@@ -369,7 +369,7 @@
# Patch list
-ICEDTEA_PATCHES =
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch
# Conditional patches
diff -uNr icedtea-2.6.25/Makefile.in icedtea-2.6.25-fixed/Makefile.in
--- icedtea-2.6.25/Makefile.in 2021-02-12 14:42:54.507805425 +1030
+++ icedtea-2.6.25-fixed/Makefile.in 2023-08-16 07:34:04.917260802 +0930
+++ icedtea-2.6.25-fixed/Makefile.in 2024-01-18 16:00:53.274637412 +1030
@@ -788,7 +788,8 @@
MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
# Patch list
-ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch \
+ $(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11) $(am__append_12) $(am__append_13) \
$(DISTRIBUTION_PATCHES)
diff -uNr icedtea-2.6.25/patches/freetypecheck_fix.patch icedtea-2.6.25-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.25/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/freetypecheck_fix.patch 2023-08-16 07:30:55.937652603 +0930
+++ icedtea-2.6.25-fixed/patches/freetypecheck_fix.patch 2024-01-18 15:58:48.468252294 +1030
@@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
......@@ -84,7 +84,7 @@ diff -uNr icedtea-2.6.25/patches/freetypecheck_fix.patch icedtea-2.6.25-fixed/pa
+ # CUPS_HEADERS_PATH must be valid
diff -uNr icedtea-2.6.25/patches/glibc-deprecated-sysctl.patch icedtea-2.6.25-fixed/patches/glibc-deprecated-sysctl.patch
--- icedtea-2.6.25/patches/glibc-deprecated-sysctl.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/glibc-deprecated-sysctl.patch 2023-08-16 07:30:55.938652606 +0930
+++ icedtea-2.6.25-fixed/patches/glibc-deprecated-sysctl.patch 2024-01-18 15:58:48.469252273 +1030
@@ -0,0 +1,22 @@
+diff -uNr openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk.fixed/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2021-02-10 16:22:36.000000000 +1030
......@@ -110,7 +110,7 @@ diff -uNr icedtea-2.6.25/patches/glibc-deprecated-sysctl.patch icedtea-2.6.25-fi
+ #include "jvm.h"
diff -uNr icedtea-2.6.25/patches/jdk-fixed_xattr.patch icedtea-2.6.25-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.25/patches/jdk-fixed_xattr.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/jdk-fixed_xattr.patch 2023-08-16 07:30:55.938652606 +0930
+++ icedtea-2.6.25-fixed/patches/jdk-fixed_xattr.patch 2024-01-18 15:58:48.470252252 +1030
@@ -0,0 +1,12 @@
+diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930
......@@ -124,3 +124,21 @@ diff -uNr icedtea-2.6.25/patches/jdk-fixed_xattr.patch icedtea-2.6.25-fixed/patc
+ #else
+ #include <syscalls_fp.h>
+ #endif
diff -uNr icedtea-2.6.25/patches/jdk-fix_GenerateCurrencyData.patch icedtea-2.6.25-fixed/patches/jdk-fix_GenerateCurrencyData.patch
--- icedtea-2.6.25/patches/jdk-fix_GenerateCurrencyData.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/jdk-fix_GenerateCurrencyData.patch 2024-01-18 15:58:02.278220055 +1030
@@ -0,0 +1,14 @@
+diff -uNr openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk.fixed/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
+--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2021-02-10 16:22:36.000000000 +1030
++++ openjdk.fixed/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2024-01-18 15:56:33.984073994 +1030
+@@ -283,8 +283,8 @@
+ checkCurrencyCode(newCurrency);
+ String timeString = currencyInfo.substring(4, length - 4);
+ long time = format.parse(timeString).getTime();
+- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+- throw new RuntimeException("time is more than 10 years from present: " + time);
++ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
++ throw new RuntimeException("time is more than 20 years from present: " + time);
+ }
+ specialCaseCutOverTimes[specialCaseCount] = time;
+ specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment