From 8a1801adbf90e467093750cbe3bc87ebed6282bdfae209824f4b96485d2c7c7f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 17 Oct 2018 19:42:17 +0000 Subject: [PATCH] Accepting request 642712 from home:fstrba:branches:Java:packages OBS-URL: https://build.opensuse.org/request/show/642712 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=117 --- ant-antlr.changes | 22 ++++++++++++++++++++++ ant-antlr.spec | 40 ++++++++++++++++++++-------------------- ant-junit.changes | 22 ++++++++++++++++++++++ ant-junit.spec | 40 ++++++++++++++++++++-------------------- ant.changes | 7 +++++++ ant.spec | 33 ++++++++++++++++----------------- 6 files changed, 107 insertions(+), 57 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index 5d02b16..e380e8c 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba + +- Require javapackages-local in order to generate correctly the + maven requires and provides +- Install maven artifacts + +------------------------------------------------------------------- +Fri Aug 24 20:20:20 UTC 2018 - Jason Sikes + +- Update to 1.9.13 + * Fixes a regression in the "get" task where redirects + from a HTTP resource to a HTTPS resource started throwing + an exception. + Bugzilla Report 62499 + + * the new allowFilesToEscapeDest didn't work when set to false and + archive entries contained relative paths with so many ".." + segnments that the resulting path would go beyond the file system + root. + Bugzilla Report 62502, bsc#1100053, CVE-2018-10886 + ------------------------------------------------------------------- Tue May 15 05:02:22 UTC 2018 - fstrba@suse.com diff --git a/ant-antlr.spec b/ant-antlr.spec index 826aabd..561846c 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -29,7 +29,7 @@ Release: 0 Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building -Url: http://ant.apache.org/ +URL: http://ant.apache.org/ Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 Source1: apache-ant-1.8.ant.conf Source1000: pre_checkin.sh @@ -44,6 +44,7 @@ Patch6: reproducible-build-date.patch Patch7: ant-python3.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: unzip BuildRequires: xml-commons-apis-bootstrap @@ -451,17 +452,15 @@ do [ $jarname == ant-bootstrap ] && continue #install pom -%if !%{with bootstrap} install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" %add_maven_depmap ${pomname} ${destname}${jarname}.jar -%endif done %if %{with bootstrap} #ant-parent pom -#install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -#%add_maven_depmap JPP-ant-parent.pom +install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom +%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat @@ -532,11 +531,12 @@ find %{buildroot}%{_datadir}/ant%{_sysconfdir} -type f -name "*.xsl" \ -print -delete %endif # remove *.orig -rm -rf %{buildroot}/usr/bin/ant.orig +rm -rf %{buildroot}%{_bindir}/ant.orig %if %{with bootstrap} %files -%doc KEYS LICENSE NOTICE README WHATSNEW +%license LICENSE +%doc KEYS NOTICE README WHATSNEW %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/antRun @@ -562,15 +562,15 @@ rm -rf %{buildroot}/usr/bin/ant.orig %{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-launcher.jar %dir %{_sysconfdir}/ant.d -#%{_mavenpomdir}/JPP-ant-launcher.pom -#%{_mavenpomdir}/JPP-ant-parent.pom -#%{_mavenpomdir}/JPP-ant.pom -#%if %{defined _maven_repository} -#%config(noreplace) %{_mavendepmapfragdir}/ant -#%else -#%{_datadir}/maven-metadata/ant.xml -#%endif -#%dir %{_mavenpomdir} +%{_mavenpomdir}/JPP-ant-launcher.pom +%{_mavenpomdir}/JPP-ant-parent.pom +%{_mavenpomdir}/JPP-ant.pom +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/ant +%else +%{_datadir}/maven-metadata/ant.xml +%endif +%dir %{_mavenpomdir} %endif @@ -611,14 +611,14 @@ rm -rf %{buildroot}/usr/bin/ant.orig %{_javadir}/ant/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf -#%{_mavenpomdir}/JPP.ant-ant-jmf.pom +%{_mavenpomdir}/JPP.ant-ant-jmf.pom %files -n ant-swing %{_javadir}/ant/ant-swing.jar %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing -#%{_mavenpomdir}/JPP.ant-ant-swing.pom -#%dir %{_mavenpomdir} +%{_mavenpomdir}/JPP.ant-ant-swing.pom +%dir %{_mavenpomdir} %files -n ant-scripts %defattr(0755,root,root,0755) diff --git a/ant-junit.changes b/ant-junit.changes index 5d02b16..e380e8c 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba + +- Require javapackages-local in order to generate correctly the + maven requires and provides +- Install maven artifacts + +------------------------------------------------------------------- +Fri Aug 24 20:20:20 UTC 2018 - Jason Sikes + +- Update to 1.9.13 + * Fixes a regression in the "get" task where redirects + from a HTTP resource to a HTTPS resource started throwing + an exception. + Bugzilla Report 62499 + + * the new allowFilesToEscapeDest didn't work when set to false and + archive entries contained relative paths with so many ".." + segnments that the resulting path would go beyond the file system + root. + Bugzilla Report 62502, bsc#1100053, CVE-2018-10886 + ------------------------------------------------------------------- Tue May 15 05:02:22 UTC 2018 - fstrba@suse.com diff --git a/ant-junit.spec b/ant-junit.spec index c86557e..98e9cd8 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -29,7 +29,7 @@ Release: 0 Summary: Optional junit tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Url: http://ant.apache.org/ +URL: http://ant.apache.org/ Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 Source1: apache-ant-1.8.ant.conf Source1000: pre_checkin.sh @@ -44,6 +44,7 @@ Patch6: reproducible-build-date.patch Patch7: ant-python3.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: unzip BuildRequires: xml-commons-apis-bootstrap @@ -451,17 +452,15 @@ do [ $jarname == ant-bootstrap ] && continue #install pom -%if !%{with bootstrap} install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" %add_maven_depmap ${pomname} ${destname}${jarname}.jar -%endif done %if %{with bootstrap} #ant-parent pom -#install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -#%add_maven_depmap JPP-ant-parent.pom +install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom +%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat @@ -532,11 +531,12 @@ find %{buildroot}%{_datadir}/ant%{_sysconfdir} -type f -name "*.xsl" \ -print -delete %endif # remove *.orig -rm -rf %{buildroot}/usr/bin/ant.orig +rm -rf %{buildroot}%{_bindir}/ant.orig %if %{with bootstrap} %files -%doc KEYS LICENSE NOTICE README WHATSNEW +%license LICENSE +%doc KEYS NOTICE README WHATSNEW %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/antRun @@ -562,15 +562,15 @@ rm -rf %{buildroot}/usr/bin/ant.orig %{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-launcher.jar %dir %{_sysconfdir}/ant.d -#%{_mavenpomdir}/JPP-ant-launcher.pom -#%{_mavenpomdir}/JPP-ant-parent.pom -#%{_mavenpomdir}/JPP-ant.pom -#%if %{defined _maven_repository} -#%config(noreplace) %{_mavendepmapfragdir}/ant -#%else -#%{_datadir}/maven-metadata/ant.xml -#%endif -#%dir %{_mavenpomdir} +%{_mavenpomdir}/JPP-ant-launcher.pom +%{_mavenpomdir}/JPP-ant-parent.pom +%{_mavenpomdir}/JPP-ant.pom +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/ant +%else +%{_datadir}/maven-metadata/ant.xml +%endif +%dir %{_mavenpomdir} %endif @@ -611,14 +611,14 @@ rm -rf %{buildroot}/usr/bin/ant.orig %{_javadir}/ant/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf -#%{_mavenpomdir}/JPP.ant-ant-jmf.pom +%{_mavenpomdir}/JPP.ant-ant-jmf.pom %files -n ant-swing %{_javadir}/ant/ant-swing.jar %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing -#%{_mavenpomdir}/JPP.ant-ant-swing.pom -#%dir %{_mavenpomdir} +%{_mavenpomdir}/JPP.ant-ant-swing.pom +%dir %{_mavenpomdir} %files -n ant-scripts %defattr(0755,root,root,0755) diff --git a/ant.changes b/ant.changes index 07d827c..e380e8c 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba + +- Require javapackages-local in order to generate correctly the + maven requires and provides +- Install maven artifacts + ------------------------------------------------------------------- Fri Aug 24 20:20:20 UTC 2018 - Jason Sikes diff --git a/ant.spec b/ant.spec index e8ef4ce..98d4dd1 100644 --- a/ant.spec +++ b/ant.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -43,6 +43,7 @@ Patch6: reproducible-build-date.patch Patch7: ant-python3.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: unzip BuildRequires: xml-commons-apis-bootstrap @@ -450,17 +451,15 @@ do [ $jarname == ant-bootstrap ] && continue #install pom -%if !%{with bootstrap} install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" %add_maven_depmap ${pomname} ${destname}${jarname}.jar -%endif done %if %{with bootstrap} #ant-parent pom -#install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -#%add_maven_depmap JPP-ant-parent.pom +install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom +%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat @@ -562,15 +561,15 @@ rm -rf %{buildroot}%{_bindir}/ant.orig %{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-launcher.jar %dir %{_sysconfdir}/ant.d -#%{_mavenpomdir}/JPP-ant-launcher.pom -#%{_mavenpomdir}/JPP-ant-parent.pom -#%{_mavenpomdir}/JPP-ant.pom -#%if %{defined _maven_repository} -#%config(noreplace) %{_mavendepmapfragdir}/ant -#%else -#%{_datadir}/maven-metadata/ant.xml -#%endif -#%dir %{_mavenpomdir} +%{_mavenpomdir}/JPP-ant-launcher.pom +%{_mavenpomdir}/JPP-ant-parent.pom +%{_mavenpomdir}/JPP-ant.pom +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/ant +%else +%{_datadir}/maven-metadata/ant.xml +%endif +%dir %{_mavenpomdir} %endif @@ -611,14 +610,14 @@ rm -rf %{buildroot}%{_bindir}/ant.orig %{_javadir}/ant/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf -#%{_mavenpomdir}/JPP.ant-ant-jmf.pom +%{_mavenpomdir}/JPP.ant-ant-jmf.pom %files -n ant-swing %{_javadir}/ant/ant-swing.jar %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing -#%{_mavenpomdir}/JPP.ant-ant-swing.pom -#%dir %{_mavenpomdir} +%{_mavenpomdir}/JPP.ant-ant-swing.pom +%dir %{_mavenpomdir} %files -n ant-scripts %defattr(0755,root,root,0755)