network/hiawatha: Updated for version 10.7 + new maintainer.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 46 insertions, 39 deletions

diff --git a/network/hiawatha/README b/network/hiawatha/README
index 935ed1a0d7..6f5bbdc887 100644
--- a/network/hiawatha/README
+++ b/network/hiawatha/README
@@ -1,11 +1,11 @@
-Hiawatha (A secure and advanced webserver)
+Hiawatha (A secure and advanced Web server)
 
-Hiawatha is a webserver for Unix and has been built with security
-in mind. This resulted in a highly secure webserver, in both code
+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
+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:
@@ -14,15 +14,17 @@ Notes:
   You can create them with:
 
   # groupadd -g 259 hiawatha
-  # useradd -u 259 -g 259 -c "User for hiawatha" -d / -s /bin/false hiawatha
+  # useradd -u 259 -g 259 -c "Hiawatha HTTP Server" -d / \
+          -s /bin/false hiawatha
 
   By default:
 
   * Hiawatha's daemon is going to be listening in the network interface
-    127.0.0.1:80, and it can write temporary files inside /var/lib/hiawatha
+    127.0.0.1:80, and it can write temporary files inside
+        /var/lib/hiawatha
 
-  * The web root directory is /srv/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 readed in the next URL:
-http://www.hiawatha-webserver.org/support
+Hiawatha's documentation can be found at the following URL:
+https://www.hiawatha-webserver.org/support
diff --git a/network/hiawatha/hiawatha.SlackBuild b/network/hiawatha/hiawatha.SlackBuild
index 36d3286112..ecbb95e6a3 100644
--- a/network/hiawatha/hiawatha.SlackBuild
+++ b/network/hiawatha/hiawatha.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for hiawatha
 
+# Copyright 2018 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>
 # All rights reserved.
@@ -23,13 +24,13 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hiawatha
-VERSION=${VERSION:-9.13}
+VERSION=${VERSION:-10.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -73,29 +74,31 @@ mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_INSTALL_PREFIX=/ \
+    -DCMAKE_INSTALL_BINDIR=/usr/sbin \
+    -DCMAKE_INSTALL_SBINDIR=/usr/sbin \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc/$PRGNAM \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
     -DCMAKE_INSTALL_MANDIR=/usr/man \
     -DCONFIG_DIR=/etc/$PRGNAM \
     -DLOG_DIR=/var/log/$PRGNAM \
     -DPID_DIR=/var/run/$PRGNAM \
-    -DWEBROOT_DIR=/srv/$PRGNAM \
+    -DWEBROOT_DIR=/var/$PRGNAM \
     -DWORK_DIR=/var/lib/$PRGNAM \
     -DCMAKE_BUILD_TYPE=Release \
     \
-    -DENABLE_CACHE=on \
-    -DENABLE_DEBUG=off \
-    -DENABLE_IPV6=on \
     -DENABLE_MONITOR=on \
-    -DENABLE_RPROXY=on \
-    -DENABLE_SSL=on \
     -DENABLE_TOMAHAWK=on \
-    -DENABLE_TOOLKIT=on \
-    -DENABLE_XSLT=on \
     ..
   make
+	# Enabled by default
+    #-DENABLE_CACHE=on \
+    #-DENABLE_DEBUG=off \
+    #-DENABLE_IPV6=on \
+    #-DENABLE_RPROXY=on \
+    #-DENABLE_TLS=on \
+    #-DENABLE_TOOLKIT=on \
+    #-DENABLE_XSLT=on \
   make install DESTDIR=$PKG
 cd ..
 
@@ -103,6 +106,9 @@ cd ..
 sed -i 's/^#ServerId/ServerId/' $PKG/etc/$PRGNAM/$PRGNAM.conf
 sed -i "s/www-data/$PRGNAM:$PRGNAM/" $PKG/etc/$PRGNAM/$PRGNAM.conf
 
+# Change PHP version from 7 to 5 to match version in Slackware*-14.2
+sed -i -r -e 's/PHP7/PHP5/g' -e 's/php7/php5/g' $PKG/etc/$PRGNAM/$PRGNAM.conf
+
 # Install init scipts
 mkdir -p $PKG/etc/rc.d/
 install -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM
@@ -117,11 +123,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/extra
 cp -a ChangeLog LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Add some extra scripts from upstream
-for script in mkcert newroot
-do
-  cat extra/$script > $PKG/usr/doc/$PRGNAM-$VERSION/extra/$script
-done
+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/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/hiawatha/hiawatha.info b/network/hiawatha/hiawatha.info
index 2b83e0b71d..2daed6a40d 100644
--- a/network/hiawatha/hiawatha.info
+++ b/network/hiawatha/hiawatha.info
@@ -1,10 +1,10 @@
 PRGNAM="hiawatha"
-VERSION="9.13"
+VERSION="10.7"
 HOMEPAGE="https://www.hiawatha-webserver.org"
-DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-9.13.tar.gz"
-MD5SUM="b0973e8d9090365e2419b6db862e35ce"
+DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-10.7.tar.gz"
+MD5SUM="581aa71c831172ba06910deda717302f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Antonio Hernández Blas"
-EMAIL="hba.nihilismus@gmail.com"
+MAINTAINER="Donald Cooley"
+EMAIL="chytraeu@sdf.org"
diff --git a/network/hiawatha/slack-desc b/network/hiawatha/slack-desc
index 81fc3eda7f..5a44668542 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 webserver)
+hiawatha: hiawatha (A secure and advanced Web server)
 hiawatha:
-hiawatha: Hiawatha is a webserver for Unix and has been built with security
-hiawatha: in mind. This resulted in a highly secure webserver, in both code
+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: 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: Homepage: http://www.hiawatha-webserver.org
+hiawatha: Homepage: https://www.hiawatha-webserver.org