apache-ant: update to 1.10.13.

This commit is contained in:
John 2023-04-06 21:31:56 +02:00
parent f7f7f50623
commit 4e8d0f4dc9
2 changed files with 76 additions and 2 deletions

View File

@ -0,0 +1,74 @@
From 541a1d2448af3e95134f79a970a608403deab00a Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 4 Mar 2023 15:22:53 +0100
Subject: [PATCH] IBM's ftp now requires ftps which is not supported by
java.net.URL
---
fetch.xml | 28 +++-------------------------
lib/libraries.properties | 3 ++-
2 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/fetch.xml b/fetch.xml
index 038ee120ed..07292d3895 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -375,34 +375,12 @@ Set -Ddest=LOCATION on the command line
<target name="netrexx"
description="load NetRexx compiler"
- depends="init-no-m2,-setup-temp-cache,-fetch-netrexx,-fetch-netrexx-no-commons-net">
- <checksum file="${temp.dir}/NetRexx.zip" algorithm="SHA-256" property="${netrexx.sha256}" verifyProperty="netrexx.hash.matches"/>
- <fail message="NetRexx.zip fetched via ftp has an unexpected SHA-256 checksum, the file may have been tampered with">
- <condition>
- <not>
- <istrue value="${netrexx.hash.matches}"/>
- </not>
- </condition>
- </fail>
- <copy todir="${dest.dir}" flatten="true">
- <zipfileset src="${temp.dir}/NetRexx.zip">
- <include name="NetRexx\lib\NetRexxC.jar"/>
- <include name="NetRexx\browse\license.txt"/>
- </zipfileset>
- </copy>
- <antcall target="-cleanup-temp-cache"/>
+ depends="init-no-m2,-setup-temp-cache,-fetch-netrexx">
+ <get src="https://netrexx.org/files/NetRexxC-${netrexx.version}.jar"
+ dest="${dest.dir}" skipexisting="true"/>
</target>
- <available property="have.commons.net" classname="org.apache.commons.net.ftp.FTPClientConfig"/>
-
<target name="-fetch-netrexx" if="have.commons.net">
- <get-ftp-file host="ftp.software.ibm.com" remotedir="/software/awdtools/netrexx"
- filename="NetRexx.zip" localdir="${temp.dir}"/>
- </target>
-
- <target name="-fetch-netrexx-no-commons-net" unless="have.commons.net">
- <get src="ftp://ftp.software.ibm.com/software/awdtools/netrexx/NetRexx.zip"
- dest="${temp.dir}/NetRexx.zip" skipexisting="true"/>
</target>
<target name="xz"
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 91b9b859f5..418de42825 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -29,7 +29,7 @@ m2.sha1.checksum=c4642858aa22465650ad2a469b24e22696177441
m2.repo=https://repo1.maven.org/maven2/
# hashes of libraries loaded over insecure connections
-netrexx.sha256=1f99f054e9b1e412d29823088f3fa7cfce90a7af25d907a60a6d7908a6b97ea4
+.sha256=2443dfe8d8974a38a390ee55c2757396f3e2350d4b18cc8dc489709bf5593b61
# Versions of different libraries. Please keep in alphabetical order, except
# when a specific dependency forces them to be out-of-order
@@ -51,6 +51,7 @@ hamcrest-core.version=1.3
hamcrest-library.version=${hamcrest-core.version}
jai-core.version=1.1.3
jai-codec.version=1.1.3
+netrexx.version=2.05
# Later 1.6 versions call themselves "jakarta.mail" but do not use the namespace yet
javax.mail.version=1.6.2
jakarta.mail.version=2.0.1

View File

@ -1,6 +1,6 @@
# Template file for 'apache-ant'
pkgname=apache-ant
version=1.10.12
version=1.10.13
revision=1
hostmakedepends="openjdk8"
depends="virtual?java-runtime"
@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
homepage="https://ant.apache.org"
distfiles="https://archive.apache.org/dist/ant/source/apache-ant-${version}-src.tar.xz"
checksum=7629bb10285c5de609df56ae9bc968332f3d34d6cd5c0a5dffe24078e09e98b3
checksum=2a3de6f5d52f7859e0a18f23d8dcdd64cde05ed262654b2286f74759cf0d68d4
python_version=2 # only script uses python2-isms like print ""
nocross=yes