!5 update to 1.10.8 to fix CVE-2020-1945

From: @zhanghua1831
Reviewed-by: @rita_dong
Signed-off-by: @rita_dong

ant.spec

@@ -3,12 +3,12 @@
 
 Name:           ant
 Summary:        A Java-based build tool
-Version:        1.10.5
+Version:        1.10.8
-Release:        7
+Release:        1
 Epoch:          0
 License:        ASL 2.0
 URL:            https://ant.apache.org/
-Source0:        https://archive.apache.org/dist/ant/source/apache-ant-1.10.5-src.tar.bz2
+Source0:        https://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
 Source2:        apache-ant-1.8.ant.conf
 
 BuildRequires:  javapackages-local java-devel >= 1:1.8.0 ant >= 1.10.2
@@ -128,6 +128,12 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 %description apache-xalan2
 Optional apache xalan2 tasks for %{name}.
 
+%package imageio
+Summary:Optional imageio tasks for %{name}
+Requires:%{name} = %{epoch}:%{version}-%{release}
+
+%description imageio
+Optional imageio tasks for %{name}.
 
 %package javamail
 Summary:        Optional javamail tasks for %{name}
@@ -225,6 +231,8 @@ ln -sf LICENSE.utf8 LICENSE
 %pom_xpath_remove pom:optional src/etc/poms/%{name}-antlr/pom.xml
 %pom_xpath_inject 'target[@name="javadocs"]/javadoc/packageset' '<exclude name="**/junitlauncher"/>' build.xml
 
+%pom_change_dep -r com.sun.mail:jakarta.mail javax.mail:mail src/etc/poms/ant-javamail/pom.xml
+
 %build
 %{ant} jars test-jar
 %{ant} javadocs
@@ -274,6 +282,7 @@ echo "log4j12 %{name}/%{name}-apache-log4j" > %{buildroot}%{_sysconfdir}/%{name}
 echo "oro %{name}/%{name}-apache-oro" > %{buildroot}%{_sysconfdir}/%{name}.d/apache-oro
 echo "regexp %{name}/%{name}-apache-regexp" > %{buildroot}%{_sysconfdir}/%{name}.d/apache-regexp
 echo "xalan-j2 xalan-j2-serializer %{name}/%{name}-apache-xalan2" > %{buildroot}%{_sysconfdir}/%{name}.d/apache-xalan2
+echo "ant/ant-imageio" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/imageio
 echo "javamail jaf %{name}/%{name}-javamail" > %{buildroot}%{_sysconfdir}/%{name}.d/javamail
 echo "jdepend %{name}/%{name}-jdepend" > %{buildroot}%{_sysconfdir}/%{name}.d/jdepend
 echo "jsch %{name}/%{name}-jsch" > %{buildroot}%{_sysconfdir}/%{name}.d/jsch
@@ -365,6 +374,10 @@ LC_ALL=en_US.utf8 %{ant} test
 %{ant_home}/lib/%{name}-apache-xalan2.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-xalan2
 
+%files imageio -f .mfiles-imageio
+%{ant_home}/lib/%{name}-imageio.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/imageio
+
 %files javamail -f .mfiles-javamail
 %{ant_home}/lib/%{name}-javamail.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/javamail
@@ -409,6 +422,9 @@ LC_ALL=en_US.utf8 %{ant} test
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Sep 9 2020 zhanghua<zhanghua40@huawei.com> - 0:1.10.8-1
+- update to 1.10.8
+
 * Sat Mar 14 2020 zhujunhao<zhujunhao5@huawei.com> - 0:1.10.5-7
 - Split ant pack into subpackets