network/hiawatha: Updated for version 10.10.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 30 insertions, 30 deletions

diff --git a/network/hiawatha/README b/network/hiawatha/README
index 6f6e655e59..094e670fb1 100644
--- a/network/hiawatha/README
+++ b/network/hiawatha/README
@@ -1,12 +1,12 @@
-Hiawatha (A secure and advanced Web server)
+Hiawatha (A secure and advanced webserver)
 
-Hiawatha is a Web server for Unix and has been built with security
-in mind. This resulted in a highly secure Web server, in both code
-and features.
+Hiawatha is a web server for Unix and has been built with security in
+mind. This resulted in a highly secure web server, in both code and
+features.
 
-Hiawatha supports many Web and HTTP features such as
-CGI/FASTCGI, HTTP authentication, virtual host support, request
-pipelining, keep alive connections, URL rewriting and many more.
+Hiawatha supports many web and HTTP features such as CGI/FASTCGI, HTTP
+authentication, virtual host support, request pipelining, keep alive
+connections, URL rewriting and many more.
 
 Notes:
 
@@ -21,9 +21,9 @@ Notes:
 
   * Hiawatha's daemon will listen on the network interface
     127.0.0.1:80, and it can write temporary files inside
-        /var/db/hiawatha
+    /var/db/hiawatha
 
-  * The Web root directory is /var/hiawatha with index.html being
+  * The web root directory is /var/hiawatha with index.html being
     the default start file.
 
 Hiawatha's documentation can be found at the following URL:
diff --git a/network/hiawatha/hiawatha.SlackBuild b/network/hiawatha/hiawatha.SlackBuild
index b4315d65df..6e1e46a6b3 100644
--- a/network/hiawatha/hiawatha.SlackBuild
+++ b/network/hiawatha/hiawatha.SlackBuild
@@ -2,9 +2,8 @@
 
 # Slackware build script for hiawatha
 
-# Copyright 2018-2019 Donald Cooley South Haven, Indiana USA
-# Copyright (c) 2009-2012, Antonio Hernández Blas <hba.nihilismus@gmail.com>
-# Copyright (c) 2014,      Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# Copyright 2018-2020 Donald Cooley South Haven, Indiana, USA
+# Copyright (c) 2009-2012, 2014 Antonio Hernández Bls
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,7 +23,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hiawatha
-VERSION=${VERSION:-10.9}
+VERSION=${VERSION:-10.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -87,11 +86,10 @@ cd build
     -DWORK_DIR=/var/db/$PRGNAM \
     -DCMAKE_BUILD_TYPE=Release \
     -DENABLE_CACHE=on \
-    -DENABLE_IPV6=on \
     -DENABLE_MONITOR=on \
     -DENABLE_RPROXY=on \
-    -DENABLE_TOMAHAWK=on \
     -DENABLE_TLS=on \
+    -DENABLE_TOMAHAWK=on \
     -DENABLE_TOOLKIT=on \
     -DENABLE_XSLT=on \
     ..
@@ -116,14 +114,16 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/extra
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-cat extra/newroot > $PKG/usr/doc/$PRGNAM-$VERSION/extra/newroot
-
-mkdir -p $PKG/usr/share/$PRGNAM
-tar -caf $PKG/usr/share/$PRGNAM/letsencrypt.tar.gz extra/letsencrypt/*
+mkdir -p $PKG/usr/share/$PRGNAM/extra
+cat extra/newroot > $PKG/usr/share/$PRGNAM/extra/newroot
+tar -caf $PKG/usr/share/$PRGNAM/extra/letsencrypt.tar.gz extra/letsencrypt/*
+cp -a extra/{*.xml,index.html,*.in,tls*} \
+  	$PKG/usr/share/$PRGNAM/extra/
+cp -a extra/nghttp2.tgz $PKG/usr/share/$PRGNAM/extra/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/hiawatha/hiawatha.info b/network/hiawatha/hiawatha.info
index a88fc79c20..8016841a33 100644
--- a/network/hiawatha/hiawatha.info
+++ b/network/hiawatha/hiawatha.info
@@ -1,8 +1,8 @@
 PRGNAM="hiawatha"
-VERSION="10.9"
+VERSION="10.10"
 HOMEPAGE="https://www.hiawatha-webserver.org"
-DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-10.9.tar.gz"
-MD5SUM="83aa447f187c33968bee9dfac3011718"
+DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-10.10.tar.gz"
+MD5SUM="3bf2c12c7037ecc3dfdbec72e7a2f04f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/hiawatha/slack-desc b/network/hiawatha/slack-desc
index 5a44668542..05db98aa46 100644
--- a/network/hiawatha/slack-desc
+++ b/network/hiawatha/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-hiawatha: hiawatha (A secure and advanced Web server)
+hiawatha: hiawatha (A secure and advanced web server)
 hiawatha:
-hiawatha: Hiawatha is a Web server for Unix and has been built with security
-hiawatha: in mind. This resulted in a highly secure Web server, in both code
-hiawatha: and features.
+hiawatha: Hiawatha is a web server for Unix and has been built with security in
+hiawatha: mind. This resulted in a highly secure web server, in both code and
+hiawatha: features.
 hiawatha:
-hiawatha: Hiawatha supports many web and HTTP features such as
-hiawatha: CGI/FastCGI, HTTP authentication, virtual host support, request
-hiawatha: pipelining, keep alive connections, URL rewriting and many more.
+hiawatha: Hiawatha supports many web and HTTP features such as CGI/FastCGI,
+hiawatha: HTTP authentication, virtual host support, request pipelining, keep
+hiawatha: alive connections, URL rewriting and many more.
 hiawatha:
 hiawatha: Homepage: https://www.hiawatha-webserver.org