diff options
Diffstat (limited to 'network/hiawatha')
| -rw-r--r-- | network/hiawatha/README | 20 | ||||
| -rw-r--r-- | network/hiawatha/hiawatha.SlackBuild | 43 | ||||
| -rw-r--r-- | network/hiawatha/hiawatha.info | 8 | ||||
| -rw-r--r-- | network/hiawatha/slack-desc | 16 |
4 files changed, 45 insertions, 42 deletions
diff --git a/network/hiawatha/README b/network/hiawatha/README index 6f6e655e59..eb85247e56 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,10 +21,10 @@ 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: -https://www.hiawatha-webserver.org/support +https://hiawatha.leisink.net/support diff --git a/network/hiawatha/hiawatha.SlackBuild b/network/hiawatha/hiawatha.SlackBuild index b4315d65df..5d8d604a13 100644 --- a/network/hiawatha/hiawatha.SlackBuild +++ b/network/hiawatha/hiawatha.SlackBuild @@ -1,10 +1,9 @@ -#!/bin/sh +#!/bin/bash # 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 @@ -23,10 +22,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=hiawatha -VERSION=${VERSION:-10.9} +VERSION=${VERSION:-11.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,16 +38,20 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -mpclmul -msse2 -maes" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -mpclmul -msse2 -maes" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" @@ -74,7 +80,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_BINDIR=/usr/sbin \ -DCMAKE_INSTALL_SBINDIR=/usr/sbin \ -DCMAKE_INSTALL_SYSCONFDIR=/etc/$PRGNAM \ @@ -87,11 +93,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 \ .. @@ -103,9 +108,6 @@ 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 @@ -116,14 +118,15 @@ 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/ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc @@ -142,4 +145,4 @@ do done cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/hiawatha/hiawatha.info b/network/hiawatha/hiawatha.info index a88fc79c20..35481cc97b 100644 --- a/network/hiawatha/hiawatha.info +++ b/network/hiawatha/hiawatha.info @@ -1,8 +1,8 @@ PRGNAM="hiawatha" -VERSION="10.9" -HOMEPAGE="https://www.hiawatha-webserver.org" -DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-10.9.tar.gz" -MD5SUM="83aa447f187c33968bee9dfac3011718" +VERSION="11.5" +HOMEPAGE="https://hiawatha.leisink.net/" +DOWNLOAD="https://hiawatha.leisink.net/files/hiawatha-11.5.tar.gz" +MD5SUM="9277f86b1065794ac89cea0699da3978" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/hiawatha/slack-desc b/network/hiawatha/slack-desc index 5a44668542..cb0c40d4eb 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 +hiawatha: Homepage: https://hiawatha.leisink.net |