From bc49f94983ae6a33aaba4864ba235f590b0b173d Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: May 29 2023 10:59:57 +0000 Subject: Unretirement request: https://pagure.io/releng/issue/11440 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d3416e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,48 @@ +/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 diff --git a/altjava.patch b/altjava.patch new file mode 100644 index 0000000..400060e --- /dev/null +++ b/altjava.patch @@ -0,0 +1,40 @@ +--- 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/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/icedtea-web.spec b/icedtea-web.spec new file mode 100644 index 0000000..4c4da74 --- /dev/null +++ b/icedtea-web.spec @@ -0,0 +1,720 @@ +#can rust have debuginfo? Verify and fix! Likely issue in Makefile of itw. +%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} + +%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. + +%package javadoc +Summary: API documentation for IcedTea-Web +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description javadoc +This package contains Javadocs for the IcedTea-Web project. + + +%package devel +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. + +%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 + + +%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 + +%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 + +%check +# takes long, and fails anyway +# appstream-util validate $RPM_BUILD_ROOT/%{_datadir}/appdata/*.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 + + +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 || : + +%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 || : +fi +exit 0 + +%files -f %{name}.lang +%{_sysconfdir}/bash_completion.d/* +%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 + + +%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 + +* Fri Jul 10 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha13.patched1.5 +- 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 + +* 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-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 +- 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 +- Bump to 1.8 + +* Tue Feb 26 2019 - Jiri Vanek -1.8pre-0.2 +- itw-modularjdk.args marked as config(norepalce) + +* 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-10 +- added usptream pathces +- removed most relicts off plugin + +* Mon Jul 16 2018 - Jiri Vanek -1.7.1-8 +- removed rhino + +* Thu May 24 2018 - Jiri Vanek -1.7.1-6 +- removed clang + +* 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 +- 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 +- added buildrequires on gcc/gcc-c++ +- to follow new packaging guidelines which no longer automatically pulls gcc/c++ to build root + +* Wed Feb 07 2018 Fedora Release Engineering - 1.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Dec 18 2017 Jiri Vanek 1.7.1-1 +* bump to 1.7.1 + +* Fri Nov 03 2017 Jiri Vanek 1.7-6 +- javaws specific manpage renmed from -suffix to .suffix + +* Wed Oct 18 2017 Jiri Vanek 1.7-5 +- 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) +- 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 + +* Wed Aug 02 2017 Fedora Release Engineering - 1.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 19 2017 Jiri Vanek 1.7-1 +- updated to itw 1.7 + +* Wed Jul 19 2017 Jiri Vanek 1.7-0.5 +- updated to RC7 + +* Mon May 15 2017 Fedora Release Engineering - 1.7-0.4.pre06 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Fri May 12 2017 Jiri Vanek 1.7-0.3.pre06 +- updated to RC6 +- split bash-copletion +- added sources (to align with upstream binary release) + +* Tue May 02 2017 Jiri Vanek 1.7-0.3.pre05 +- gconf calls silenced by "&> /dev/null || :" +- see rhbz1446932 + +* Fri Apr 28 2017 Jiri Vanek 1.7-0.2.pre05 +- updated to rc5 +- 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 + +* Thu Jan 12 2017 Jiri Vanek 1.7-0.1.pre04 +- updated to rc4 +- fixed RHBZ#1412544 + +* Wed Jan 11 2017 Jiri Vanek 1.7-0.1.pre03 +- 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 + +* 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 + +* 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 + +* Thu Jan 28 2016 Jiri Vanek 1.6.1-66 +- moved to 1.6.2pre + +* Tue Dec 22 2015 Jiri Vanek 1.6.1-5 +- generated maven metadata + +* Thu Nov 19 2015 Jiri Vanek 1.6.1-4 +- installed also javaws metadata + +* Wed Oct 14 2015 Jiri Vanek 1.6.1-3 +- 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 + +* Mon Sep 21 2015 Jiri Vanek 1.6.1-2 +- added and applied patch0 javadocFixes.patch + +* Fri Sep 11 2015 Jiri Vanek 1.6.1-1 +- updated to upstream release 1.6.1 +- metadata xml files enhanced for javaws + +* Mon Jun 22 2015 Omair Majid - 1.6-5 +- Comply with newer java packaging guidelines +- Require javapackages-tools in main package +- Don't require jpackage-utils in -javadoc subpackage, since subpackage + requires the main package + +* Wed Jun 17 2015 Fedora Release Engineering - 1.6-4 +- 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 + +* Wed Apr 29 2015 Jiri Vanek 1.6-2 +- enabled check + +* Tue Apr 28 2015 Jiri Vanek 1.6-1 +- updated to limited audience final release + +* Fri Apr 24 2015 Jiri Vanek 1.6-0.1.pre05 +- updated to pre06 +- 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: Messages from TextsProvider moved to properties +- summary: various improvements to default set of properties +- summary: Added MultipleDeploymentPropertiesModifier improvement to testsuite + +* Fri Apr 17 2015 Jiri Vanek 1.6-0.1.pre05 +- updated to pre05 + +* Tue Apr 14 2015 Jiri Vanek 1.6-0.1.pre04 +- updated to pre04 + +* Mon Mar 16 2015 Jiri Vanek 1.6-0.1.pre03 +- updated to pre03 +- removed cp javaws.png. Handled by upstream now + +* 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 + +* Mon Dec 22 2014 Jiri Vanek 1.6-0.1.pre01 +- update future 1.6 alpha pre01 +- added localised man pages +- removed link to icedtea-web man page (now provided by upstream) + +* Thu Nov 27 2014 Jiri Vanek 1.5.2-0 +- update to upstream 1.5.2 + +* Sat Aug 16 2014 Fedora Release Engineering - 1.5.1-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Aug 15 2014 Jiri Vanek 1.5.1-0 +- update to upstream 1.5.1 +- 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. + +* Mon Jun 09 2014 Omair Majid - 1.5-3 +- Require junit instead of juni4 +- Build against OpenJDK 7 explicitly + +* Sat Jun 07 2014 Fedora Release Engineering - 1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* 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 +- ./configure changed to %%configure,see RH1077287 + +* Mon Apr 07 2014 Jiri Vanek 1.5-1 +- updated to icedtea-web-1.5 + +* Mon Mar 10 2014 Jiri Vanek 1.5-0.8.pre05 +- updated to pre05 + - based on revision 925 + +* Mon Mar 10 2014 Jiri Vanek 1.5-0.4.pre04 +- updated to pre04 + - based on revision 917 + +* Wed Mar 05 2014 Jiri Vanek 1.5-0.3.pre03 +- updated to pre03 + - based on revision 910:0a36108ce4b9 + +* Wed Feb 26 2014 Jiri Vanek 1.5-0.2.pre02 +- 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 + - 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 +- 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 + +* Tue Feb 04 2014 Jiri Vanek 1.4.2-0 +- updated to 1.4.2 +- removed upstreamed patches +- added std=c++11 flag to CXXFLAGS (thanx omajid!) +- removed autoreconf + +* Tue Dec 17 2013 Jiri Vanek 1.4.1-1 +- added and applied patch0, christmasSplash3.diff. Will be upstreamed +- Christmas release for Fedora !-) + +* 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 +- make check enabled again +- should be build for non-standart archs !-) +- removed unused multilib arches (yupii!) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 23 2013 Omair Majid 1.4.0-3 +- Added upstream fix for RH982558 + +* Wed Jun 19 2013 Jiri Vanek 1.4.0-2 +- added patch1 b25-appContextFix.patch to make it run with future openjdk + +* Fri Jun 07 2013 Jiri Vanek 1.4-1 +- Adapted to latest openjdk changes +- added build requires for autoconf and automake +- minor clean up +- 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 + +* 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. + - Common + - 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 + PR1260: IcedTea-Web should not rely on GTK + PR1157: Applets can hang browser after fatal exception +- Removed upstreamed patch to remove GTK dependency + - icedtea-web-pr1260-remove-gtk-dep.patch + +* 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. + +* Thu Feb 14 2013 Fedora Release Engineering - 1.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jan 16 2013 Deepak Bhole 1.3.1-3 +- Resolves: rhbz#889644, rhbz#895197 +- Added patch to remove GTK dependency + +* Thu Dec 20 2012 Jiri Vanek 1.3.1-2 +- Moved to be build with GTK3 + +* Wed Nov 07 2012 Deepak Bhole 1.3.1-1 +- Resolves: RH869040/CVE-2012-4540 + +* Mon Sep 17 2012 Deepak Bhole 1.3-1 +- Updated to 1.3 +- Resolves: rhbz#720836: Epiphany fails to execute Java applets + +* Tue Jul 31 2012 Deepak Bhole 1.2.1-1 +- Updated to 1.2.1 +- Resolves: RH840592/CVE-2012-3422 +- Resolves: RH841345/CVE-2012-3423 + +* Thu Jul 19 2012 Fedora Release Engineering - 1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 03 2012 Deepak Bhole 1.2-4 +- Resolves rhbz#814585 +- Fixed java-plugin provides and added one for javaws + +* Tue Apr 17 2012 Deepak Bhole 1.2-3 +- Updated summary +- Fixed virtual provide + +* Tue Mar 13 2012 Peter Robinson - 1.2-2 +- Enable building on ARM platforms + +* Mon Mar 05 2012 Deepak Bhole 1.2-1 +- Updated to 1.2 + +* Fri Jan 13 2012 Fedora Release Engineering - 1.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Nov 25 2011 Deepak Bhole 1.1.4-3 +- Resolves rhbz#757191 +- 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. + +* 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 + +* Thu Sep 01 2011 Deepak Bhole 1.1.2-1 +- Updated to 1.1.2 +- Removed all patches (now upstream) +- Resolves: rhbz# 734890 + +* Tue Aug 23 2011 Deepak Bhole 1.1.1-3 +- Added patch to allow install to jre dir +- Fixed requirement for java-1.7.0-openjdk + +* Tue Aug 09 2011 Deepak Bhole 1.1.1-2 +- Fixed file ownership so that debuginfo is not in main package + +* Wed Aug 03 2011 Deepak Bhole 1.1.1-1 +- Bump to 1.1.1 +- Added patch for PR768 and PR769 + +* Wed Jul 20 2011 Deepak Bhole 1.0.4-1 +- Bump to 1.0.4 +- Fixed rhbz#718164: Home directory path disclosure to untrusted applications +- Fixed rhbz#718170: Java Web Start security warning dialog manipulation + +* Mon Jun 13 2011 Deepak Bhole 1.0.3-1 +- Update to 1.0.3 +- Resolves: rhbz#691259 + +* Mon Apr 04 2011 Deepak Bhole 1.0.2-2 +- Fixed incorrect macro value for min_openjdk_version +- Use posttrans instead of post, so that upgrade from old plugin works + +* Mon Apr 04 2011 Deepak Bhole 1.0.2-1 +- Initial build diff --git a/launchersPhase.patch b/launchersPhase.patch new file mode 100644 index 0000000..7c917e4 --- /dev/null +++ b/launchersPhase.patch @@ -0,0 +1,12 @@ +--- launchers/pom.xml ++++ launchers/pom.xml +@@ -52,7 +52,7 @@ + + + build-launchers +- install ++ verify + + exec + + diff --git a/patchOutDunce.patch b/patchOutDunce.patch new file mode 100644 index 0000000..20caa78 --- /dev/null +++ b/patchOutDunce.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000..07bbecd --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (icedtea-web-2.0.0-alpha16.tar.gz) = a9539d3616894c408d2460de29658f40bf656687c88f1eb3b5f456f578e956cfe0b53395ffcdd192855ba523dd0e2d0e3797febc6a0606eb4f4575596a57e340 diff --git a/usePathJdkForDifferentBuildAndRuntimeJre.patch b/usePathJdkForDifferentBuildAndRuntimeJre.patch new file mode 100644 index 0000000..7b446f4 --- /dev/null +++ b/usePathJdkForDifferentBuildAndRuntimeJre.patch @@ -0,0 +1,36 @@ +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 \