[arch-commits] Commit in hiawatha/trunk (PKGBUILD)

[Kyle Keen]

    Date: Sunday, September 20, 2015 @ 04:47:31
  Author: kkeen
Revision: 141127

upgpkg: hiawatha 9.14-1

Modified:
  hiawatha/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-20 02:46:14 UTC (rev 141126)
+++ PKGBUILD	2015-09-20 02:47:31 UTC (rev 141127)
@@ -4,8 +4,8 @@
 # Contributor: Pascal Ernster <aur at hardfalcon dot net>
 
 pkgname=hiawatha
-pkgver=9.13
-pkgrel=2
+pkgver=9.14
+pkgrel=1
 pkgdesc="Secure and advanced webserver"
 url="https://www.hiawatha-webserver.org/"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@
         'hiawatha.conf.sample'
         'hiawatha.service'
 )
-sha256sums=('b90bec9ce5ec5d03321e0db137f08385b91e9cfcf22e30fa6b42d705739f4ba8'
+sha256sums=('79c92587cd86a0461d952c99036f5615dacdcaccabe0a9a29359e6044d809bfa'
             '4671d2586cbe3cd6497b16ff422c6143cdab40641ef3c9c4988c478351a8f5e7'
             'fb789b12bb6246237b15a9244f58317abdd53e5ca4eb55880e40a498b2237155')
 
@@ -33,6 +33,11 @@
 
   sed -i 's/www-data/http/g' extra/logrotate.in
 
+  # mbedtls tweaks lifted from
+  # https://www.hiawatha-webserver.org/source.raw/CMakeLists.txt
+  sed -i 's|MBEDTLS_LIBRARY "mbedtls"|MBEDTLS_LIBRARIES "mbedtls" "mbedx509" "mbedcrypto"|' CMakeLists.txt
+  sed -i 's|MBEDTLS_LIBRARY|MBEDTLS_LIBRARIES|' CMakeLists.txt
+
   mkdir -p build
   cd build
 
@@ -45,11 +50,11 @@
             -DCONFIG_DIR="/etc/hiawatha" \
             -DLOG_DIR="/var/log/hiawatha" \
             -DPID_DIR="/run" \
-            -DENABLE_SSL=ON \
-            -DUSE_SYSTEM_POLARSSL=ON \
+            -DENABLE_TLS=ON \
             -DUSE_SYSTEM_MBEDTLS=ON \
             -DWEBROOT_DIR="/srv/http/hiawatha" \
             -DWORK_DIR="/var/lib/hiawatha"
+
   make
 
   # Features enabled by default