aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2020-07-11 18:27:57 +0300
committerLeo <thinkabit.ukim@gmail.com>2020-07-11 23:41:28 +0000
commita63d394b17be1dc253cdae301161673c60a776cc (patch)
treeb8a05e5d7c40df49f33b3710db9d777a5a83e1c3
parent9ed12c4fea149bfc8aaa96bf225b98e8524cf59b (diff)
downloadaports-a63d394b17be1dc253cdae301161673c60a776cc.tar.gz
aports-a63d394b17be1dc253cdae301161673c60a776cc.tar.bz2
aports-a63d394b17be1dc253cdae301161673c60a776cc.tar.xz
testing/hiawatha: upgrade to 10.11
-rw-r--r--testing/hiawatha/APKBUILD32
1 files changed, 14 insertions, 18 deletions
diff --git a/testing/hiawatha/APKBUILD b/testing/hiawatha/APKBUILD
index 2c5c6fc07c..5613c0d960 100644
--- a/testing/hiawatha/APKBUILD
+++ b/testing/hiawatha/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Pascal Ernster <aur at hardfalcon dot net>
# Contributor: Stuart Cardall <developer at it-offshore dot co.uk>
pkgname=hiawatha
-pkgver=10.10
+pkgver=10.11
pkgrel=0
pkgdesc='Secure and advanced webserver'
url='https://www.hiawatha-webserver.org/'
@@ -18,30 +18,26 @@ source="https://hiawatha-webserver.org/files/hiawatha-$pkgver.tar.gz
"
build() {
- cmake . \
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake -B build \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_BINDIR=/usr/bin \
- -DCMAKE_INSTALL_SBINDIR=/usr/sbin \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc/hiawatha \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCMAKE_INSTALL_MANDIR=/usr/share/man \
- -DCONFIG_DIR=/etc/hiawatha \
- -DLOG_DIR=/var/log/hiawatha \
- -DPID_DIR=/var/run \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=None \
-DUSE_SYSTEM_MBEDTLS=ON \
- -DWEBROOT_DIR=/var/www/hiawatha \
- -DWORK_DIR=/var/lib/hiawatha
-
- make
+ ${CMAKE_CROSSOPTS} .
+ cmake --build build
}
package() {
- make DESTDIR="$pkgdir/" install
+ DESTDIR="$pkgdir" cmake --build build --target install
sed -i 's|#ServerId = www-data|ServerId = nobody|' \
"$pkgdir"/etc/hiawatha/hiawatha.conf
- sed -i 's|www-data|nobody|g' logrotate.d/hiawatha
- install -Dm644 logrotate.d/hiawatha \
+ sed -i 's|www-data|nobody|g' build/logrotate.d/hiawatha
+ install -Dm644 build/logrotate.d/hiawatha \
"$pkgdir"/etc/logrotate.d/hiawatha
install -Dm755 "$srcdir"/hiawatha.initd \
"$pkgdir"/etc/init.d/hiawatha
@@ -62,7 +58,7 @@ letsencrypt() {
install -Dm750 "$srcdir"/letsencrypt.helper "$subpkgdir"/usr/sbin/letsencrypt
}
-sha512sums="dd23977a55c23145ac6b8163deb2e69192940cbae8f297522ba9376a2dfa1a4a350027a3358ef3169718991c61206bfee30baa602d95b0523b0eb2badc51fabe hiawatha-10.10.tar.gz
+sha512sums="4f48172c9f7a994f137deeb896fc6d5e8e6c8aef31d632f303213023dbf2fa44824d0b7f2df6dda0115a92ec9b6658c476b91f5d34f03bf69632e5f0b9bb9c80 hiawatha-10.11.tar.gz
cec0adfb48e1751cf13031f2c28f4590340b2c747aa8e81d18c16bc8789bce69b2d9d99290a93b74b501db3b63190a071033a78abeeb8f60becba2dcaf3b5c40 hiawatha.initd
b2aad6d02e03a3e25dc6dc30deab4637a7de5448255b6b707363e8c71ae1029e669bacdb6b88889ec1aa804fe717560e872dc44d049127af9aa155a8895c8a60 hiawatha.conf.sample
bc31823ba0894bf4dc2f1d9aac3c03382d60a1302f4d35027ca4d3e38d8a14cfdbc94af3235800b9e8cc68c4efceb1ba04c654d16ee0d297591f25a470cc567c letsencrypt.helper"