Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SPECS/ant/ant.signatures.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"Signatures": {
"ant-bootstrap.pom.in": "85d35aedfb5ccc60ba1642b4c7624d092f34b253662d3c6c8f2bc1982dcad580",
"ant.conf": "8a0bace4a527bd0ff35ad0b0a31c1f7bf30fa186e98cd9dc5142a97098f36ddf",
"apache-ant-1.10.14-src.tar.gz": "9a5fe31f44d1eb62590cbe38e4fab25b25e2f68643b38a54b66498e0bf621b54"
"apache-ant-1.10.18-src.tar.gz": "a615c40df1812ddc2d7ab864b04aff4a02703a4c2da65b92fbf40b940129db33"
}
}
5 changes: 4 additions & 1 deletion SPECS/ant/ant.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

Summary: Apache Ant
Name: ant
Version: 1.10.14
Version: 1.10.18
Release: 1%{?dist}
License: ASL 2.0 AND W3C
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -263,6 +263,9 @@ popd
%{_bindir}/*.py*

%changelog
* Thu Sep 10 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.10.18-1
- Auto-upgrade to 1.10.18 - for CVE-2026-78254

* Thu Nov 02 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.10.14-1
- Auto-upgrade to 1.10.14 - Azure Linux 3.0 - package upgrades

Expand Down
6 changes: 3 additions & 3 deletions SPECS/ant/apache-ant-bootstrap.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- apache-ant-1.10.7/bootstrap.sh 2019-09-01 08:14:10.000000000 +0200
+++ apache-ant-1.10.7/bootstrap.sh 2019-10-12 12:34:23.892369973 +0200
@@ -143,7 +143,7 @@
--- apache-ant-1.10.18/bootstrap.sh 2026-09-03 16:22:52.000000000 +0000
+++ apache-ant-1.10.18/bootstrap.sh 2026-09-10 16:44:40.000000000 +0000
@@ -144,7 +144,7 @@
echo ... Compiling Ant Classes with ${JAVAC_RELEASE_VERSION}
fi

Expand Down
19 changes: 14 additions & 5 deletions SPECS/ant/apache-ant-no-test-jar.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
--- apache-ant-1.10.7/build.xml 2019-09-01 08:14:10.000000000 +0200
+++ apache-ant-1.10.7/build.xml 2019-10-12 12:30:11.014986025 +0200
@@ -976,7 +976,7 @@
--- apache-ant-1.10.18/build.xml 2026-09-03 16:22:52.000000000 +0000
+++ apache-ant-1.10.18/build.xml 2026-09-10 16:44:40.000000000 +0000
@@ -1041,7 +1041,7 @@
Create the essential distribution that can run Apache Ant
===================================================================
-->
- <target name="dist-lite" depends="jars,test-jar,-ant-dist-warn-jdk9+"
+ <target name="dist-lite" depends="jars,-ant-dist-warn-jdk9+"
- <target name="dist-lite" depends="jars,test-jar,component-boms,-ant-dist-warn-jdk9+"
+ <target name="dist-lite" depends="jars,component-boms,-ant-dist-warn-jdk9+"
description="--> creates a minimum distribution to run Apache Ant">

<mkdir dir="${dist.dir}"/>
@@ -2299,7 +2299,7 @@
</target>

<target name="component-boms"
- depends="-init-cyclonedx,jars,test-jar"
+ depends="-init-cyclonedx,jars"
xmlns:cdx="antlib:org.apache.ant.cyclonedx"
if="cyclonedx.antlib.present">

4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@
"type": "other",
"other": {
"name": "ant",
"version": "1.10.14",
"downloadUrl": "https://archive.apache.org/dist/ant/source/apache-ant-1.10.14-src.tar.gz"
"version": "1.10.18",
"downloadUrl": "https://archive.apache.org/dist/ant/source/apache-ant-1.10.18-src.tar.gz"
}
}
},
Expand Down
Loading