From 272ea8c68cc1fdbb3cb9c09e80b2c2e59ae9adab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 2 Oct 2020 10:05:24 +0200 Subject: [PATCH] apache-tomcat: patch to use commons-daemon-1.2.3 The binary commons-daemon-1.2.2-bin.tar.gz is no longer available. A mirror ad berkely.edu has commons-daemon-1.2.3-bin.tar.gz so use that for bootstrapping. --- srcpkgs/apache-tomcat/template | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-tomcat/template b/srcpkgs/apache-tomcat/template index c8a05240b82..51e7bdb7842 100644 --- a/srcpkgs/apache-tomcat/template +++ b/srcpkgs/apache-tomcat/template @@ -1,6 +1,6 @@ # Template file for 'apache-tomcat' pkgname=apache-tomcat -version=9.0.37 +version=9.0.38 revision=1 wrksrc="${pkgname}-${version}-src" hostmakedepends="openjdk8 apache-ant" @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://tomcat.apache.org" distfiles="http://mirrors.gigenet.com/apache/tomcat/tomcat-9/v${version}/src/${pkgname}-${version}-src.tar.gz" -checksum=1148357b8d38f571d2c69cc03341b6dabb3f70aad86e4dcd6c61deee751a936c +checksum=72de3de15d6ddced50c6c78958e6369c393c8500dfa819207d64662c26e0c9c2 system_accounts="tomcat" make_dirs="/usr/share/${pkgname}/webapps 0755 tomcat tomcat @@ -19,6 +19,14 @@ make_dirs="/usr/share/${pkgname}/webapps 0755 tomcat tomcat /usr/share/${pkgname}/temp 0755 tomcat tomcat" do_build() { + # Meanwhile commons-daemon was updated to 1.2.3 + local _cd_version="1.2.3" + local _cd_mirror="http://mirrors.ocf.berkeley.edu/apache/commons/daemon/binaries/" + local _cd_sha512="0d7ced8f5d6fd3e8781146ee47c37046c6ccd2f364138f89d137eea5f0255e1b2afae5faf7005164c077087cb08203fd44478d5c14c57c7df449feb324443447" + vsed -i build.properties.default \ + -e "s;\(commons-daemon.version\)=1.2.2;\1=${_cd_version};" \ + -e "s;\(base-apache.loc.1\)=.*;\1=${_cd_mirror};" \ + -e "s;\(commons-daemon.bin.checksum.value\)=.*;\1=${_cd_sha512};" ant }