diff --git a/ant-antlr.spec b/ant-antlr.spec index 38c9330..826aabd 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -24,7 +24,7 @@ %bcond_with junit %bcond_without antlr Name: ant-antlr -Version: 1.9.10 +Version: 1.9.13 Release: 0 Summary: Antlr Task for ant License: Apache-2.0 diff --git a/ant-junit.spec b/ant-junit.spec index 889c709..c86557e 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -24,7 +24,7 @@ %bcond_without junit %bcond_with antlr Name: ant-junit -Version: 1.9.10 +Version: 1.9.13 Release: 0 Summary: Optional junit tasks for ant License: Apache-2.0 diff --git a/ant.changes b/ant.changes index 5d02b16..34d3ddd 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Tue May 15 05:02:22 UTC 2018 - fstrba@suse.com diff --git a/ant.spec b/ant.spec index 64a8a82..e8ef4ce 100644 --- a/ant.spec +++ b/ant.spec @@ -23,12 +23,12 @@ %bcond_with junit %bcond_with antlr Name: ant -Version: 1.9.10 +Version: 1.9.13 Release: 0 Summary: Java-based build tool 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 @@ -531,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 diff --git a/apache-ant-1.9.10-src.tar.bz2 b/apache-ant-1.9.10-src.tar.bz2 deleted file mode 100644 index a6f7ed3..0000000 --- a/apache-ant-1.9.10-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:897b9fddde547f7fa33093cfe2dbfb9cd5b22e9ed22e8b41fab4fb99d3d5cf9d -size 3945430 diff --git a/apache-ant-1.9.10-src.tar.bz2.asc b/apache-ant-1.9.10-src.tar.bz2.asc deleted file mode 100644 index 20bf46c..0000000 --- a/apache-ant-1.9.10-src.tar.bz2.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iFoEABECABoFAlp14BETHGJvZGV3aWdAYXBhY2hlLm9yZwAKCRCiEVrhX2uLcoH0 -AKCM78sM9iRxH3mL3sYStUDYkAxTMACgvcc4r6Om4dqv9Z77nVgO4yec7Fk= -=fcdA ------END PGP SIGNATURE----- diff --git a/apache-ant-1.9.13-src.tar.bz2 b/apache-ant-1.9.13-src.tar.bz2 new file mode 100644 index 0000000..42feaa8 --- /dev/null +++ b/apache-ant-1.9.13-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdefd01c909a69fbeab1c45a815e3a80d86351f61b992dfe2e2191d9b009aaaf +size 3954912 diff --git a/apache-ant-1.9.13-src.tar.bz2.asc b/apache-ant-1.9.13-src.tar.bz2.asc new file mode 100644 index 0000000..8ad0c0f --- /dev/null +++ b/apache-ant-1.9.13-src.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iHEEABECADEWIQTOgHWiUVR77iSbwVGiEVrhX2uLcgUCW0Q0YRMcYm9kZXdpZ0Bh +cGFjaGUub3JnAAoJEKIRWuFfa4tybcAAn1oATFgWAOie3kvfCEmSDx63/s/vAKCI +yP3/ZtUHscFF3h4Y4gMyjPKyhQ== +=J5Fl +-----END PGP SIGNATURE-----