From 0daeec1a66c561d128c25fb927642769d843ef22 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: May 30 2023 03:08:57 +0000 Subject: Initial import after unretirement --- diff --git a/.gitignore b/.gitignore index d3416e7..de32bf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,48 +1 @@ -/icedtea-web-1.0.2.tar.gz -/icedtea-web-1.0.3.tar.gz -/icedtea-web-1.0.4.tar.gz -/icedtea-web-1.1.1.tar.gz -/icedtea-web-1.1.2.tar.gz -/icedtea-web-1.1.4.tar.gz -/icedtea-web-1.2.tar.gz -/icedtea-web-1.2.1.tar.gz -/icedtea-web-1.3.tar.gz -/icedtea-web-1.3.1.tar.gz -/icedtea-web-1.3.2.tar.gz -/icedtea-web-1.4.tar.gz -/icedtea-web-1.4.1.tar.gz -/icedtea-web-1.4.2.tar.gz -/icedtea-web-1.5pre01.tar.gz -/icedtea-web-1.5pre02.tar.gz -/icedtea-web-1.5pre03.tar.gz -/icedtea-web-1.5pre04.tar.gz -/icedtea-web-1.5pre05.tar.gz -/icedtea-web-1.5.tar.gz -/icedtea-web-1.5.1.tar.gz -/icedtea-web-1.5.2.tar.gz -/icedtea-web-1.6pre01.tar.gz -/icedtea-web-1.6pre02.tar.gz -/icedtea-web-1.6pre03.tar.gz -/icedtea-web-1.6pre04.tar.gz -/icedtea-web-1.6pre05.tar.gz -/icedtea-web-1.6pre06.tar.gz -/icedtea-web-1.6.tar.gz -/icedtea-web-1.6.1.tar.gz -/icedtea-web-1.6.2pre.tar.gz -/icedtea-web-1.6.2.tar.gz -/icedtea-web-1.7pre.tar.gz -/icedtea-web-1.7pre-RC01.tar.gz -/icedtea-web-1.7pre-RC02.tar.gz -/icedtea-web-1.7pre-RC03.tar.gz -/icedtea-web-1.7pre-RC04.tar.gz -/icedtea-web-1.7pre-RC05.tar.gz -/icedtea-web-1.7pre-RC06.tar.gz -/icedtea-web-1.7.tar.gz -/icedtea-web-1.7.1.tar.gz -/icedtea-web-1.8pre.tar.gz -/icedtea-web-1.8.tar.gz -/icedtea-web-1.8.2.tar.gz -/icedtea-web-2.0.0-alpha13.tar.gz -/icedtea-web-2.0.0-pre.0.alpha13.patched1.tar.xz -/icedtea-web-2.0.0-pre.0.alpha13.patched2.tar.xz.tar.xz -/icedtea-web-2.0.0-alpha16.tar.gz +/icedtea-web-*.tar.* diff --git a/altjava.patch b/altjava.patch deleted file mode 100644 index 400060e..0000000 --- a/altjava.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- icedtea-web-master/launchers/shell-launcher/launchers.sh.in -+++ icedtea-web-master/launchers/shell-launcher/launchers.sh.in -@@ -193,6 +193,12 @@ - shift - done - -+java_dir="`dirname ${JAVA}`" -+alt_java="alt-java" -+if [ -e "$java_dir/$alt_java" ] ; then -+ JAVA="`dirname ${JAVA}`/$alt_java" -+fi -+ - # TODO: inline args without using COMMAND[array] to unify linux/windows scripts - k=0 - COMMAND[k]="${JAVA}" ---- icedtea-web-master/launchers/rust-launcher/src/os_access.rs -+++ icedtea-web-master/launchers/rust-launcher/src/os_access.rs -@@ -5,9 +5,19 @@ - use log_helper; - - pub fn create_java_cmd(os: &Os,jre_dir: &std::path::PathBuf, args: &Vec) -> std::process::Command { -- let mut bin_java = jre_dir.clone(); -- bin_java.push("bin"); -- bin_java.push("java"); -+ let mut alt_bin_java = jre_dir.clone(); -+ alt_bin_java.push("bin"); -+ alt_bin_java.push("alt-java"); -+ let mut bin_java; -+ if alt_bin_java.exists() { -+ os.log("itw-rust-debug: alt-java found"); -+ bin_java = alt_bin_java; -+ } else { -+ os.log("itw-rust-debug: alt-java NOT found"); -+ bin_java = jre_dir.clone(); -+ bin_java.push("bin"); -+ bin_java.push("java"); -+ } - let mut cmd = std::process::Command::new(&bin_java); - for ar in args.into_iter() { - cmd.arg(ar); diff --git a/icedtea-web-1.8.8-alt-java.patch b/icedtea-web-1.8.8-alt-java.patch new file mode 100644 index 0000000..73ad483 --- /dev/null +++ b/icedtea-web-1.8.8-alt-java.patch @@ -0,0 +1,44 @@ +https://access.redhat.com/documentation/en-us/openjdk/11/html/using_alt-java + +--- icedtea-web-1.8.8/rust-launcher/src/os_access.rs 2021-10-27 22:13:18.000000000 +0200 ++++ icedtea-web-1.8.8/rust-launcher/src/os_access.rs.alt-java 2023-04-23 00:57:00.189483248 +0200 +@@ -5,9 +5,20 @@ + use log_helper; + + pub fn create_java_cmd(os: &Os,jre_dir: &std::path::PathBuf, args: &Vec) -> std::process::Command { +- let mut bin_java = jre_dir.clone(); +- bin_java.push("bin"); +- bin_java.push("java"); ++ // Support for alt-java(1) (same as java(1) except for CVE-2018-3639 mitigation) ++ let mut alt_bin_java = jre_dir.clone(); ++ alt_bin_java.push("bin"); ++ alt_bin_java.push("alt-java"); ++ let mut bin_java; ++ if alt_bin_java.exists() { ++ os.log("itw-rust-debug: alt-java found"); ++ bin_java = alt_bin_java; ++ } else { ++ os.log("itw-rust-debug: alt-java NOT found"); ++ bin_java = jre_dir.clone(); ++ bin_java.push("bin"); ++ bin_java.push("java"); ++ } + let mut cmd = std::process::Command::new(&bin_java); + for ar in args.into_iter() { + cmd.arg(ar); +--- icedtea-web-1.8.8/shell-launcher/launchers.sh.in 2021-10-27 22:13:18.000000000 +0200 ++++ icedtea-web-1.8.8/shell-launcher/launchers.sh.in.alt-java 2023-04-23 00:55:23.484860554 +0200 +@@ -137,6 +137,13 @@ + shift + done + ++# Support for alt-java(1) (same as java(1) except for CVE-2018-3639 mitigation) ++java_dir="`dirname ${JAVA}`" ++alt_java="alt-java" ++if [ -e "$java_dir/$alt_java" ] ; then ++ JAVA="`dirname ${JAVA}`/$alt_java" ++fi ++ + # TODO: inline args without using COMMAND[array] to unify linux/windows scripts + k=0 + COMMAND[k]="${JAVA}" diff --git a/icedtea-web-1.8.8-bash-completion.patch b/icedtea-web-1.8.8-bash-completion.patch new file mode 100644 index 0000000..e44749d --- /dev/null +++ b/icedtea-web-1.8.8-bash-completion.patch @@ -0,0 +1,26 @@ +From 558638e2aa131da29f3f6a39340a5641aa4134f7 Mon Sep 17 00:00:00 2001 +From: Robert Scheck +Date: Sun, 23 Apr 2023 02:08:04 +0200 +Subject: [PATCH] Use same naming scheme like bash-completion + +--- + Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e44070c17..f18492f2f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -416,9 +416,9 @@ if WINDOWS_OR_INCLUDE_BATS + ${INSTALL_PROGRAM} launcher.build/$(policyeditor).bat $(DESTDIR)$(bindir) + endif + endif +- ${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/itweb-settings.bash $(BASH_CMPL_DEST_DIR)/ +- ${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/javaws.bash $(BASH_CMPL_DEST_DIR)/ +- ${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/policyeditor.bash $(BASH_CMPL_DEST_DIR)/ ++ ${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/itweb-settings.bash $(BASH_CMPL_DEST_DIR)/itweb-settings ++ ${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/javaws.bash $(BASH_CMPL_DEST_DIR)/javaws ++ ${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/policyeditor.bash $(BASH_CMPL_DEST_DIR)/policyeditor + + # all generated manpages are installed in swarm + # all windows depndences are copied for windows build, and known one are copied/removed as necessary diff --git a/icedtea-web-1.8.8-java11-compatibility.patch b/icedtea-web-1.8.8-java11-compatibility.patch new file mode 100644 index 0000000..8e17a2f --- /dev/null +++ b/icedtea-web-1.8.8-java11-compatibility.patch @@ -0,0 +1,73 @@ +Patch by Emmanuel Bourg for icedtea-web to fix the compatibility with OpenJDK Java 11. +See also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=912549 + +--- icedtea-web-1.8.8/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java 2021-10-27 22:13:18.000000000 +0200 ++++ icedtea-web-1.8.8/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java.java11 2023-04-23 01:16:07.325947586 +0200 +@@ -339,33 +339,6 @@ + } + + /** +- * Checks whether the window can be displayed without an applet +- * warning banner, and adds the window to the list of windows to +- * be disposed when the calling application exits. +- */ +- @Override +- public boolean checkTopLevelWindow(Object window) { +- ApplicationInstance app = getApplication(); +- +- // remember window -> application mapping for focus, close on exit +- if (app != null && window instanceof Window) { +- Window w = (Window) window; +- +- OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "SM: app: " + app.getTitle() + " is adding a window: " + window + " with appContext " + AppContext.getAppContext()); +- +- weakWindows.add(w); // for mapping window -> app +- weakApplications.add(app); +- +- app.addWindow(w); +- } +- +- // todo: set awt.appletWarning to custom message +- // todo: logo on with glass pane on JFrame/JWindow? +- +- return super.checkTopLevelWindow(window); +- } +- +- /** + * Checks whether the caller can exit the system. This method + * identifies whether the caller is a real call to Runtime.exec + * and has special behavior when returning from this method +@@ -421,33 +394,4 @@ + protected void disableExit() { + exitAllowed = false; + } +- +- /** +- * Tests if a client can get access to the AWT event queue. This version allows +- * complete access to the EventQueue for its own AppContext-specific EventQueue. +- * +- * FIXME there are probably huge security implications for this. Eg: +- * http://hg.openjdk.java.net/jdk7/awt/jdk/rev/8022709a306d +- * +- * @exception SecurityException if the caller does not have +- * permission to accesss the AWT event queue. +- */ +- @Override +- public void checkAwtEventQueueAccess() { +- /* +- * this is the templace of the code that should allow applets access to +- * eventqueues +- */ +- +- // AppContext appContext = AppContext.getAppContext(); +- // ApplicationInstance instance = getApplication(); +- +- // if ((appContext == mainAppContext) && (instance != null)) { +- // If we're about to allow access to the main EventQueue, +- // and anything untrusted is on the class context stack, +- // disallow access. +- super.checkAwtEventQueueAccess(); +- // } +- } +- + } diff --git a/icedtea-web-1.8.8-remove-applet.patch b/icedtea-web-1.8.8-remove-applet.patch new file mode 100644 index 0000000..3207fea --- /dev/null +++ b/icedtea-web-1.8.8-remove-applet.patch @@ -0,0 +1,91 @@ +Patch by Robert Scheck for icedtea-web >= 1.8.8 which completely removes the Java applet support, because +upstream's build-time options fail to do so. Without this patch there are build failures related either to sun.applet.AppletImageRef +or the API documentation. + +--- icedtea-web-1.8.8/acinclude.m4 2021-10-27 22:13:18.000000000 +0200 ++++ icedtea-web-1.8.8/acinclude.m4.remove-applet 2023-04-23 01:01:50.114347243 +0200 +@@ -1052,6 +1052,7 @@ + else + it_cv_applet_hole=no; + fi ++it_cv_applet_hole=yes; + ]) + rm -f $CLASS *.class + cd .. +--- icedtea-web-1.8.8/configure.ac 2021-10-27 22:13:18.000000000 +0200 ++++ icedtea-web-1.8.8/configure.ac.remove-applet 2023-04-23 01:01:50.114347243 +0200 +@@ -186,7 +186,6 @@ + fi + IT_CHECK_FOR_CLASS(COM_SUN_JNDI_TOOLKIT_URL_URLUTIL, [com.sun.jndi.toolkit.url.UrlUtil], [some.pkg], [$JAVA_NAMING]) + IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_HTTP_HANDLER, [sun.net.www.protocol.http.Handler], [some.pkg], [$JAVA_BASE]) +-IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef], [sun.applet], [$JAVA_DESKTOP]) + + IT_CHECK_FOR_SUN_APPLET_ACCESSIBILITY + IT_CHECK_GLIB_VERSION +--- icedtea-web-1.8.8/Makefile.am 2021-10-27 22:13:18.000000000 +0200 ++++ icedtea-web-1.8.8/Makefile.am.remove-applet 2023-04-23 01:03:08.971853519 +0200 +@@ -238,8 +238,7 @@ + net.sourceforge.jnlp.controlpanel net.sourceforge.jnlp.event \ + net.sourceforge.jnlp.runtime net.sourceforge.jnlp.security \ + net.sourceforge.jnlp.security.viewer net.sourceforge.jnlp.services \ +- net.sourceforge.jnlp.tools net.sourceforge.jnlp.util \ +- sun.applet ++ net.sourceforge.jnlp.tools net.sourceforge.jnlp.util + + if ENABLE_PLUGINJAR + export ICEDTEAPLUGIN_TARGET = stamps/liveconnect-dist.stamp +@@ -899,7 +898,7 @@ + LANG_BACKUP=$$LANG ; \ + echo "$(PLUGIN_VERSION)" > "$$HTML_DOCS_INDEX" ; \ + echo "

$(PLUGIN_VERSION) docs:

" >> "$$HTML_DOCS_INDEX" ; \ +- for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \ ++ for LANG_ID in en_US.UTF-8 ; do \ + ID=`echo "$$LANG_ID" | head -c 2` ; \ + ENCOD=`echo "$$LANG_ID" | tail -c 6 -` ; \ + export LANG=$$LANG_ID; \ +@@ -956,11 +955,11 @@ + (cd $(NETX_DIR) ; \ + mkdir -p lib ; \ + $(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \ +- $(TOP_BUILD_DIR)/netx.manifest javax/jnlp net sun; \ ++ $(TOP_BUILD_DIR)/netx.manifest javax/jnlp net; \ + cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \ + find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ + cd src ; \ +- $(ZIP) -qr $(NETX_DIR)/lib/src.zip javax net sun) ++ $(ZIP) -qr $(NETX_DIR)/lib/src.zip javax net) + mkdir -p stamps + touch $@ + +--- icedtea-web-1.8.8/netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java 2021-10-27 22:13:18.000000000 +0200 ++++ icedtea-web-1.8.8/netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java.remove-applet 2023-04-23 01:03:08.970853513 +0200 +@@ -502,8 +502,7 @@ + ItwebSettingsTextsProvider itws = new ItwebSettingsTextsProvider(encoding, new HtmlFormatter(allowContext, allowLogo, includeXmlHeader), titles, expand); + PolicyEditorTextsProvider pe = new PolicyEditorTextsProvider(encoding, new HtmlFormatter(allowContext, allowLogo, includeXmlHeader), titles, expand); + IcedTeaWebTextsProvider itw = new IcedTeaWebTextsProvider(encoding, new HtmlFormatter(allowContext, allowLogo, includeXmlHeader), titles, expand); +- ItwebPluginTextProvider pl = new ItwebPluginTextProvider(encoding, new HtmlFormatter(allowContext, allowLogo, includeXmlHeader), titles, expand); +- TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw, pl}; ++ TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw}; + for (TextsProvider provider : providers) { + provider.setAuthorFilePath(authorFileFromUserInput); + provider.writeToDir(dir); +@@ -520,8 +519,7 @@ + ItwebSettingsTextsProvider itws = new ItwebSettingsTextsProvider(encoding, new ManFormatter(), titles, expand); + PolicyEditorTextsProvider pe = new PolicyEditorTextsProvider(encoding, new ManFormatter(), titles, expand); + IcedTeaWebTextsProvider itw = new IcedTeaWebTextsProvider(encoding, new ManFormatter(), titles, expand); +- ItwebPluginTextProvider pl = new ItwebPluginTextProvider(encoding, new ManFormatter(), titles, expand); +- TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw, pl}; ++ TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw}; + for (TextsProvider provider : providers) { + provider.setAuthorFilePath(authorFileFromUserInput); + provider.writeToDir(dir); +@@ -538,8 +536,7 @@ + ItwebSettingsTextsProvider itws = new ItwebSettingsTextsProvider(encoding, new PlainTextFormatter(indent, lineWidth), titles, expand); + PolicyEditorTextsProvider pe = new PolicyEditorTextsProvider(encoding, new PlainTextFormatter(indent, lineWidth), titles, expand); + IcedTeaWebTextsProvider itw = new IcedTeaWebTextsProvider(encoding, new PlainTextFormatter(indent, lineWidth), titles, expand); +- ItwebPluginTextProvider pl = new ItwebPluginTextProvider(encoding, new PlainTextFormatter(indent, lineWidth), titles, expand); +- TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw, pl}; ++ TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw}; + for(TextsProvider provider : providers){ + provider.setAuthorFilePath(authorFileFromUserInput); + provider.writeToDir(dir); diff --git a/icedtea-web-1.8.8-remove-dunce.patch b/icedtea-web-1.8.8-remove-dunce.patch new file mode 100644 index 0000000..310cea9 --- /dev/null +++ b/icedtea-web-1.8.8-remove-dunce.patch @@ -0,0 +1,12 @@ +Remove dependency to dunce (normalizes Windows paths to the most compatible format) + +--- icedtea-web-1.8.8/rust-launcher/Cargo.toml 2021-10-27 22:13:18.000000000 +0200 ++++ icedtea-web-1.8.8/rust-launcher/Cargo.toml.remove-dunce 2023-04-23 00:48:27.861178475 +0200 +@@ -2,7 +2,3 @@ + name = "launcher" + version = "1.8.0" + authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"] +- +-[dependencies] +-[target.'cfg(windows)'.dependencies] +-dunce = "0.1.1" diff --git a/icedtea-web-1.8.8-upstream-fixes.patch b/icedtea-web-1.8.8-upstream-fixes.patch new file mode 100644 index 0000000..4d240a7 --- /dev/null +++ b/icedtea-web-1.8.8-upstream-fixes.patch @@ -0,0 +1,141 @@ +From 4db4f1e1b0425b06d5b0c3f285b43b1cb11c0353 Mon Sep 17 00:00:00 2001 +From: Dmitry Cherepanov +Date: Mon, 14 Feb 2022 13:48:51 +0300 +Subject: [PATCH 1/5] backport classloader patch from #783 + +--- + netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java +index 7ed0c4db6..da23fb5c4 100644 +--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java ++++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java +@@ -1559,6 +1559,12 @@ protected Class findLoadedClassAll(String name) { + */ + @Override + public Class loadClass(String name) throws ClassNotFoundException { ++ synchronized (getClassLoadingLock(name)) { ++ return loadClassImpl(name); ++ } ++ } ++ ++ private Class loadClassImpl(String name) throws ClassNotFoundException { + Class result = findLoadedClassAll(name); + + // try parent classloader + +From 3c25773f7d516f4babaf5e2ab302160914cbb58b Mon Sep 17 00:00:00 2001 +From: lherschi +Date: Tue, 8 Nov 2022 23:25:29 +0100 +Subject: [PATCH 2/5] fix "Unexpected End of ZLIB Input Stream" Task #826 - + IcedTeaWeb + Tomcat Cause "Unexpected End of ZLIB Input Stream" While Caching + +--- + netx/net/sourceforge/jnlp/cache/ResourceDownloader.java | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java b/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java +index e0a123bbd..50d4e12a1 100644 +--- a/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java ++++ b/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java +@@ -396,6 +396,8 @@ private URLConnection getDownloadConnection(URL location) throws IOException { + } + + private void downloadPackGzFile(URLConnection connection, URL downloadFrom, URL downloadTo) throws IOException { ++ if (downloadFrom.equals(downloadTo)) ++ downloadFrom = new URL(downloadFrom + ".pack.gz"); + downloadFile(connection, downloadFrom); + + uncompressPackGz(downloadFrom, downloadTo, resource.getDownloadVersion()); +@@ -405,6 +407,8 @@ private void downloadPackGzFile(URLConnection connection, URL downloadFrom, URL + } + + private void downloadGZipFile(URLConnection connection, URL downloadFrom, URL downloadTo) throws IOException { ++ if (downloadFrom.equals(downloadTo)) ++ downloadFrom = new URL(downloadFrom + ".gz"); + downloadFile(connection, downloadFrom); + + uncompressGzip(downloadFrom, downloadTo, resource.getDownloadVersion()); + +From 1f246bdcd3a7cf4db12b65a838cdcc228e8aec24 Mon Sep 17 00:00:00 2001 +From: lhersch +Date: Wed, 9 Nov 2022 13:38:11 +0100 +Subject: [PATCH 3/5] change to new rhino download url + +--- + .github/workflows/build.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml +index 4f016d3a4..4df43d068 100644 +--- a/.github/workflows/build.yml ++++ b/.github/workflows/build.yml +@@ -49,7 +49,7 @@ jobs: + gmp-devel java-1.8.0-openjdk-devel libcurl-devel make mpfr-devel perl unzip which zip + curl -o tagsoup.jar "https://repo1.maven.org/maven2/org/ccil/cowan/tagsoup/tagsoup/1.2.1/tagsoup-1.2.1.jar" + sha256sum tagsoup.jar | awk '$1!="ac97f7b4b1d8e9337edfa0e34044f8d0efe7223f6ad8f3a85d54cc1018ea2e04"{exit 1}' +- curl -o rhino.zip "https://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R7.zip" ++ curl -o rhino.zip "https://mediacdn.prod.productdelivery.prod.webservices.mozgcp.net/pub/js/rhino1_6R7.zip" + sha256sum rhino.zip | awk '$1!="c94c6de3a29b3acbc4eee732e688f75a5d94bd02c9878be4ceb4d3cd220f3866"{exit 1}' + unzip -j rhino.zip "*/js.jar" + +@@ -161,7 +161,7 @@ jobs: + sha256sum tagsoup.jar | awk '$1!="ac97f7b4b1d8e9337edfa0e34044f8d0efe7223f6ad8f3a85d54cc1018ea2e04"{exit 1}' + curl -o mslinks.jar "https://repo1.maven.org/maven2/com/github/vatbub/mslinks/1.0.5/mslinks-1.0.5.jar" + sha256sum mslinks.jar | awk '$1!="e14d756f81b310b75baeb5baf219d25592b6a8635eb215c4059f17493b0cea5c"{exit 1}' +- curl -o rhino.zip "https://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R7.zip" ++ curl -o rhino.zip "https://mediacdn.prod.productdelivery.prod.webservices.mozgcp.net/pub/js/rhino1_6R7.zip" + sha256sum rhino.zip | awk '$1!="c94c6de3a29b3acbc4eee732e688f75a5d94bd02c9878be4ceb4d3cd220f3866"{exit 1}' + unzip -j rhino.zip "*/js.jar" + + +From d3c6a540a1e2405d19d1c743ac853c3520655c4d Mon Sep 17 00:00:00 2001 +From: lhersch +Date: Wed, 9 Nov 2022 14:24:55 +0100 +Subject: [PATCH 4/5] change to new rhino download url + +--- + .github/workflows/build.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml +index 4df43d068..00abe0f89 100644 +--- a/.github/workflows/build.yml ++++ b/.github/workflows/build.yml +@@ -259,7 +259,7 @@ jobs: + brew install autoconf automake coreutils freetype gnu-sed rust + curl -o tagsoup.jar "https://repo1.maven.org/maven2/org/ccil/cowan/tagsoup/tagsoup/1.2.1/tagsoup-1.2.1.jar" + sha256sum tagsoup.jar | awk '$1!="ac97f7b4b1d8e9337edfa0e34044f8d0efe7223f6ad8f3a85d54cc1018ea2e04"{exit 1}' +- curl -o rhino.zip "https://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R7.zip" ++ curl -o rhino.zip "https://mediacdn.prod.productdelivery.prod.webservices.mozgcp.net/pub/js/rhino1_6R7.zip" + sha256sum rhino.zip | awk '$1!="c94c6de3a29b3acbc4eee732e688f75a5d94bd02c9878be4ceb4d3cd220f3866"{exit 1}' + unzip -j rhino.zip "*/js.jar" + + +From 8970fed7c8b4ba25adec786104f4d348947c84fe Mon Sep 17 00:00:00 2001 +From: Lars Herschke +Date: Thu, 10 Nov 2022 10:37:45 +0100 +Subject: [PATCH 5/5] fix checkout when using Cygwin Git + +--- + .github/workflows/build.yml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml +index 00abe0f89..8bfc780f5 100644 +--- a/.github/workflows/build.yml ++++ b/.github/workflows/build.yml +@@ -359,9 +359,11 @@ jobs: + + - name: Cygwin git configuration + shell: bash +- run: mkdir $HOME && git config --system core.autocrlf false ++ run: mkdir $HOME && git config --system core.autocrlf false && git config --system --add safe.directory '*' + + - uses: actions/checkout@v2 ++ with: ++ set-safe-directory: false + + - name: Install Dependencies + run: | diff --git a/icedtea-web.spec b/icedtea-web.spec index 4c4da74..a9e17b6 100644 --- a/icedtea-web.spec +++ b/icedtea-web.spec @@ -1,377 +1,271 @@ -#can rust have debuginfo? Verify and fix! Likely issue in Makefile of itw. +# Rust doesn't create data for a -debuginfo package %global debug_package %{nil} -# Version of java we run against -%define javaver 11 -# Version of java we build by -%define buildjavaver 1.8.0 - -# Alternatives priority (rised by one number when jre bumped to 11 (as 11 < 18 :) -%define priority 110000 -# jnlp prorocol gnome registry keys -%define gurlhandler /desktop/gnome/url-handlers -%define jnlphandler %{gurlhandler}/jnlp -%define jnlpshandler %{gurlhandler}/jnlps - -%define jredir %{_jvmdir}/jre-%{javaver}-openjdk -%define sdkdir %{_jvmdir}/java-%{buildjavaver}-openjdk - -%define preffered_jre java-%{javaver}-openjdk -%define preffered_jdk java-%{buildjavaver}-openjdk-devel - -Name: icedtea-web -Version: 2.0.0 -Release: pre.0.3.alpha16.patched1.1%{?dist}.2 -Summary: Additional Java components for OpenJDK - Java Web Start implementation - -License: LGPLv2+ and GPLv2 with exceptions -URL: https://openwebstart.com/ -Source0: https://github.com/AdoptOpenJDK/IcedTea-Web/archive/%{name}-%{version}-alpha16.tar.gz -Patch0: patchOutDunce.patch -Patch1: launchersPhase.patch -# this should be upstreamed. In build tasks which lauches java are using runtime JRE, should beusing SDK, but there is no place where to set it -Patch2: usePathJdkForDifferentBuildAndRuntimeJre.patch -Patch3: altjava.patch - -BuildRequires: javapackages-tools -#for deprecated add_maven_depmap, see https://www.spinics.net/lists/fedora-devel/msg233211.html -BuildRequires: javapackages-local -BuildRequires: %{preffered_jdk} -BuildRequires: desktop-file-utils -BuildRequires: glib2-devel -BuildRequires: dos2unix -BuildRequires: rust -BuildRequires: cargo -BuildRequires: junit -BuildRequires: maven -BuildRequires: hamcrest -BuildRequires: libappstream-glib -BuildRequires: tagsoup -BuildRequires: maven-local-openjdk8 -# have to remove them at the end, what is the result? -BuildRequires: buildnumber-maven-plugin -BuildRequires: maven-source-plugin -BuildRequires: maven-clean-plugin -BuildRequires: maven-shade-plugin -BuildRequires: exec-maven-plugin -BuildRequires: hamcrest -BuildRequires: hamcrest-core -BuildRequires: rhino -BuildRequires: IPAddress - -# For functionality and the OpenJDK dirs -Requires: %{preffered_jre} -Requires: javapackages-tools -Requires: rhino -Requires: IPAddress - -Recommends: bash-completion -#maven fragments -Requires(post): javapackages-tools -Requires(postun): javapackages-tools - -# When itw builds against it, it have to be also in runtime -Requires: tagsoup - -# Post requires alternatives to install tool alternatives. -Requires(post): %{_sbindir}/alternatives -# jnlp protocols support -Requires(post): GConf2 -# Postun requires alternatives to uninstall tool alternatives. -Requires(postun): %{_sbindir}/alternatives -# jnlp protocols support -Requires(postun): GConf2 - -# Standard JPackage plugin provides. -Provides: javaws = 1:%{javaver} -Provides: %{preffered_jre}-javaws = 1:%{version} +Summary: Open Source implementation of JSR-56 better known as Java Web Start +Name: icedtea-web +Version: 1.8.8 +Release: 1%{?dist} +# Run the following command after removing applet/unused sources in %%prep: +# licensecheck -r --shortname-scheme=spdx . | sed -e 's/.*: //' | sort -u +License: GPL-2.0-only AND GPL-2.0-only WITH Classpath-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND Zlib +URL: https://github.com/AdoptOpenJDK/IcedTea-Web +Source0: https://github.com/AdoptOpenJDK/IcedTea-Web/archive/%{name}-%{version}/%{name}-%{version}.tar.gz +# Remove dependency to dunce (normalizes Windows paths to the most compatible format) +Patch0: icedtea-web-1.8.8-remove-dunce.patch +# https://access.redhat.com/documentation/en-us/openjdk/11/html/using_alt-java +Patch1: icedtea-web-1.8.8-alt-java.patch +# Remove applet code/support to fix multiple build failures +Patch2: icedtea-web-1.8.8-remove-applet.patch +# Fix compatibility with OpenJDK Java 11 +Patch3: icedtea-web-1.8.8-java11-compatibility.patch +# Upstream fixes since IcedTea-Web 1.8.8 +Patch4: https://github.com/AdoptOpenJDK/IcedTea-Web/compare/icedtea-web-1.8.8...1.8.patch#/icedtea-web-1.8.8-upstream-fixes.patch +# Use same naming scheme like bash-completion +Patch5: https://patch-diff.githubusercontent.com/raw/AdoptOpenJDK/IcedTea-Web/pull/899.patch#/icedtea-web-1.8.8-bash-completion.patch +ExclusiveArch: %{java_arches} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bash-completion +BuildRequires: bc +BuildRequires: cargo +BuildRequires: desktop-file-utils +BuildRequires: java-11-openjdk-devel +BuildRequires: javapackages-local +BuildRequires: javapackages-tools +BuildRequires: libappstream-glib +BuildRequires: tagsoup +BuildRequires: zip +Recommends: bash-completion +Requires: java-11-openjdk +Requires: javapackages-tools +# Required at runtime if icedtea-web was built against it +Requires: tagsoup +Requires(post): %{_sbindir}/alternatives +Requires(post): GConf2 +Requires(postun): %{_sbindir}/alternatives +Requires(postun): GConf2 +# Cover third party repositories +Obsoletes: javaws < 1.8.8-1 +Provides: javaws = %{version}-%{release} +Provides: javaws%{?_isa} = %{version}-%{release} %description -The IcedTea-Web project provides a an implementation of Java Web Start -(originally based on the Netx project, now opensource part of OpenWebStart) -and a settings tool to manage deployment settings for the aforementioned -Web Start implementations. +The IcedTea-Web project provides a free software implementation of Java +Web Start, originally based on the NetX, project. + +IcedTea's NetX currently supports verification of signed jars, trusted +certificate storing, system certificate store checking, and provides the +services specified by the jnlp API. + +In addition it also provides a full desktop integration, an offline run, +many extended security features, an own policy editor and much more. %package javadoc -Summary: API documentation for IcedTea-Web -Requires: %{name} = %{version}-%{release} -BuildArch: noarch +Summary: API documentation for IcedTea-Web +Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description javadoc -This package contains Javadocs for the IcedTea-Web project. - +This package contains the API documentation for the IcedTea-Web project. %package devel -Summary: pure sources for debugging IcedTea-Web -Requires: %{name} = %{version}-%{release} -BuildArch: noarch +Summary: Pure sources for debugging IcedTea-Web +Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description devel -This package contains ziped sources of the IcedTea-Web project. +This package contains the zipped sources of the IcedTea-Web project for +debugging IcedTea-Web. %prep -%setup -q -n IcedTea-Web-icedtea-web-2.0.0-alpha16 -%patch0 -p1 -dos2unix launchers/pom.xml -%patch1 -p0 -%patch2 -p1 -%patch3 -p1 - -%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin -%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin -%pom_remove_plugin org.jacoco:jacoco-maven-plugin -%pom_remove_plugin org.apache.maven.plugins:maven-surefire-plugin -%pom_add_plugin org.apache.maven.plugins:maven-install-plugin:2.5.2 -%pom_remove_dep junit:junit common/pom.xml -%pom_remove_dep org.hamcrest:hamcrest common/pom.xml - -%pom_remove_dep org.hamcrest:hamcrest test-extensions/pom.xml -%pom_remove_dep net.jcip:jcip-annotations test-extensions/pom.xml -%pom_remove_dep com.github.stefanbirkner:system-rules test-extensions/pom.xml - -%pom_remove_dep com.github.vatbub:mslinks core/pom.xml -%pom_remove_dep org.hamcrest:hamcrest integration/pom.xml -%pom_remove_dep com.github.tomakehurst:wiremock-jre8 integration/pom.xml -%pom_remove_dep com.github.stefanbirkner:system-rules integration/pom.xml - -%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin common/pom.xml -%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin core/pom.xml -%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin test-extensions/pom.xml -%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin xml-parser/pom.xml -%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin pom.xml - -rm -v core/src/main/java/net/sourceforge/jnlp/util/WindowsDesktopEntry.java -rm -r integration/src +%setup -q -n IcedTea-Web-%{name}-%{version} +%patch0 -p1 -b .remove-dunce +%patch1 -p1 -b .alt-java +%patch2 -p1 -b .remove-applet +%patch3 -p1 -b .java11-compatibility +%patch4 -p1 -b .upstream-fixes +%patch5 -p1 -b .bash-completion + +# Remove applet support +rm -rf plugin netx/sun netx/net/sourceforge/jnlp/{NetxPanel,runtime/RhinoBasedPacEvaluator,util/WindowsDesktopEntry}.java +# Remove unused sources +rm -rf tests win-installer %build -rm -rf launchers/build.log -export JAVA_HOME=%{sdkdir} -SPLASH_TARGET_DIR=%{_datadir}/%{name} \ -ITW_TARGET_DIR=%{_datadir}/%{name} \ -BIN_TARGET_DIR=%{_libexecdir}/%{name} \ -ETC_TARGET_DIR=%{_sysconfdir}/java/%{name} \ -ITW_LIBS=DISTRIBUTION \ -JRE=%{jredir} \ -%mvn_build -- -Plaunchers -Dmaven.test.skip=true -Dmaven.javadoc.skip=true || cat launchers/build.log -cat launchers/build.log +autoreconf --force --install +%configure \ + --with-pkgversion=fedora-%{release}-%{_arch} \ + --docdir=%{_datadir}/javadoc/%{name} \ + --with-jdk-home=%{_jvmdir}/java-11-openjdk \ + --with-jre-home=%{_jvmdir}/jre-11-openjdk \ + --program-suffix=.itweb \ + --disable-native-plugin \ + --disable-pluginjar \ + --with-itw-libs=DISTRIBUTION \ + --with-modularjdk-file=%{_sysconfdir}/java/%{name} \ + --enable-shell-launchers +%make_build %install -#not installing all, itw is comlex maven project, wfrom which we need onlythe finall jar, without system deps -%mvn_artifact pom.xml launchers/target//usr/share/icedtea-web/javaws.jar - -mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name} -# build provides also .bat files, we do not want them -cp -v launchers/target/%{_libexecdir}/%{name}/javaws $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ -cp -v launchers/target/%{_libexecdir}/%{name}/itweb-settings $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ -cp -v launchers/target/%{_libexecdir}/%{name}/policyeditor $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ -cp -v launchers/target/%{_libexecdir}/%{name}/javaws.sh $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ -cp -v launchers/target/%{_libexecdir}/%{name}/itweb-settings.sh $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ -cp -v launchers/target/%{_libexecdir}/%{name}/policyeditor.sh $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ - -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}/ -cp -v launchers/target/%{_sysconfdir}/java/%{name}/itw-modularjdk.args $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}/ - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -v launchers/target/%{_datadir}/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name} - -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/ -cp -v launchers/target/extensions/bash_completion.d/* $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/ - -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/ -cp -r launchers/target/icedtea-web-docs/2.0.0-alpha16/man/* $RPM_BUILD_ROOT/%{_mandir}/ -# rename javaws so it can coexists with other implementations -mv $RPM_BUILD_ROOT/%{_mandir}/man1/javaws.1 $RPM_BUILD_ROOT/%{_mandir}/man1/javaws.itweb.1 -mv $RPM_BUILD_ROOT/%{_mandir}/cs/man1/javaws.1 $RPM_BUILD_ROOT/%{_mandir}/cs/man1/javaws.itweb.1 -mv $RPM_BUILD_ROOT/%{_mandir}/de/man1/javaws.1 $RPM_BUILD_ROOT/%{_mandir}/de/man1/javaws.itweb.1 -mv $RPM_BUILD_ROOT/%{_mandir}/pl/man1/javaws.1 $RPM_BUILD_ROOT/%{_mandir}/pl/man1/javaws.itweb.1 - -# Install desktop files. -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} -desktop-file-install --vendor '' --dir $RPM_BUILD_ROOT%{_datadir}/applications launchers/target/extensions/xdesktop/javaws.desktop -desktop-file-install --vendor '' --dir $RPM_BUILD_ROOT%{_datadir}/applications launchers/target/extensions/xdesktop/itweb-settings.desktop -desktop-file-install --vendor '' --dir $RPM_BUILD_ROOT%{_datadir}/applications launchers/target/extensions/xdesktop/policyeditor.desktop -cp launchers/target/libs/javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps - -# install MetaInfo file for javaws -DESTDIR=%{buildroot} appstream-util install launchers/metadata/%{name}-javaws.appdata.xml - -# maven fragments generation -mkdir -p $RPM_BUILD_ROOT%{_javadir} -pushd $RPM_BUILD_ROOT%{_javadir} - ln -s ../%{name}/javaws.jar %{name}.jar -popd -mkdir -p $RPM_BUILD_ROOT/%{_mavenpomdir} -cp pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/%{name}.pom - -%mvn_artifact $RPM_BUILD_ROOT/%{_mavenpomdir}/%{name}.pom $RPM_BUILD_ROOT/%{_javadir}/%{name}.jar - -%find_lang %{name} --all-name --with-man +%make_install + +# Install desktop files +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications itweb-settings.desktop +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications policyeditor.desktop + +# Install MetaInfo file for firefox +install -D -p -m 0644 metadata/%{name}.metainfo.xml $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + +# Install MetaInfo file for javaws +install -D -p -m 0644 metadata/%{name}-javaws.appdata.xml $RPM_BUILD_ROOT%{_metainfodir}/%{name}-javaws.metainfo.xml + +# Maven fragments generation +mkdir -p $RPM_BUILD_ROOT%{_javadir}/ +ln -s ../%{name}/javaws.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +install -D -p -m 0644 metadata/%{name}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/%{name}.pom + +%mvn_artifact $RPM_BUILD_ROOT%{_mavenpomdir}/%{name}.pom $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + +# Install source zip for devel package +install -D -p -m 0644 netx.build/lib/src.zip $RPM_BUILD_ROOT%{_datadir}/%{name}/javaws.src.zip + +# Create files for %%ghost in %%files +touch $RPM_BUILD_ROOT%{_bindir}/{javaws,itweb-settings,policyeditor} + +# Until https://bugzilla.redhat.com/show_bug.cgi?id=2188866 is fixed +rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/javaws %check -# takes long, and fails anyway -# appstream-util validate $RPM_BUILD_ROOT/%{_datadir}/appdata/*.xml || : +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.metainfo.xml %post -# we had changed master of alternative, thus rmoving the old ones -# this is braking alternatives, thus variabled-out if necessary -if [ ! "x$ITW_20_18" == "xtrue" ] ; then - alternatives --remove javaws.%{_arch} %{_prefix}/bin/javaws.itweb -fi - -PRIORITY=%{priority} -alternatives \ - --install %{_bindir}/javaws javaws.%{_arch} %{_libexecdir}/%{name}/javaws $PRIORITY --family %{preffered_jre}.%{_arch} \ - --slave %{_bindir}/itweb-settings itweb-settings %{_libexecdir}/%{name}/itweb-settings \ - --slave %{_bindir}/policyeditor policyeditor %{_libexecdir}/%{name}/policyeditor \ - --slave %{_bindir}/ControlPanel ControlPanel %{_libexecdir}/%{name}/itweb-settings \ - --slave %{_mandir}/man1/javaws.1.gz javaws.1.gz %{_mandir}/man1/javaws.itweb.1.gz \ - --slave %{_mandir}/man1/ControlPanel.1.gz ControlPanel.1.gz %{_mandir}/man1/itweb-settings.1.gz - -let PRIORITY=PRIORITY-1 alternatives \ - --install %{_bindir}/javaws javaws.%{_arch} %{_libexecdir}/%{name}/javaws.sh $PRIORITY --family %{preffered_jre}.%{_arch} \ - --slave %{_bindir}/itweb-settings itweb-settings %{_libexecdir}/%{name}/itweb-settings.sh \ - --slave %{_bindir}/policyeditor policyeditor %{_libexecdir}/%{name}/policyeditor.sh \ - --slave %{_bindir}/ControlPanel ControlPanel %{_libexecdir}/%{name}/itweb-settings.sh \ - --slave %{_mandir}/man1/javaws.1.gz javaws.1.gz %{_mandir}/man1/javaws.itweb.1.gz \ - --slave %{_mandir}/man1/ControlPanel.1.gz ControlPanel.1.gz %{_mandir}/man1/itweb-settings.1.gz + --install %{_bindir}/javaws javaws.%{_arch} %{_bindir}/javaws.itweb 110000 --family java-11-openjdk.%{_arch} \ + --slave %{_bindir}/itweb-settings itweb-settings %{_bindir}/itweb-settings.itweb \ + --slave %{_bindir}/policyeditor policyeditor %{_bindir}/policyeditor.itweb +alternatives \ + --install %{_bindir}/javaws javaws.%{_arch} %{_bindir}/javaws.itweb.sh 110000 --family java-11-openjdk.%{_arch} \ + --slave %{_bindir}/itweb-settings itweb-settings %{_bindir}/itweb-settings.itweb.sh \ + --slave %{_bindir}/policyeditor policyeditor %{_bindir}/policyeditor.itweb.sh -gconftool-2 -s %{jnlphandler}/command '%{_bindir}/javaws %s' --type String &> /dev/null || : -gconftool-2 -s %{jnlphandler}/enabled --type Boolean true &> /dev/null || : -gconftool-2 -s %{jnlpshandler}/command '%{_bindir}/javaws %s' --type String &> /dev/null || : -gconftool-2 -s %{jnlpshandler}/enabled --type Boolean true &> /dev/null || : +gconftool-2 --set /desktop/gnome/url-handlers/jnlp/command --type=string '%{_bindir}/javaws.itweb %s' &> /dev/null || : +gconftool-2 --set /desktop/gnome/url-handlers/jnlp/enabled --type=bool true &> /dev/null || : +gconftool-2 --set /desktop/gnome/url-handlers/jnlps/command --type=string '%{_bindir}/javaws.itweb %s' &> /dev/null || : +gconftool-2 --set /desktop/gnome/url-handlers/jnlps/enabled --type=bool true &> /dev/null || : %postun -if [ $1 -eq 0 ] -then - alternatives --remove javaws.%{_arch} %{_libexecdir}/%{name}/javaws - alternatives --remove javaws.%{_arch} %{_libexecdir}/%{name}/javaws.sh - gconftool-2 -u %{jnlphandler}/command &> /dev/null || : - gconftool-2 -u %{jnlphandler}/enabled &> /dev/null || : - gconftool-2 -u %{jnlpshandler}/command &> /dev/null || : - gconftool-2 -u %{jnlpshandler}/enabled &> /dev/null || : +if [ $1 -eq 0 ]; then + alternatives --remove javaws.%{_arch} %{_bindir}/javaws.itweb + alternatives --remove javaws.%{_arch} %{_bindir}/javaws.itweb.sh + gconftool-2 --unset /desktop/gnome/url-handlers/jnlp/command &> /dev/null || : + gconftool-2 --unset /desktop/gnome/url-handlers/jnlp/enabled &> /dev/null || : + gconftool-2 --unset /desktop/gnome/url-handlers/jnlps/command &> /dev/null || : + gconftool-2 --unset /desktop/gnome/url-handlers/jnlps/enabled &> /dev/null || : fi exit 0 -%files -f %{name}.lang -%{_sysconfdir}/bash_completion.d/* +%files +%license COPYING +%doc AUTHORS NEWS README +%dir %{_sysconfdir}/java/%{name}/ %config(noreplace) %{_sysconfdir}/java/%{name}/itw-modularjdk.args -%{_libexecdir}/%{name}/* -%{_datadir}/applications/* -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/*.jar -%{_datadir}/java/%{name}.jar -%{_datadir}/maven-poms/%{name}.pom -%{_datadir}/%{name}/*.png -%{_datadir}/man/man1/* -%{_datadir}/pixmaps/* -%{_datadir}/appdata/*.xml -%doc README.md CONTRIBUTING.md -%license LICENSE LICENCE_DETAILS.md - +%ghost %{_bindir}/javaws +%{_bindir}/javaws.itweb +%{_bindir}/javaws.itweb.sh +%ghost %{_bindir}/itweb-settings +%{_bindir}/itweb-settings.itweb +%{_bindir}/itweb-settings.itweb.sh +%ghost %{_bindir}/policyeditor +%{_bindir}/policyeditor.itweb +%{_bindir}/policyeditor.itweb.sh +%{_datadir}/applications/javaws.desktop +%{_datadir}/applications/itweb-settings.desktop +%{_datadir}/applications/policyeditor.desktop +%{_datadir}/bash-completion/completions/itweb-settings +%{_datadir}/bash-completion/completions/policyeditor +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/javaws.jar +%{_datadir}/%{name}/javaws_splash.png +%{_javadir}/%{name}.jar +%{_mavenpomdir}/%{name}.pom +%{_metainfodir}/%{name}.metainfo.xml +%{_metainfodir}/%{name}-javaws.metainfo.xml +%{_datadir}/pixmaps/javaws.png +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/itweb-settings.1* +%{_mandir}/man1/javaws.1* +%{_mandir}/man1/policyeditor.1* + +%files javadoc +%{_datadir}/javadoc/%{name}/ + +%files devel +%{_datadir}/%{name}/javaws.src.zip %changelog -* Tue Oct 19 2021 Orion Poplawski - 2.0.0-pre.0.3.alpha16.patched1.1.2 -- Remove unneeded BR on maven-install-plugin, and BR maven-local-openjdk8 (FTBFS bz#1987575) - -* Thu Jul 22 2021 Fedora Release Engineering - 2.0.0-pre.0.3.alpha16.patched1.1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.0.0-pre.0.3.alpha16.patched1.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Nov 24 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha16.patched1.2 -- removed policyeditor manpage, it was link to itself - -* Tue Nov 24 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha16.patched1.1 -- fixed jnlp handlers to use masterlink - -* Tue Nov 24 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha16.patched1.0 -- bumped to latest upstream +* Sun Apr 23 2023 Robert Scheck - 1.8.8-1 +- Upgrade to 1.8.8 (#2188867) -* Fri Jul 10 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha13.patched1.5 +* Tue Nov 24 2020 Jiri Vanek - 1.8.4-1 +- patched to use alt-java - returned shell launchers -- made to use alt-java if it exists - -* Fri Jul 10 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha13.patched1.4 -- removed all javadocs, likely broken after usage of xmvn to javadocs generation -- https://src.fedoraproject.org/rpms/javapackages-tools/pull-request/3#comment-46283 - -* Fri Jul 10 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha13.patched1.3 -- added removal of old alternatives. Sorry - -* Fri Jul 10 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha13.patched1.2 -- fixed removal of alternatives, was not working for years -- fixed unexpanded macro in alternatives, reason of non working update from 1.8 - -* Fri Jul 10 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha13.patched1.1 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Jun 05 2020 Jiri Vanek - 2.0.0-pre.0.2.alpha13.patched2 -- updated to upstream sources with proper ipaddress handling -- still needs jdk8 to build due to bug in upstream - -* Fri May 08 2020 Jiri Vanek - 2.0.0-pre.0.2.alpha13.patched1 -- Changed so it builds by jdk8, but runs by jdk11. It should be upstream supported way - -* Fri May 08 2020 Jiri Vanek - 2.0.0-pre.0.1.alpha13.patched1 -- bumped to use jdk11 -* Fri May 08 2020 Jiri Vanek - 2.0.0-pre.0.0.alpha13.patched1 -- rewriten for itw 2.0 +* Tue Nov 24 2020 Jiri Vanek - 1.8.4-0 +- rebased to 1.8.4 -* Wed Jan 29 2020 Fedora Release Engineering - 1.8.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Wed Jul 31 2019 Jiri Vanek - 1.8.2-4 +- fixed alternatives removal. Were broken for years -* Wed Jul 31 2019 - Jiri Vanek -1.8.2-3 +* Wed Jul 31 2019 Jiri Vanek - 1.8.2-3 - added issue1-3 patches to fix CVEs 2019-10181, 2019-10182, 2019-10185 * Thu Jul 25 2019 Fedora Release Engineering - 1.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Wed Jul 17 2019 - Jiri Vanek -1.8.2-1 +* Wed Jul 17 2019 Jiri Vanek - 1.8.2-1 - Bump to 1.8.2; first from AdoptOpenJDK * Wed Mar 20 2019 Peter Robinson -1.8-2 - Drop chkconfig dep, 1.7 shipped in f24 -* Tue Mar 12 2019 - Jiri Vanek -1.8-1 +* Tue Mar 12 2019 Jiri Vanek - 1.8-1 - Bump to 1.8 -* Tue Feb 26 2019 - Jiri Vanek -1.8pre-0.2 -- itw-modularjdk.args marked as config(norepalce) +* Tue Feb 26 2019 Jiri Vanek - 1.8pre-0.2 +- itw-modularjdk.args marked as config(noreplace) -* Thu Feb 21 2019 - Jiri Vanek -1.8pre-0.1 +* Thu Feb 21 2019 Jiri Vanek - 1.8pre-0.1 - updated to soon to release itw 1.8 with native launchers * Fri Feb 01 2019 Fedora Release Engineering - 1.7.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Mon Jul 16 2018 - Jiri Vanek -1.7.1-11 -- added usptream pathces +* Mon Jul 16 2018 Jiri Vanek - 1.7.1-11 +- added upstream pathces -* Mon Jul 16 2018 - Jiri Vanek -1.7.1-10 -- added usptream pathces +* Mon Jul 16 2018 Jiri Vanek - 1.7.1-10 +- added upstream pathces - removed most relicts off plugin -* Mon Jul 16 2018 - Jiri Vanek -1.7.1-8 +* Mon Jul 16 2018 Jiri Vanek - 1.7.1-8 - removed rhino -* Thu May 24 2018 - Jiri Vanek -1.7.1-6 +* Thu May 24 2018 Jiri Vanek - 1.7.1-6 - removed clang -* Mon May 14 2018 - Jiri Vanek -1.7.1-6 +* Mon May 14 2018 Jiri Vanek - 1.7.1-6 - added an applied patch1, oracleForms.patch to make oracle forms working -* Fri Mar 02 2018 - Jiri Vanek -1.7.1-5 +* Fri Mar 02 2018 Jiri Vanek - 1.7.1-5 - added 1473-1480.patch - added support for javafx-desc and so allwong run of pure-javafx only applications - --nosecurity enhanced for possibility to skip invalid signatures - enhanced to allow resources to be read also from j2se/java element (OmegaT) -* Tue Feb 20 2018 - Jiri Vanek -1.7.1-3 +* Tue Feb 20 2018 Jiri Vanek - 1.7.1-3 - added buildrequires on gcc/gcc-c++ - to follow new packaging guidelines which no longer automatically pulls gcc/c++ to build root @@ -388,13 +282,13 @@ exit 0 - gathered various patches from usptream * Wed Aug 23 2017 Jiri Vanek 1.7-4 -- removed natie plugin, no longer can build (removed xullruner and gecko devel packages) +- removed native plugin, no longer can build (removed xulrunner and gecko devel packages) - added forgotten slaves of itweb-settings policyeditor - Own %%{_datadir}/%%{name} dir - Mark non-English man pages with %%lang - Install COPYING as %%license - last three by Ville Skytta via 1481270 -- added BuildRequires: javapackages-local to introduce deprecated add_maven_depmap macro +- added BuildRequires: javapackages-local to introduce deprecated %%add_maven_depmap macro * Wed Aug 02 2017 Fedora Release Engineering - 1.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild @@ -422,7 +316,7 @@ exit 0 * Fri Apr 28 2017 Jiri Vanek 1.7-0.2.pre05 - updated to rc5 -- added support for jnlp://, jnlps:// and jnlp: protocols +- added support for jnlp://, jnlps:// and jnlp: protocols * Fri Feb 10 2017 Fedora Release Engineering - 1.7-0.2.pre04 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -432,22 +326,22 @@ exit 0 - fixed RHBZ#1412544 * Wed Jan 11 2017 Jiri Vanek 1.7-0.1.pre03 -- updated ro RC3 of 1.7 +- updated ro RC3 of 1.7 * Wed Jan 04 2017 Jiri Vanek 1.7-0.1.pre01 -- updated ro RC1 of 1.7 -- added recommends on vash completion +- updated ro RC1 of 1.7 +- added recommends on bash completion * Wed Jul 13 2016 Jiri Vanek 1.6.2-3 - minor fix to javadir and jre dir * Wed Jul 13 2016 Jiri Vanek 1.6.2-2 - added --family to make it part of javas alternatives alignment -- java-javaver-openjdk collected into preffered_java +- java-javaver-openjdk collected into preferred_java * Wed Feb 03 2016 Jiri Vanek 1.6.2-1 - updated to 1.6.2 -- fixed also rhbz#1303437 - package owns /etc/bash_completion.d but it should not own it +- fixed also rhbz#1303437 - package owns /etc/bash_completion.d but it should not own it * Thu Jan 28 2016 Jiri Vanek 1.6.1-66 - moved to 1.6.2pre @@ -462,10 +356,10 @@ exit 0 - added and applied three patches scheduled for 1.6.2 - patch2 fileLogInitializationError-1.6.patch to prevent consequences 1268909 - patch1 donLogToFileBeforeFileLogsInitiate.patch -- patch0 javadocFixes.patch +- patch0 javadocFixes.patch * Mon Sep 21 2015 Jiri Vanek 1.6.1-2 -- added and applied patch0 javadocFixes.patch +- added and applied patch0 javadocFixes.patch * Fri Sep 11 2015 Jiri Vanek 1.6.1-1 - updated to upstream release 1.6.1 @@ -481,7 +375,7 @@ exit 0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild * Mon May 04 2015 Jiri Vanek 1.6-3 -- added depndence on hamcrest - no longer part of junit +- added dependence on hamcrest - no longer part of junit * Wed Apr 29 2015 Jiri Vanek 1.6-2 - enabled check @@ -494,7 +388,7 @@ exit 0 - handled "Add Tab Completion for icedtea-web" change - this release contains numers, not yet upstreamed, but going to release features: - summary: Fixed resource test to pass for CZ localization -- summary: Added Czech translation for 1.6. +- summary: Added Czech translation for 1.6 - summary: Messages from TextsProvider moved to properties - summary: various improvements to default set of properties - summary: Added MultipleDeploymentPropertiesModifier improvement to testsuite @@ -512,8 +406,8 @@ exit 0 * Mon Dec 22 2014 Jiri Vanek 1.6-0.1.pre02 - updated to pre02 - upstreamed patch1, quoteDocsPaths.patch -- temprarily disabled unittests -- fixed nlp apps shortcut +- temporarily disabled unittests +- fixed jnlp apps shortcut * Mon Dec 22 2014 Jiri Vanek 1.6-0.1.pre01 - update future 1.6 alpha pre01 @@ -531,8 +425,8 @@ exit 0 - removed all patches (all upstreamed) * Thu Aug 14 2014 Richard Hughes - 1.5-4 -- Add MetaInfo file to show an addon in GNOME Software. -- See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1907 for upstream. +- Add MetaInfo file to show an addon in GNOME Software +- See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1907 for upstream * Mon Jun 09 2014 Omair Majid - 1.5-3 - Require junit instead of juni4 @@ -544,7 +438,7 @@ exit 0 * Mon Apr 07 2014 Jiri Vanek 1.5-2 - add not yet upstreamed DE localisation of 1.5 - patch0 DElocalizationforIcedTea-Web1.5-0001.patch -- autoreconf gog -vfi, see RH1077898 +- autoreconf gog -vfi, see RH1077898 - ./configure changed to %%configure,see RH1077287 * Mon Apr 07 2014 Jiri Vanek 1.5-1 @@ -566,13 +460,13 @@ exit 0 - added supported tagsoup dependence * Wed Feb 26 2014 Jiri Vanek 1.5-0.1.pre02 -- updated to bleeding edge as tracker before 1.5 actual release +- updated to bleeding edge as tracker before 1.5 actual release - based on revision 899 - added policyeditor.desktop - removed -std=c++11 flag * Wed Feb 12 2014 Jiri Vanek 1.5-0.1.pre01 -- updated to bleeding edge as tracker before 1.5 actual release +- updated to bleeding edge as tracker before 1.5 actual release - named by https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_packages - see commented original source0 line and setup line reusing versions - the source tarball is based on revision 892 @@ -590,8 +484,8 @@ exit 0 * Tue Sep 17 2013 Jiri Vanek 1.4.1-0 - updated to 1.4.1 - add icedtea-web man page -- removed upstreamed patch1 b25-appContextFix.patch -- removed upstreamed patch2 rhino-pac-permissions.patch +- removed upstreamed patch1 b25-appContextFix.patch +- removed upstreamed patch2 rhino-pac-permissions.patch - make check enabled again - should be build for non-standart archs !-) - removed unused multilib arches (yupii!) @@ -612,15 +506,15 @@ exit 0 - Updated to 1.4 - See announcement for detail - http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-May/023195.html -- commented out check - some junit4 incompatibility +- commented out check - some junit4 incompatibility * Wed Apr 17 2013 Jiri Vanek 1.3.2-0 - Updated to latest ustream release of 1.3 branch - 1.3.2 - Security Updates - CVE-2013-1927, RH884705: fixed gifar vulnerability - - CVE-2013-1926, RH916774: Class-loader incorrectly shared for applets with same relative-path. + - CVE-2013-1926, RH916774: Class-loader incorrectly shared for applets with same relative-path - Common - - Added new option in itw-settings which allows users to set JVM arguments when plugin is initialized. + - Added new option in itw-settings which allows users to set JVM arguments when plugin is initialized - NetX - PR580: http://www.horaoficial.cl/ loads improperly - Plugin @@ -631,8 +525,8 @@ exit 0 * Wed Feb 20 2013 Ville Skyttä - 1.3.1-5 - Resolves: rhbz#875496 -- Build with $RPM_LD_FLAGS and %%{_smp_mflags}. -- Run unit tests during build. +- Build with $RPM_LD_FLAGS and %%{_smp_mflags} +- Run unit tests during build * Thu Feb 14 2013 Fedora Release Engineering - 1.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -642,7 +536,7 @@ exit 0 - Added patch to remove GTK dependency * Thu Dec 20 2012 Jiri Vanek 1.3.1-2 -- Moved to be build with GTK3 +- Moved to be build with GTK3 * Wed Nov 07 2012 Deepak Bhole 1.3.1-1 - Resolves: RH869040/CVE-2012-4540 @@ -681,11 +575,11 @@ exit 0 - Bumped min_openjdk_version to -60 (latest) * Thu Nov 24 2011 Deepak Bhole 1.1.4-2 -- Resolves: rhbz#742887. Do not own directories not created by the package. +- Resolves: rhbz#742887. Do not own directories not created by the package * Tue Nov 08 2011 Deepak Bhole 1.1.4-1 - Updated to 1.1.4 -- Added npapi-fix patch so that the plug-in compiles with xulrunner 8 +- Added npapi-fix patch so that the plug-in compiles with xulrunner 8 * Thu Sep 01 2011 Deepak Bhole 1.1.2-1 - Updated to 1.1.2 @@ -710,7 +604,7 @@ exit 0 * Mon Jun 13 2011 Deepak Bhole 1.0.3-1 - Update to 1.0.3 -- Resolves: rhbz#691259 +- Resolves: rhbz#691259 * Mon Apr 04 2011 Deepak Bhole 1.0.2-2 - Fixed incorrect macro value for min_openjdk_version diff --git a/launchersPhase.patch b/launchersPhase.patch deleted file mode 100644 index 7c917e4..0000000 --- a/launchersPhase.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- launchers/pom.xml -+++ launchers/pom.xml -@@ -52,7 +52,7 @@ - - - build-launchers -- install -+ verify - - exec - - diff --git a/patchOutDunce.patch b/patchOutDunce.patch deleted file mode 100644 index 20caa78..0000000 --- a/patchOutDunce.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/launchers/rust-launcher/cc.toml -+++ b/launchers/rust-launcher/Cargo.toml -@@ -2,7 +2,3 @@ - name = "launcher" - version = "2.0.0" - authors = ["https://github.com/AdoptOpenJDK/icedtea-web/graphs/contributors"] -- --[dependencies] --[target.'cfg(windows)'.dependencies] --dunce = "1.0.0" - diff --git a/sources b/sources index 07bbecd..f6bcffa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (icedtea-web-2.0.0-alpha16.tar.gz) = a9539d3616894c408d2460de29658f40bf656687c88f1eb3b5f456f578e956cfe0b53395ffcdd192855ba523dd0e2d0e3797febc6a0606eb4f4575596a57e340 +SHA512 (icedtea-web-1.8.8.tar.gz) = 99f246ce603e3edd4357a2c4d280f1ef92e1f760ca5d843eaccf7ca60950a47defec64eed87dac26c5c2e9776bed2f3e53f2c8793dabd47e1b5fc82823190dcc diff --git a/usePathJdkForDifferentBuildAndRuntimeJre.patch b/usePathJdkForDifferentBuildAndRuntimeJre.patch deleted file mode 100644 index 7b446f4..0000000 --- a/usePathJdkForDifferentBuildAndRuntimeJre.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur "icedtea-web-master (copy)/launchers/build.sh" icedtea-web-master/launchers/build.sh ---- "icedtea-web-master (copy)/launchers/build.sh" 2020-05-07 21:52:58.000000000 +0200 -+++ icedtea-web-master/launchers/build.sh 2020-05-10 12:43:53.550337991 +0200 -@@ -129,7 +129,7 @@ - -e "s|[@]MICRO_VERSION[@]|$MICRO_VERSION|g" \ - -e "s/[@]PACKAGE_VERSION[@]/$PACKAGE_VERSION/g" \ - $WIN_INSTALLER_DIR/installer.json.in > $TARGET_TMP/itw-installer.json -- "$JRE/bin/java" -jar "$WIXGEN_JAR" "$TARGET_IMAGES/`imageName $WIN_SUFFIX`" -c $TARGET_TMP/itw-installer.json -o $TARGET_TMP/itw-installer.wxs -+ "java" -jar "$WIXGEN_JAR" "$TARGET_IMAGES/`imageName $WIN_SUFFIX`" -c $TARGET_TMP/itw-installer.json -o $TARGET_TMP/itw-installer.wxs - pushd $TARGET_TMP - "$WIX_TOOLSET_DIR/candle.exe" -nologo itw-installer.wxs - "$WIX_TOOLSET_DIR/light.exe" -nologo -sval -ext WixUIExtension itw-installer.wixobj -diff -Naur "icedtea-web-master (copy)/launchers/configure.sh" icedtea-web-master/launchers/configure.sh ---- "icedtea-web-master (copy)/launchers/configure.sh" 2020-05-07 21:40:57.000000000 +0200 -+++ icedtea-web-master/launchers/configure.sh 2020-05-10 12:44:06.163463501 +0200 -@@ -75,7 +75,7 @@ - - if [ "x$ITW_LIBS" == "xDISTRIBUTION" ] ; then - readonly JAVAWS_SRC=`ls $PROJECT_TOP/artifact-no-dependencies/target/icedtea-web-no-dependencies-*.jar | grep -v sources | grep -v javadoc | grep -v shaded` -- readonly OPTIONS_COMMAND="$JRE/bin/java -cp -+ readonly OPTIONS_COMMAND="java -cp - `ls $PROJECT_TOP/artifact-all-dependencies/target/icedtea-web-all-dependencies-*.jar | grep -v sources | grep -v javadoc | grep -v shaded` - net.adoptopenjdk.icedteaweb.commandline.CommandLineOptionsDefinition" ; - else -diff -Naur "icedtea-web-master (copy)/launchers/utils.sh" icedtea-web-master/launchers/utils.sh ---- "icedtea-web-master (copy)/launchers/utils.sh" 2020-05-07 21:44:56.000000000 +0200 -+++ icedtea-web-master/launchers/utils.sh 2020-05-10 12:45:32.689324481 +0200 -@@ -140,7 +140,7 @@ - local WIN_LOC_OVERWRITE="-Duser.language=$ID -Duser.country=$COUNTRY -Dfile.encoding=$ENCOD" - fi - mkdir -p $langDir -- "$JRE"/bin/java \ -+ java \ - $WIN_LOC_OVERWRITE \ - -cp `createCp $JAVAWS_SRC` \ - net.sourceforge.jnlp.util.docprovider.TextsProvider \