4 files changed, 92 insertions, 44 deletions
diff --git a/network/hiawatha/README b/network/hiawatha/README
index 4a1f174285..7bb2081e59 100644
--- a/network/hiawatha/README
+++ b/network/hiawatha/README
@@ -1,7 +1,34 @@
 Hiawatha (A secure and advanced webserver)
 
-Hiawatha is a secure webserver for Unix. It has been written with
-'being secure' as its main goal. Hiawatha has lots of features that
-no other webserver has. This and the fact that Hiawatha's source
-code is free of security-bugs, makes Hiawatha the most secure
-webserver available.
+Hiawatha is a webserver for Unix and has been built with security
+in mind. This resulted in a highly secure webserver, 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.
+
+Notes:
+
+  To build/use this package the users/groups 'hiawatha' and 'php-fcgi' are
+  required. You can create them with:
+
+  # groupadd -g 259 hiawatha
+  # useradd -u 259 -g 259 -c "User for hiawatha" -d / -s /bin/false hiawatha
+
+  # groupadd -g 260 php-fcgi
+  # useradd -u 260 -g 260 -c "User for php-fcgi" -d / -s /bin/false php-fcgi
+
+  By default:
+
+  * hiawatha daemon is going to be listening in the network interface 127.0.0.1:80
+    and php-fcgi daemon will create the unix socket /var/run/hiawatha/php-fcgi.sock
+
+  * The web root directory is /srv/hiawatha with index.html being
+    the default start file.
+
+  * hiawatha daemon can write temporary files inside /var/lib/hiawatha
+
+  Hiawatha's documentation can be readed in the next URL:
+  http://www.hiawatha-webserver.org/support
+
diff --git a/network/hiawatha/hiawatha.SlackBuild b/network/hiawatha/hiawatha.SlackBuild
index ddb7bfec9b..bc86bdb2dc 100644
--- a/network/hiawatha/hiawatha.SlackBuild
+++ b/network/hiawatha/hiawatha.SlackBuild
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hiawatha
-VERSION=${VERSION:-7.8.2}
+VERSION=${VERSION:-8.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,26 +68,45 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Workaround, when configure is executed it spits this message:
-#  WARNING: `aclocal-1.10' is missing on your system.
-#find . -type f -exec touch {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --enable-command \
-  --enable-xslt \
-  --enable-chroot
-
-make
-make install DESTDIR=$PKG
+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_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 \
+    -DWORK_DIR=/var/lib/$PRGNAM \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+# Correct the userid and groupid(s) the server will change to:
+sed -i 's/^#ServerId/ServerId/' $PKG/etc/$PRGNAM/$PRGNAM.conf
+sed -i "s/www-data/$PRGNAM:$PRGNAM/" $PKG/etc/$PRGNAM/$PRGNAM.conf
+
+# Add the configuration needed by the PHP-FastCGI utility to make it
+# Just Work(tm) in Slackware(r) Linux(r) :)
+
+mkdir -p $PKG/var/run/$PRGNAM
+echo "Server = /usr/bin/php-cgi ; 1 ; /var/run/$PRGNAM/php-fcgi.sock ; php-fcgi:php-fcgi ; /etc/httpd/php.ini" >> \
+  $PKG/etc/$PRGNAM/php-fcgi.conf
+
+sed -i "s:/var/run/php-fcgi.pid/:/var/run/$PRGNAM/php-fcgi.pid:" \
+  $PKG/etc/$PRGNAM/php-fcgi.conf
+
+sed -i "s_ConnectTo = 127.0.0.1:2005_ConnectTo = /var/run/$PRGNAM/php-fcgi.sock_" \
+  $PKG/etc/$PRGNAM/$PRGNAM.conf
+
+# Set the correct permissions for pid/socket directory.
+chown hiawatha:php-fcgi $PKG/var/run/$PRGNAM
+chmod 770 $PKG/var/run/$PRGNAM
 
 # Install init scipts
 mkdir -p $PKG/etc/rc.d/
@@ -100,10 +119,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
-cp -a AUTHORS ChangeLog COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/extra
+cp -a AUTHORS ChangeLog INSTALL LICENSE $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
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
@@ -115,14 +140,10 @@ do
 done
 
 # Add *.new files into doinst.sh
-for file in $(find $PKG/etc/rc.d -type f -name "*.new")
+for file in $(find $PKG/etc/rc.d $PKG/etc/$PRGNAM -type f -name "*.new")
 do
   echo preserve_perms $(echo $file | sed "s:$PKG/::") >> $PKG/install/doinst.sh
 done
-for file in $(find $PKG/etc/$PRGNAM -type f -name "*.new")
-do
-  echo config $(echo $file | sed "s:$PKG/::") >> $PKG/install/doinst.sh
-done
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/hiawatha/hiawatha.info b/network/hiawatha/hiawatha.info
index 96985b766a..dfc9bdf9c7 100644
--- a/network/hiawatha/hiawatha.info
+++ b/network/hiawatha/hiawatha.info
@@ -1,10 +1,10 @@
 PRGNAM="hiawatha"
-VERSION="7.8.2"
+VERSION="8.3.2"
 HOMEPAGE="http://www.hiawatha-webserver.org"
-DOWNLOAD="http://www.hiawatha-webserver.org/files/hiawatha-7/hiawatha-7.8.2.tar.gz"
-MD5SUM="8aff3f8c759871ea1d1ff22e98030332"
+DOWNLOAD="http://www.hiawatha-webserver.org/files/hiawatha-8.3.2.tar.gz"
+MD5SUM="9c1904e4c68db9627563fe466f7d36a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Antonio Hernández Blas"
 EMAIL="hba.nihilismus@gmail.com"
-APPROVED="Niels Horn"
+APPROVED="dsomero"
diff --git a/network/hiawatha/slack-desc b/network/hiawatha/slack-desc
index 0374aa5c58..fa40c488e5 100644
--- a/network/hiawatha/slack-desc
+++ b/network/hiawatha/slack-desc
@@ -8,12 +8,12 @@
         |-----handy-ruler------------------------------------------------------|
 hiawatha: Hiawatha (A secure and advanced webserver)
 hiawatha:
-hiawatha: Hiawatha is a secure webserver for Unix. It has been written with
-hiawatha: 'being secure' as its main goal. Hiawatha has lots of features that
-hiawatha: no other webserver has. This and the fact that Hiawatha's source
-hiawatha: code is free of security-bugs, makes Hiawatha the most secure
-hiawatha: webserver available.
-hiawatha:
-hiawatha: Homepage: http://www.hiawatha-webserver.org
+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: 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