Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
icedtea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
icedtea
Commits
599498f7
Commit
599498f7
authored
Jan 17, 2024
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed GenerateCurrencyData in icedtea6
parent
d308e676
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
9 deletions
+29
-9
icedtea6-1.13.13-fixed.patch
icedtea6-1.13.13-fixed.patch
+29
-9
No files found.
icedtea6-1.13.13-fixed.patch
View file @
599498f7
diff -uNr icedtea6-1.13.13/Makefile.am icedtea6-1.13.13-fixed/Makefile.am
diff -uNr icedtea6-1.13.13/Makefile.am icedtea6-1.13.13-fixed/Makefile.am
--- icedtea6-1.13.13/Makefile.am 2017-01-05 06:52:49.112782727 +1030
--- icedtea6-1.13.13/Makefile.am 2017-01-05 06:52:49.112782727 +1030
+++ icedtea6-1.13.13-fixed/Makefile.am 202
3-08-14 16:08:43.842667889 +09
30
+++ icedtea6-1.13.13-fixed/Makefile.am 202
4-01-17 18:44:54.314284912 +10
30
@@ -345,6 +345,
8
@@
@@ -345,6 +345,
9
@@
patches/nomotif-6706121.patch \
patches/nomotif-6706121.patch \
patches/nomotif.patch \
patches/nomotif.patch \
patches/nomotif-mtoolkit.patch \
patches/nomotif-mtoolkit.patch \
+ patches/freetypecheck_fix.patch \
+ patches/freetypecheck_fix.patch \
+ patches/glibc-deprecated-sysctl.patch \
+ patches/glibc-deprecated-sysctl.patch \
+ patches/openjdk-fix_GenerateCurrencyData.patch \
patches/alt-jar.patch \
patches/alt-jar.patch \
patches/jdk-use-ssize_t.patch \
patches/jdk-use-ssize_t.patch \
patches/arch.patch \
patches/arch.patch \
@@ -621,7 +62
3
,8 @@
@@ -621,7 +62
4
,8 @@
patches/openjdk/6260348-pr3068.patch \
patches/openjdk/6260348-pr3068.patch \
patches/openjdk/6961123-pr2975.patch \
patches/openjdk/6961123-pr2975.patch \
patches/pr2800-missing_resources.patch \
patches/pr2800-missing_resources.patch \
...
@@ -22,17 +23,18 @@ diff -uNr icedtea6-1.13.13/Makefile.am icedtea6-1.13.13-fixed/Makefile.am
...
@@ -22,17 +23,18 @@ diff -uNr icedtea6-1.13.13/Makefile.am icedtea6-1.13.13-fixed/Makefile.am
ICEDTEA_PATCHES += \
ICEDTEA_PATCHES += \
diff -uNr icedtea6-1.13.13/Makefile.in icedtea6-1.13.13-fixed/Makefile.in
diff -uNr icedtea6-1.13.13/Makefile.in icedtea6-1.13.13-fixed/Makefile.in
--- icedtea6-1.13.13/Makefile.in 2017-01-05 06:53:00.576597287 +1030
--- icedtea6-1.13.13/Makefile.in 2017-01-05 06:53:00.576597287 +1030
+++ icedtea6-1.13.13-fixed/Makefile.in 202
3-08-14 16:09:03.778735026 +09
30
+++ icedtea6-1.13.13-fixed/Makefile.in 202
4-01-17 18:45:07.318009727 +10
30
@@ -793,6 +793,
8
@@
@@ -793,6 +793,
9
@@
patches/gcc-suffix.patch patches/libraries-splashscreen.patch \
patches/gcc-suffix.patch patches/libraries-splashscreen.patch \
patches/uname.patch patches/nomotif-6706121.patch \
patches/uname.patch patches/nomotif-6706121.patch \
patches/nomotif.patch patches/nomotif-mtoolkit.patch \
patches/nomotif.patch patches/nomotif-mtoolkit.patch \
+ patches/freetypecheck_fix.patch \
+ patches/freetypecheck_fix.patch \
+ patches/glibc-deprecated-sysctl.patch \
+ patches/glibc-deprecated-sysctl.patch \
+ patches/openjdk-fix_GenerateCurrencyData.patch \
patches/alt-jar.patch patches/jdk-use-ssize_t.patch \
patches/alt-jar.patch patches/jdk-use-ssize_t.patch \
patches/arch.patch patches/lc_ctype.patch patches/xjc.patch \
patches/arch.patch patches/lc_ctype.patch patches/xjc.patch \
patches/linker-libs-order.patch patches/testenv.patch \
patches/linker-libs-order.patch patches/testenv.patch \
@@ -1049,7 +105
1
,8 @@
@@ -1049,7 +105
2
,8 @@
patches/openjdk/6260348-pr3068.patch \
patches/openjdk/6260348-pr3068.patch \
patches/openjdk/6961123-pr2975.patch \
patches/openjdk/6961123-pr2975.patch \
patches/pr2800-missing_resources.patch \
patches/pr2800-missing_resources.patch \
...
@@ -44,7 +46,7 @@ diff -uNr icedtea6-1.13.13/Makefile.in icedtea6-1.13.13-fixed/Makefile.in
...
@@ -44,7 +46,7 @@ diff -uNr icedtea6-1.13.13/Makefile.in icedtea6-1.13.13-fixed/Makefile.in
$(am__append_28) $(am__append_29) $(am__append_30) \
$(am__append_28) $(am__append_29) $(am__append_30) \
diff -uNr icedtea6-1.13.13/patches/freetypecheck_fix.patch icedtea6-1.13.13-fixed/patches/freetypecheck_fix.patch
diff -uNr icedtea6-1.13.13/patches/freetypecheck_fix.patch icedtea6-1.13.13-fixed/patches/freetypecheck_fix.patch
--- icedtea6-1.13.13/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930
--- icedtea6-1.13.13/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea6-1.13.13-fixed/patches/freetypecheck_fix.patch 202
3-08-14 16:00:28.138998474 +09
30
+++ icedtea6-1.13.13-fixed/patches/freetypecheck_fix.patch 202
4-01-17 18:43:36.157938856 +10
30
@@ -0,0 +1,34 @@
@@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+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
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
...
@@ -82,7 +84,7 @@ diff -uNr icedtea6-1.13.13/patches/freetypecheck_fix.patch icedtea6-1.13.13-fixe
...
@@ -82,7 +84,7 @@ diff -uNr icedtea6-1.13.13/patches/freetypecheck_fix.patch icedtea6-1.13.13-fixe
+ # CUPS_HEADERS_PATH must be valid
+ # CUPS_HEADERS_PATH must be valid
diff -uNr icedtea6-1.13.13/patches/glibc-deprecated-sysctl.patch icedtea6-1.13.13-fixed/patches/glibc-deprecated-sysctl.patch
diff -uNr icedtea6-1.13.13/patches/glibc-deprecated-sysctl.patch icedtea6-1.13.13-fixed/patches/glibc-deprecated-sysctl.patch
--- icedtea6-1.13.13/patches/glibc-deprecated-sysctl.patch 1970-01-01 09:30:00.000000000 +0930
--- icedtea6-1.13.13/patches/glibc-deprecated-sysctl.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea6-1.13.13-fixed/patches/glibc-deprecated-sysctl.patch 202
3-08-14 16:04:59.209911381 +09
30
+++ icedtea6-1.13.13-fixed/patches/glibc-deprecated-sysctl.patch 202
4-01-17 18:43:36.159938814 +10
30
@@ -0,0 +1,22 @@
@@ -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
+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 2016-12-30 15:00:19.000000000 +1030
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2016-12-30 15:00:19.000000000 +1030
...
@@ -108,7 +110,7 @@ diff -uNr icedtea6-1.13.13/patches/glibc-deprecated-sysctl.patch icedtea6-1.13.1
...
@@ -108,7 +110,7 @@ diff -uNr icedtea6-1.13.13/patches/glibc-deprecated-sysctl.patch icedtea6-1.13.1
+ #include "jvm.h"
+ #include "jvm.h"
diff -uNr icedtea6-1.13.13/patches/linux_fork_fix.patch icedtea6-1.13.13-fixed/patches/linux_fork_fix.patch
diff -uNr icedtea6-1.13.13/patches/linux_fork_fix.patch icedtea6-1.13.13-fixed/patches/linux_fork_fix.patch
--- icedtea6-1.13.13/patches/linux_fork_fix.patch 1970-01-01 09:30:00.000000000 +0930
--- icedtea6-1.13.13/patches/linux_fork_fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea6-1.13.13-fixed/patches/linux_fork_fix.patch 202
3-08-14 16:00:28.138998474 +09
30
+++ icedtea6-1.13.13-fixed/patches/linux_fork_fix.patch 202
4-01-17 18:43:36.160938793 +10
30
@@ -0,0 +1,50 @@
@@ -0,0 +1,50 @@
+diff -uNr openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk-linux_fork_fix/hotspot/src/os/linux/vm/os_linux.cpp
+diff -uNr openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk-linux_fork_fix/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2016-12-30 15:01:06.000000000 +1030
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2016-12-30 15:01:06.000000000 +1030
...
@@ -160,3 +162,21 @@ diff -uNr icedtea6-1.13.13/patches/linux_fork_fix.patch icedtea6-1.13.13-fixed/p
...
@@ -160,3 +162,21 @@ diff -uNr icedtea6-1.13.13/patches/linux_fork_fix.patch icedtea6-1.13.13-fixed/p
+
+
+ // execve failed
+ // execve failed
+ _exit(-1);
+ _exit(-1);
diff -uNr icedtea6-1.13.13/patches/openjdk-fix_GenerateCurrencyData.patch icedtea6-1.13.13-fixed/patches/openjdk-fix_GenerateCurrencyData.patch
--- icedtea6-1.13.13/patches/openjdk-fix_GenerateCurrencyData.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea6-1.13.13-fixed/patches/openjdk-fix_GenerateCurrencyData.patch 2024-01-17 18:38:29.609421974 +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 2016-12-30 15:00:31.000000000 +1030
++++ openjdk-fix_GenerateCurrencyData/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2024-01-17 18:05:00.021945681 +1030
+@@ -281,8 +281,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;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment