rpms/ant
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 1.10.13

Browse Source
This commit is contained in:
Marian Koncek 2023-03-30 13:19:04 +02:00
parent 95d653fb7c
commit 017a0402ce
4 changed files with 25 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -26,3 +26,4 @@
/apache-ant-1.10.9-src.tar.bz2
/apache-ant-1.10.11-src.tar.bz2
/apache-ant-1.10.12-src.tar.bz2
/apache-ant-1.10.13-src.tar.bz2

68
0001-Fix-integer-overflow-when-parsing-SOURCE_DATE_EPOCH.patch
View File

@ -1,68 +0,0 @@
From 750924c556fbb0c431e983ec57befb9a7f070685 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 3 Jun 2022 12:43:45 +0200
Subject: [PATCH] Fix integer overflow when parsing SOURCE_DATE_EPOCH
Upstream: https://github.com/apache/ant/pull/186/commits
---
.../org/apache/tools/ant/taskdefs/Tstamp.java | 2 +-
src/tests/antunit/taskdefs/tstamp-test.xml | 31 +++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index aa1034e..ca10efe 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -82,7 +82,7 @@ public class Tstamp extends Task {
try {
if (epoch != null) {
// Value of SOURCE_DATE_EPOCH will be an integer, representing seconds.
- d = new Date(Integer.parseInt(epoch) * 1000);
+ d = new Date(Long.parseLong(epoch) * 1000L);
log("Honouring environment variable " + ENV_SOURCE_DATE_EPOCH + " which has been set to " + epoch);
}
} catch(NumberFormatException e) {
diff --git a/src/tests/antunit/taskdefs/tstamp-test.xml b/src/tests/antunit/taskdefs/tstamp-test.xml
index 20c3227..1553d32 100644
--- a/src/tests/antunit/taskdefs/tstamp-test.xml
+++ b/src/tests/antunit/taskdefs/tstamp-test.xml
@@ -75,4 +75,35 @@ public class IsEpochIn1969Here implements Condition {
<!-- 'iso' overrides 'simple' -->
<au:assertPropertyEquals name="DSTAMP" value="19720417"/>
</target>
+
+ <target name="testSourceDateEpoch">
+ <mkdir dir="${input}"/>
+ <mkdir dir="${output}"/>
+ <echo file="${input}/TstampAntunitTest.java"><![CDATA[
+ import org.apache.tools.ant.*;
+ import org.apache.tools.ant.taskdefs.*;
+ public class TstampAntunitTest {
+ public static void main(String[] args) {
+ Task task = new Tstamp();
+ task.setProject(new Project());
+ task.execute();
+ String today = task.getProject().getProperty("TODAY");
+ System.out.println("TODAY is " + today);
+ }
+ }
+ ]]></echo>
+ <javac srcdir="${input}" destdir="${output}"/>
+ <local name="testout"/>
+ <java classname="TstampAntunitTest"
+ failonerror="true"
+ outputproperty="testout"
+ fork="true">
+ <classpath>
+ <pathelement location="${output}"/>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
+ <env key="SOURCE_DATE_EPOCH" value="1650585600"/>
+ </java>
+ <au:assertEquals expected="TODAY is April 22 2022" actual="${testout}"/>
+ </target>
</project>
--
2.35.1

42
ant.spec
View File

@ -39,8 +39,8 @@
%global ant_home %{_datadir}/ant
Name: ant
Version: 1.10.12
Release: 11%{?dist}
Version: 1.10.13
Release: 1%{?dist}
Summary: Java build tool
Summary(it): Tool per la compilazione di programmi java
Summary(fr): Outil de compilation pour java
@ -55,7 +55,6 @@ Source2: apache-ant-1.8.ant.conf
Source3: ant.asciidoc
Patch0: %{name}-build.xml.patch
Patch1: 0001-Fix-integer-overflow-when-parsing-SOURCE_DATE_EPOCH.patch
BuildRequires: asciidoc
BuildRequires: xmlto
@ -76,7 +75,7 @@ BuildRequires: mvn(bsf:bsf)
BuildRequires: mvn(com.jcraft:jsch)
BuildRequires: mvn(commons-logging:commons-logging-api)
BuildRequires: mvn(commons-net:commons-net)
BuildRequires: mvn(javax.mail:mail)
BuildRequires: mvn(jakarta.mail:jakarta.mail-api)
BuildRequires: mvn(jdepend:jdepend)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.tukaani:xz)
@ -255,15 +254,17 @@ Requires: %{name} = %{version}-%{release}
%description imageio
Optional imageio tasks for %{name}.
%package javamail
Summary: Optional javamail tasks for %{name}
%package jakartamail
Summary: Optional jakartamail tasks for %{name}
Requires: %{name} = %{version}-%{release}
# TODO Remove after Fedora 41
Obsoletes: ant-javamail < 1.13.1
%description javamail
Optional javamail tasks for %{name}.
%description jakartamail
Optional jakartamail tasks for %{name}.
%description javamail -l fr
Taches javamail optionelles pour %{name}.
%description jakartamail -l fr
Taches jakartamail optionelles pour %{name}.
%package jdepend
Summary: Optional jdepend tasks for %{name}
@ -336,8 +337,7 @@ Javadoc pour %{name}.
%prep
%setup -q -n apache-ant-%{version}
%patch0 -p0
%patch1 -p1
%patch 0 -p0
# clean jar files
find . -name "*.jar" | xargs -t rm
@ -365,7 +365,7 @@ build-jar-repository -s -p lib/optional javapackages-bootstrap/junit javapackage
%if %{with ant_minimal}
build-jar-repository -s -p lib/optional junit hamcrest/core hamcrest/library
%else
build-jar-repository -s -p lib/optional antlr bcel commons-lang3 javamail/mailapi jdepend junit oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j
build-jar-repository -s -p lib/optional antlr bcel commons-lang3 jakarta-mail/jakarta.mail-api jakarta-activation/jakarta.activation-api jdepend junit oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j
%endif
%endif
@ -391,7 +391,7 @@ mv LICENSE.utf8 LICENSE
%pom_xpath_remove pom:optional src/etc/poms/ant-antlr/pom.xml
# fix javamail dependency coordinates (remove once javamail is updated)
%pom_change_dep -r com.sun.mail:jakarta.mail javax.mail:mail src/etc/poms/ant-javamail/pom.xml
%pom_change_dep -r com.sun.mail:jakarta.mail jakarta.mail:jakarta.mail-api src/etc/poms/ant-jakartamail/pom.xml
%build
%if %{with ant_minimal}
@ -409,7 +409,8 @@ xmlto man man/%{name}.xml -o man
rm build/lib/ant-jai.jar build/lib/ant-netrexx.jar
# log4j logging is deprecated
rm build/lib/ant-apache-log4j.jar
# dropped in favor of jakartamail
rm build/lib/ant-javamail.jar
%install
# ANT_HOME and subdirs
@ -501,7 +502,7 @@ echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-o
echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2
echo "ant/ant-imageio" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/imageio
echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail
echo "jakartamail jaf ant/ant-jakartamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jakartamail
echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junitlauncher
@ -615,9 +616,9 @@ LC_ALL=C.UTF-8 %{ant} test
%{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
%files jakartamail -f .mfiles-jakartamail
%{ant_home}/lib/%{name}-jakartamail.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jakartamail
%files jdepend -f .mfiles-jdepend
%{ant_home}/lib/%{name}-jdepend.jar
@ -654,6 +655,9 @@ LC_ALL=C.UTF-8 %{ant} test
# -----------------------------------------------------------------------------
%changelog
* Mon Aug 21 2023 Marian Koncek <mkoncek@redhat.com> - 1.10.13-1
- Update to upstream version 1.10.13
* Fri Aug 18 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.12-11
- Add transitive dependency on commons-lang3 through bcel

2
sources
View File

@ -1 +1 @@
SHA512 (apache-ant-1.10.12-src.tar.bz2) = 82043bfaff975d436b97e9f1832dbdadd6fa7020fffc3488fc86ea48cca947390da0735326ed68880b365c7fce727079773d03cd5f047c71ae418ed715e2f644
SHA512 (apache-ant-1.10.13-src.tar.bz2) = 0fc82578b24fc2ef286e5814e8e7579d4c9ccac80c8f093b33672fecb40e99b152cfab2ae7c967d9bab881a04f4536971042f06be2d8778bb19bb245854c439f