Date: Sunday, September 20, 2020 @ 13:15:24 Author: alucryd Revision: 396343
upgpkg: tomcat-native 1.2.25-1 Added: tomcat-native/trunk/tomcat-native-buildconf.patch Modified: tomcat-native/trunk/PKGBUILD -------------------------------+ PKGBUILD | 45 +++++++++++++++++++++++++++++----------- tomcat-native-buildconf.patch | 12 ++++++++++ 2 files changed, 45 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-09-20 11:37:53 UTC (rev 396342) +++ PKGBUILD 2020-09-20 13:15:24 UTC (rev 396343) @@ -1,9 +1,9 @@ -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> # Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Guillaume Alaux <guilla...@archlinux.org> # Contributor: Vitaliy Berdinskikh <ur6...@i.ua> pkgname=tomcat-native -pkgver=1.2.24 +pkgver=1.2.25 pkgrel=1 pkgdesc='Optional component for Tomcat to use certain native resources for performance, compatibility' arch=(x86_64) @@ -10,29 +10,50 @@ url=https://tomcat.apache.org/native-doc/ license=(APACHE) depends=(apr) -makedepends=(java-environment) +makedepends=( + git + java-environment + python +) options=(!emptydirs) -source=(https://archive.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz{,.asc}) -validpgpkeys=( - A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 - B3F49CD3B9BD2996DA90F817ED3873F5D3262722 +_tag=a94590ec2a5e40b168a9494144125a52f41ed0b2 +source=( + git+https://github.com/apache/tomcat-native.git#tag=${_tag} + tomcat-native-buildconf.patch ) -sha512sums=('5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f' - 'SKIP') +b2sums=( + SKIP + d3603079626b908644331c193452088ef3ce89e92c775c60b232d16d04b8c49d40106d55c76f81c87daea93d335868140df0046c7102796d92b08431ac8749a4 +) +pkgver() { + cd tomcat-native + + git describe --tags +} + +prepare() { + cd tomcat-native/native + + patch -Np2 -i ../../tomcat-native-buildconf.patch + automake --add-missing --copy --force-missing || true + ./buildconf \ + --with-apr=/usr/share/apr-1 +} + build() { - cd tomcat-native-${pkgver}-src/native + cd tomcat-native/native ./configure \ --prefix=/usr \ + --with-apr=/usr/bin/apr-1-config \ --with-java-home=/usr/lib/jvm/default \ - --with-apr=/usr \ --with-ssl=/usr make } package() { - make DESTDIR="${pkgdir}" -C tomcat-native-${pkgver}-src/native install + make DESTDIR="${pkgdir}" -C tomcat-native/native install } # vim: ts=2 sw=2 et: Added: tomcat-native-buildconf.patch =================================================================== --- tomcat-native-buildconf.patch (rev 0) +++ tomcat-native-buildconf.patch 2020-09-20 13:15:24 UTC (rev 396343) @@ -0,0 +1,12 @@ +diff -rupN tomcat-native.orig/native/buildconf tomcat-native/native/buildconf +--- tomcat-native.orig/native/buildconf 2020-09-20 14:44:45.114714616 +0200 ++++ tomcat-native/native/buildconf 2020-09-20 14:44:58.368172703 +0200 +@@ -55,7 +55,7 @@ if [ ! -d "$apr_src_dir/build" ]; then + fi + + # Remove some files, then copy them from apr source tree +-for file in apr_common.m4 find_apr.m4 install.sh config.guess config.sub ++for file in apr_common.m4 find_apr.m4 install.sh + do + if [ ! -f "$apr_src_dir/build/$file" ]; then + echo "File '$apr_src_dir/build/$file' missing - wrong apr source directory?"
