Update apache-ant to 1.10.12. This includes tow CVS makred as low:
CVE-2021-36373 and CVE-2021-36374.

I am currently building all consumers, if that's successful I'll commit
it. Veto?

Rafael

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index d40876161df..2b429539132 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -2,18 +2,17 @@
 
 COMMENT=        build tool for java applications
 
-DISTNAME=      apache-ant-1.10.9
+DISTNAME=      apache-ant-1.10.12
 CATEGORIES=    devel
-REVISION=      0
 
-HOMEPAGE=      http://ant.apache.org/
+HOMEPAGE=      https://ant.apache.org/
 
 # Apache Software License 2.0 &
 # W3C Consortium License (August 14 1998)
 PERMIT_PACKAGE=        Yes
 
 MASTER_SITES=  ${MASTER_SITE_APACHE:=ant/binaries/} \
-               http://archive.apache.org/dist/ant/binaries/
+               https://archive.apache.org/dist/ant/binaries/
 
 EXTRACT_SUFX=  -bin.tar.bz2
 
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index 8957f390820..9cedc98e520 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-ant-1.10.9-bin.tar.bz2) = 
h3xUtCFdwXKCHmNCeYFig2zShgKFSNsCKCLM/dnyaKk=
-SIZE (apache-ant-1.10.9-bin.tar.bz2) = 5405131
+SHA256 (apache-ant-1.10.12-bin.tar.bz2) = 
J26nPyZ6WxpY8C4ute9ZSpsoheM6+wXvmVJR1NGDd6Y=
+SIZE (apache-ant-1.10.12-bin.tar.bz2) = 5424638
diff --git a/devel/apache-ant/pkg/PLIST b/devel/apache-ant/pkg/PLIST
index ac921d2eafd..9fd504e5b14 100644
--- a/devel/apache-ant/pkg/PLIST
+++ b/devel/apache-ant/pkg/PLIST
@@ -239,6 +239,7 @@ share/doc/java/ant/antexternal.html
 share/doc/java/ant/anttaskslist.html
 share/doc/java/ant/api/
 share/doc/java/ant/api/allclasses-index.html
+share/doc/java/ant/api/allclasses.html
 share/doc/java/ant/api/allpackages-index.html
 share/doc/java/ant/api/constant-values.html
 share/doc/java/ant/api/deprecated-list.html
@@ -246,6 +247,40 @@ share/doc/java/ant/api/element-list
 share/doc/java/ant/api/help-doc.html
 share/doc/java/ant/api/index-all.html
 share/doc/java/ant/api/index.html
+share/doc/java/ant/api/jquery/
+share/doc/java/ant/api/jquery/external/
+share/doc/java/ant/api/jquery/external/jquery/
+share/doc/java/ant/api/jquery/external/jquery/jquery.js
+share/doc/java/ant/api/jquery/images/
+share/doc/java/ant/api/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
+share/doc/java/ant/api/jquery/images/ui-bg_glass_65_dadada_1x400.png
+share/doc/java/ant/api/jquery/images/ui-bg_glass_75_dadada_1x400.png
+share/doc/java/ant/api/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
+share/doc/java/ant/api/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
+share/doc/java/ant/api/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+share/doc/java/ant/api/jquery/images/ui-icons_222222_256x240.png
+share/doc/java/ant/api/jquery/images/ui-icons_2e83ff_256x240.png
+share/doc/java/ant/api/jquery/images/ui-icons_454545_256x240.png
+share/doc/java/ant/api/jquery/images/ui-icons_888888_256x240.png
+share/doc/java/ant/api/jquery/images/ui-icons_cd0a0a_256x240.png
+share/doc/java/ant/api/jquery/jquery-3.3.1.js
+share/doc/java/ant/api/jquery/jquery-migrate-3.0.1.js
+share/doc/java/ant/api/jquery/jquery-ui.css
+share/doc/java/ant/api/jquery/jquery-ui.js
+share/doc/java/ant/api/jquery/jquery-ui.min.css
+share/doc/java/ant/api/jquery/jquery-ui.min.js
+share/doc/java/ant/api/jquery/jquery-ui.structure.css
+share/doc/java/ant/api/jquery/jquery-ui.structure.min.css
+share/doc/java/ant/api/jquery/jszip/
+share/doc/java/ant/api/jquery/jszip-utils/
+share/doc/java/ant/api/jquery/jszip-utils/dist/
+share/doc/java/ant/api/jquery/jszip-utils/dist/jszip-utils-ie.js
+share/doc/java/ant/api/jquery/jszip-utils/dist/jszip-utils-ie.min.js
+share/doc/java/ant/api/jquery/jszip-utils/dist/jszip-utils.js
+share/doc/java/ant/api/jquery/jszip-utils/dist/jszip-utils.min.js
+share/doc/java/ant/api/jquery/jszip/dist/
+share/doc/java/ant/api/jquery/jszip/dist/jszip.js
+share/doc/java/ant/api/jquery/jszip/dist/jszip.min.js
 share/doc/java/ant/api/member-search-index.js
 share/doc/java/ant/api/member-search-index.zip
 share/doc/java/ant/api/org/
@@ -1300,6 +1335,7 @@ 
share/doc/java/ant/api/org/apache/tools/ant/types/resources/AbstractResourceColl
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/AllButFirst.html
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/AllButLast.html
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/Appendable.html
+share/doc/java/ant/api/org/apache/tools/ant/types/resources/AppendableResourceCollection.html
 
share/doc/java/ant/api/org/apache/tools/ant/types/resources/ArchiveResource.html
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/Archives.html
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/BCFileSet.html
@@ -1478,6 +1514,7 @@ 
share/doc/java/ant/api/org/apache/tools/ant/util/LinkedHashtable.html
 share/doc/java/ant/api/org/apache/tools/ant/util/LoaderUtils.html
 share/doc/java/ant/api/org/apache/tools/ant/util/MergingMapper.html
 share/doc/java/ant/api/org/apache/tools/ant/util/Native2AsciiUtils.html
+share/doc/java/ant/api/org/apache/tools/ant/util/NullOutputStream.html
 share/doc/java/ant/api/org/apache/tools/ant/util/OutputStreamFunneler.html
 share/doc/java/ant/api/org/apache/tools/ant/util/PackageNameMapper.html
 share/doc/java/ant/api/org/apache/tools/ant/util/PermissionUtils.FileType.html
@@ -1623,44 +1660,10 @@ share/doc/java/ant/api/package-search-index.zip
 share/doc/java/ant/api/resources/
 share/doc/java/ant/api/resources/glass.png
 share/doc/java/ant/api/resources/x.png
-share/doc/java/ant/api/script-dir/
-share/doc/java/ant/api/script-dir/external/
-share/doc/java/ant/api/script-dir/external/jquery/
-share/doc/java/ant/api/script-dir/external/jquery/jquery.js
-share/doc/java/ant/api/script-dir/images/
-share/doc/java/ant/api/script-dir/images/ui-bg_glass_55_fbf9ee_1x400.png
-share/doc/java/ant/api/script-dir/images/ui-bg_glass_65_dadada_1x400.png
-share/doc/java/ant/api/script-dir/images/ui-bg_glass_75_dadada_1x400.png
-share/doc/java/ant/api/script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png
-share/doc/java/ant/api/script-dir/images/ui-bg_glass_95_fef1ec_1x400.png
-share/doc/java/ant/api/script-dir/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-share/doc/java/ant/api/script-dir/images/ui-icons_222222_256x240.png
-share/doc/java/ant/api/script-dir/images/ui-icons_2e83ff_256x240.png
-share/doc/java/ant/api/script-dir/images/ui-icons_454545_256x240.png
-share/doc/java/ant/api/script-dir/images/ui-icons_888888_256x240.png
-share/doc/java/ant/api/script-dir/images/ui-icons_cd0a0a_256x240.png
-share/doc/java/ant/api/script-dir/jquery-3.4.1.js
-share/doc/java/ant/api/script-dir/jquery-ui.css
-share/doc/java/ant/api/script-dir/jquery-ui.js
-share/doc/java/ant/api/script-dir/jquery-ui.min.css
-share/doc/java/ant/api/script-dir/jquery-ui.min.js
-share/doc/java/ant/api/script-dir/jquery-ui.structure.css
-share/doc/java/ant/api/script-dir/jquery-ui.structure.min.css
-share/doc/java/ant/api/script-dir/jszip/
-share/doc/java/ant/api/script-dir/jszip-utils/
-share/doc/java/ant/api/script-dir/jszip-utils/dist/
-share/doc/java/ant/api/script-dir/jszip-utils/dist/jszip-utils-ie.js
-share/doc/java/ant/api/script-dir/jszip-utils/dist/jszip-utils-ie.min.js
-share/doc/java/ant/api/script-dir/jszip-utils/dist/jszip-utils.js
-share/doc/java/ant/api/script-dir/jszip-utils/dist/jszip-utils.min.js
-share/doc/java/ant/api/script-dir/jszip/dist/
-share/doc/java/ant/api/script-dir/jszip/dist/jszip.js
-share/doc/java/ant/api/script-dir/jszip/dist/jszip.min.js
 share/doc/java/ant/api/script.js
 share/doc/java/ant/api/search.js
 share/doc/java/ant/api/serialized-form.html
 share/doc/java/ant/api/stylesheet.css
-share/doc/java/ant/api/system-properties.html
 share/doc/java/ant/api/type-search-index.js
 share/doc/java/ant/api/type-search-index.zip
 share/doc/java/ant/argumentprocessor.html

Reply via email to