Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at 2023-10-10 21:01:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icedtea-web (Old) and /work/SRC/openSUSE:Factory/.icedtea-web.new.28202 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icedtea-web" Tue Oct 10 21:01:09 2023 rev:35 rq:1116672 version:1.8.8 Changes: -------- --- /work/SRC/openSUSE:Factory/icedtea-web/icedtea-web.changes 2022-03-29 19:45:35.680134400 +0200 +++ /work/SRC/openSUSE:Factory/.icedtea-web.new.28202/icedtea-web.changes 2023-10-10 21:02:42.043305256 +0200 @@ -1,0 +2,13 @@ +Mon Oct 9 15:40:00 UTC 2023 - Fridrich Strba <[email protected]> + +- Added patch: + * more-java-versions.patch + + Allow building with all java versions >= 8 that have the + Pack200 class + +------------------------------------------------------------------- +Mon Oct 9 10:51:55 UTC 2023 - Fridrich Strba <[email protected]> + +- Fetch sources using source service + +------------------------------------------------------------------- Old: ---- IcedTea-Web-icedtea-web-1.8.8.tar.gz New: ---- _service icedtea-web-1.8.8.tar.xz more-java-versions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ --- /var/tmp/diff_new_pack.KNFvDk/_old 2023-10-10 21:02:43.311351239 +0200 +++ /var/tmp/diff_new_pack.KNFvDk/_new 2023-10-10 21:02:43.311351239 +0200 @@ -1,7 +1,7 @@ # # spec file for package icedtea-web # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,6 @@ %define binsuffix .itweb # Alternatives priority %define priority 18000 -%bcond_without docs -%bcond_with plugin Name: icedtea-web Version: 1.8.8 Release: 0 @@ -31,8 +29,9 @@ License: GPL-2.0-only WITH Classpath-exception-2.0 Group: Development/Languages/Java URL: https://github.com/AdoptOpenJDK/IcedTea-Web -Source0: https://github.com/AdoptOpenJDK/IcedTea-Web/archive/icedtea-web-%{version}.tar.gz#/IcedTea-Web-icedtea-web-%{version}.tar.gz +Source0: %{name}-%{version}.tar.xz Patch0: icedtea-web-suse-desktop-files.patch +Patch1: more-java-versions.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bc @@ -48,9 +47,9 @@ BuildRequires: rhino BuildRequires: tagsoup BuildRequires: zip -BuildConflicts: java >= 11 -BuildConflicts: java-devel >= 11 -BuildConflicts: java-headless >= 11 +BuildConflicts: java >= 14 +BuildConflicts: java-devel >= 14 +BuildConflicts: java-headless >= 14 Requires: java >= 1.8 Requires: rhino Requires: tagsoup @@ -67,18 +66,12 @@ Provides: java-1_8_0-openjdk-plugin = %{version}-%{release} Provides: java-1_9_0-openjdk-plugin = %{version}-%{release} Provides: java-plugin = 1.8.0 -%if %{with plugin} -BuildRequires: gcc-c++ -BuildRequires: glib2-devel -BuildRequires: npapi-sdk -%endif %description The IcedTea-Web project provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project. -%if %{with docs} %package javadoc Summary: Java Web Start and plugin implementation (API documentation) Group: Documentation/Other @@ -91,15 +84,14 @@ This package contains API documentation for the %{name} Java Web Start and plugin implementation. -%endif - %prep -%setup -q -n IcedTea-Web-icedtea-web-%{version} +%setup -q %patch0 -p1 +%patch1 -p1 + +rm -rf netx/net/sourceforge/jnlp/NetxPanel.java netx/sun -%if %{with docs} rm -f netx/net/sourceforge/jnlp/util/WindowsDesktopEntry.java -%endif %build autoreconf -fiv @@ -108,19 +100,11 @@ --with-jdk-home=%{javadir} \ --with-jre-home=%{jredir} \ --docdir=%{_javadocdir}/%{name} \ -%if %{with plugin} - --enable-native-plugin \ - --libdir=%{_libdir}/%{name} \ -%else --disable-native-plugin \ -%endif + --disable-pluginjar \ --enable-shell-launchers \ --with-itw-libs=BUNDLED \ -%if %{with docs} --enable-docs \ -%else - --disable-docs \ -%endif --with-modularjdk-file=%{_datadir}/%{name} \ --program-suffix=%{binsuffix} \ --with-pkgversion=suse-%{release}-%{_arch} @@ -153,25 +137,12 @@ rm -rf %{buildroot}%{_mandir}/*/man1 -%post -%if %{with plugin} -update-alternatives \ - --install %{_libdir}/browser-plugins/libjavaplugin.so %{javaplugin} \ - %{_libdir}/%{name}/IcedTeaPlugin.so %{priority} \ - --slave %{_bindir}/javaws javaws %{_bindir}/javaws%{binsuffix}.sh \ - --slave %{_mandir}/man1/javaws.1.gz javaws.1.gz %{_mandir}/man1/javaws%{binsuffix}.1.gz -%endif - %posttrans update-desktop-database &> /dev/null || : exit 0 %postun update-desktop-database &> /dev/null || : -%if %{with plugin} - update-alternatives --remove %{javaplugin} \ - %{_libdir}/IcedTeaPlugin.so -%endif exit 0 %files @@ -194,12 +165,9 @@ %{_libdir}/%{name}/IcedTeaPlugin.so %endif -%if %{with docs} %files javadoc %license COPYING %doc NEWS README %dir %{_javadocdir}/%{name} %{_javadocdir}/%{name}/* -%endif - ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/AdoptOpenJDK/IcedTea-Web.git</param> <param name="revision">icedtea-web-1.8.8</param> <param name="match-tag">icedtea-web-*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">icedtea-web-(.*)</param> <param name="filename">icedtea-web</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ more-java-versions.patch ++++++ diff --git a/Makefile.am b/Makefile.am index e44070c..fd0a2eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -238,10 +238,10 @@ export NETX_PKGS = javax.jnlp net.sourceforge.nanoxml net.sourceforge.jnlp \ 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 NETX_PKGS = ${NETX_PKGS} sun.applet export ICEDTEAPLUGIN_TARGET = stamps/liveconnect-dist.stamp export PLUGIN_DIR=$(TOP_BUILD_DIR)/plugin/icedteanp export PLUGIN_SRCDIR=$(TOP_SRC_DIR)/plugin/icedteanp @@ -956,11 +956,18 @@ stamps/netx-dist.stamp: stamps/netx.stamp $(TOP_BUILD_DIR)/netx.manifest stamps/ (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) +if ENABLE_PLUGINJAR + (cd $(NETX_DIR) ; \ + $(SYSTEM_JDK_DIR)/bin/jar uf lib/classes.jar sun \ + $(TOP_BUILD_DIR)/netx.manifest javax/jnlp net; \ + cd src ; \ + $(ZIP) -qr $(NETX_DIR)/lib/src.zip sun) +endif mkdir -p stamps touch $@ diff --git a/configure.ac b/configure.ac index b6710ed..c6daab2 100644 --- a/configure.ac +++ b/configure.ac @@ -186,9 +186,11 @@ if test "x$build_windows" = xyes ; then 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]) +if test "$enable_pluginjar" = yes ; then + IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef], [sun.applet], [$JAVA_DESKTOP]) + IT_CHECK_FOR_SUN_APPLET_ACCESSIBILITY +fi -IT_CHECK_FOR_SUN_APPLET_ACCESSIBILITY IT_CHECK_GLIB_VERSION IT_CHECK_XULRUNNER_MIMEDESCRIPTION_CONSTCHAR IT_CHECK_XULRUNNER_REQUIRES_C11 diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java index 6196a9e..fab17a8 100644 --- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java +++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java @@ -18,6 +18,7 @@ package net.sourceforge.jnlp.runtime; import static net.sourceforge.jnlp.runtime.Translator.R; +import java.awt.AWTPermission; import java.awt.Window; import java.net.SocketPermission; import java.security.AccessControlException; @@ -343,7 +344,6 @@ class JNLPSecurityManager extends SecurityManager { * 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(); @@ -362,7 +362,12 @@ class JNLPSecurityManager extends SecurityManager { // todo: set awt.appletWarning to custom message // todo: logo on with glass pane on JFrame/JWindow? - return super.checkTopLevelWindow(window); + try { + checkPermission(new AWTPermission("showWindowWithoutWarningBanner")); + return true; + } catch (Exception se) { + return false; + } } /** @@ -432,7 +437,6 @@ class JNLPSecurityManager extends SecurityManager { * @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 @@ -446,7 +450,7 @@ class JNLPSecurityManager extends SecurityManager { // If we're about to allow access to the main EventQueue, // and anything untrusted is on the class context stack, // disallow access. - super.checkAwtEventQueueAccess(); + checkPermission(new AWTPermission("accessEventQueue")); // } }
