From 97554498ce71a29d81c85400bfd14cd8c62b52b7 Mon Sep 17 00:00:00 2001
From: henschi <to@h6l.de>
Date: Thu, 27 Mar 2025 14:15:49 +0100
Subject: [PATCH 1/2] upgrade ivy to 2.5.3 (CVE fixes)

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 5e0196904..9bf2770db 100644
--- a/build.xml
+++ b/build.xml
@@ -60,7 +60,7 @@
   <target name="install-ivy" description="--> install ivy">
     <local name="ivy.download.dir"/><property name="ivy.download.dir" value="${basedir}/ivy" />
     <local name="ivy.download.file"/><property name="ivy.download.file" value="${ivy.download.dir}/ivy.jar" />
-    <local name="ivy.download.version"/><property name="ivy.install.version" value="2.5.0"/>
+    <local name="ivy.download.version"/><property name="ivy.install.version" value="2.5.3"/>
     <local name="ivy.debian.file"/><property name="ivy.debian.file" value="/usr/share/java/ivy.jar" />
 
     <!-- Check whether ivy is already available as a Debian package -->

From 7fc1995a24a94737a4c25da1fd9f992cb3c3fb45 Mon Sep 17 00:00:00 2001
From: henschi <to@h6l.de>
Date: Thu, 27 Mar 2025 14:53:29 +0100
Subject: [PATCH 2/2] remove ivy.jar in ant clean call

---
 build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.xml b/build.xml
index 9bf2770db..f159ea291 100644
--- a/build.xml
+++ b/build.xml
@@ -401,6 +401,7 @@
   <target name="clean" description="make clean">
     <delete dir="${release_main}" failonerror="false"/>
     <delete failonerror="false">
+      <fileset dir="${basedir}/ivy" includes="**/*.jar" />
       <fileset dir="${lib}" includes="**/*.jar" excludes="org.restlet.jar" /> <!-- we cannot find the org.restlet.jar in maven -->
       <fileset dir="${src}" includes="**/*.class" />
       <fileset dir="${build}" includes="**/*.class" />