From c902b4f58f0146fedbe0e40a24e0b1384ee70220 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Wed, 13 May 2020 19:24:51 +0200
Subject: [PATCH] community/apache-ant: security upgrade to 1.10.8
CVE-2020-1945
---
community/apache-ant/APKBUILD | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/community/apache-ant/APKBUILD b/community/apache-ant/APKBUILD
index de39b2da9bee..c99fc851950a 100644
--- a/community/apache-ant/APKBUILD
+++ b/community/apache-ant/APKBUILD
@@ -2,22 +2,23 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=apache-ant
-pkgver=1.10.7
+pkgver=1.10.8
pkgrel=0
pkgdesc="A java-based build tool"
-url="http://ant.apache.org/"
+url="https://ant.apache.org/"
arch="noarch !mips !mips64"
options="!check" # Needs itself for testing.
license="Apache-2.0"
depends="openjdk8-jre-base"
-source="https://archive.apache.org/dist/ant/binaries/$pkgname-$pkgver-bin.tar.bz2"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://downloads.apache.org/ant/binaries/apache-ant-$pkgver-bin.tar.xz"
_anthome="/usr/share/java/$pkgname"
-build() {
- cd "$builddir"
+# secfixes:
+# 1.10.8-r0:
+# - CVE-2020-1945
+build() {
cat > $pkgname.sh <<-EOF
ANT_HOME="$_anthome"
export ANT_HOME
@@ -27,8 +28,6 @@ build() {
package() {
local destdir="$pkgdir/$_anthome"
- cd "$builddir"
-
install -dm755 "$destdir"/bin
rm bin/*.bat bin/*.cmd
install -m755 bin/* "$destdir"/bin
@@ -55,4 +54,4 @@ package() {
install -m644 -D $pkgname.sh "$pkgdir"/etc/profile.d/$pkgname.sh
}
-sha512sums="d6d14cddfeed51902618cdbda338d148fd76a7e122b558ccc49af685cf1adc9f8e079e3deb3bee361cc9652fef5c859e414d6e28f15a4447751e3dd61e1df499 apache-ant-1.10.7-bin.tar.bz2"
+sha512sums="b03be67dbda9b45a7838c304db7e6750e4907c6eef51a8de30d929f7e5b0da61b8a82fde2b590a0842acffc0f1098bc6bdfd16664a72c6c6f883990e166acdd4 apache-ant-1.10.8-bin.tar.xz"
--
GitLab