From c5137b75f202ae38907001d5e98f1a4d0b13d3c6 Mon Sep 17 00:00:00 2001 From: Antonio Hernández Blas Date: Tue, 31 May 2011 23:01:19 -0400 Subject: network/hiawatha: Updated for version 7.4.1. Signed-off-by: dsomero --- network/hiawatha/doinst.sh | 23 ++++++++++------------- network/hiawatha/hiawatha.SlackBuild | 11 ++++++++--- network/hiawatha/hiawatha.info | 8 ++++---- network/hiawatha/rc.hiawatha | 18 +++++++++++++++++- network/hiawatha/rc.php-fcgi | 18 +++++++++++++++++- 5 files changed, 56 insertions(+), 22 deletions(-) diff --git a/network/hiawatha/doinst.sh b/network/hiawatha/doinst.sh index 2242b31cb1..21e47e3998 100644 --- a/network/hiawatha/doinst.sh +++ b/network/hiawatha/doinst.sh @@ -11,17 +11,14 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# Keep same perms on rc.hiawatha.new: -if [ -e etc/rc.d/rc.hiawatha ]; then - cp -a etc/rc.d/rc.hiawatha etc/rc.d/rc.hiawatha.new.incoming - cat etc/rc.d/rc.hiawatha.new > etc/rc.d/rc.hiawatha.new.incoming - mv etc/rc.d/rc.hiawatha.new.incoming etc/rc.d/rc.hiawatha.new -fi - -# Keep same perms on rc.php-fcgi.new: -if [ -e etc/rc.d/rc.php-fcgi ]; then - cp -a etc/rc.d/rc.php-fcgi etc/rc.d/rc.php-fcgi.new.incoming - cat etc/rc.d/rc.php-fcgi.new > etc/rc.d/rc.php-fcgi.new.incoming - mv etc/rc.d/rc.php-fcgi.new.incoming etc/rc.d/rc.php-fcgi.new -fi +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} diff --git a/network/hiawatha/hiawatha.SlackBuild b/network/hiawatha/hiawatha.SlackBuild index da6bf8a54a..720989c388 100644 --- a/network/hiawatha/hiawatha.SlackBuild +++ b/network/hiawatha/hiawatha.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for hiawatha -# Copyright (c) 2009-2010, Antonio Hernández Blas +# Copyright (c) 2009-2011, Antonio Hernández Blas # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=hiawatha -VERSION=${VERSION:-7.4} +VERSION=${VERSION:-7.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -68,6 +68,10 @@ 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 \ @@ -90,7 +94,7 @@ mkdir -p $PKG/etc/rc.d/ install -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM install -m 0644 $CWD/rc.php-fcgi $PKG/etc/rc.d/rc.php-fcgi -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true if [ -d $PKG/usr/man ]; then @@ -117,6 +121,7 @@ done # Add *.new files into doinst.sh for file in $(find $PKG/etc -type f -name "*.new") do + echo preserve_perms $(echo $file | sed "s:$PKG/::") >> $PKG/install/doinst.sh echo config $(echo $file | sed "s:$PKG/::") >> $PKG/install/doinst.sh done diff --git a/network/hiawatha/hiawatha.info b/network/hiawatha/hiawatha.info index 2da1e53a90..2293352df0 100644 --- a/network/hiawatha/hiawatha.info +++ b/network/hiawatha/hiawatha.info @@ -1,10 +1,10 @@ PRGNAM="hiawatha" -VERSION="7.4" +VERSION="7.4.1" HOMEPAGE="http://www.hiawatha-webserver.org" -DOWNLOAD="http://www.hiawatha-webserver.org/files/hiawatha-7.4.tar.gz" -MD5SUM="ae86e0a343317472b58485b4a64cbbc1" +DOWNLOAD="http://www.hiawatha-webserver.org/files/hiawatha-7.4.1.tar.gz" +MD5SUM="9c5580157acdbcb1bd31a3fb8d3b0c05" 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/rc.hiawatha b/network/hiawatha/rc.hiawatha index 5dfa71ccec..94d8f10446 100644 --- a/network/hiawatha/rc.hiawatha +++ b/network/hiawatha/rc.hiawatha @@ -1,7 +1,23 @@ #!/bin/sh # Start/stop/restart the hiawatha web server -# Copyright (c) 2009-2010 Antonio Hernández Blas +# Copyright (c) 2009-2011 Antonio Hernández Blas + +# +# DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +# Version 2, December 2004 +# +# Copyright (C) 2004 Sam Hocevar +# +# Everyone is permitted to copy and distribute verbatim or modified +# copies of this license document, and changing it is allowed as long +# as the name is changed. +# +# DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +# TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +# +# 0. You just DO WHAT THE FUCK YOU WANT TO. +# CONF='/etc/hiawatha' CMMD="/usr/sbin/hiawatha -c $CONF" diff --git a/network/hiawatha/rc.php-fcgi b/network/hiawatha/rc.php-fcgi index 3a9ac5602e..a8d4a4f858 100644 --- a/network/hiawatha/rc.php-fcgi +++ b/network/hiawatha/rc.php-fcgi @@ -1,7 +1,23 @@ #!/bin/sh # Start/stop/restart PHP as FastCGI daemon -# Copyright (c) 2009-2010 Antonio Hernández Blas +# Copyright (c) 2009-2011 Antonio Hernández Blas + +# +# DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +# Version 2, December 2004 +# +# Copyright (C) 2004 Sam Hocevar +# +# Everyone is permitted to copy and distribute verbatim or modified +# copies of this license document, and changing it is allowed as long +# as the name is changed. +# +# DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +# TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +# +# 0. You just DO WHAT THE FUCK YOU WANT TO. +# CONF='/etc/hiawatha/php-fcgi.conf' CMMD="/usr/sbin/php-fcgi -c $CONF" -- cgit v1.2.3