network/haproxy: Updated for version 1.3.15.7

4 files changed, 25 insertions, 33 deletions

diff --git a/network/haproxy/README b/network/haproxy/README
index be33fe7b4b..fd8942d3f6 100644
--- a/network/haproxy/README
+++ b/network/haproxy/README
@@ -5,6 +5,5 @@ very high loads while needing persistence or Layer7 processing.
 
 Note:
 By default, this SlackBuild supposes that the kernel supports epoll if
-the kernel release is 2.4.x.
-This is a reasonable choice for running HAProxy, isn't it?
-Otherwise, please remember to modify this SlackBuild.
+the kernel release is 2.4.x. Otherwise, please modify this SlackBuild
+to suit your situation.
diff --git a/network/haproxy/haproxy.SlackBuild b/network/haproxy/haproxy.SlackBuild
index 7870f6b498..c8550300ab 100644
--- a/network/haproxy/haproxy.SlackBuild
+++ b/network/haproxy/haproxy.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for haproxy
 #
-# Copyright 2008 Cherife Li <cherife@dotimes.com>
+# Copyright 2008 Cherife Li <cherife-#-dotimes.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,15 +23,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Notes:
-# + Don't forget to check the VERSION number.
-# + You may want to customize the configure options.
 # + By default, this SlackBuild supposes that the kernel supports epoll
-#   if the kernel release is 2.4.x.
-#   This is a reasonable choice for running HAProxy, isn't it?
-#   Otherwise, please remember to modify this SlackBuild.
+#   if the kernel release is 2.4.x. Otherwise, please modify this SlackBuild
+#   to suit your situation.
 
 PRGNAM=haproxy
-VERSION=1.3.15.2
+VERSION=1.3.15.7
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -92,16 +89,17 @@ cat $CWD/rc.haproxy > $PKG/etc/rc.d/rc.haproxy.new
 cat ./examples/haproxy.cfg > $PKG/etc/haproxy/haproxy.cfg.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG CONTRIB LICENSE README ROADMAP SUBVERS VERSION doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG CONTRIB LICENSE README ROADMAP SUBVERS TODO VERDATE VERSION doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/haproxy.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/haproxy.SlackBuild
 
-# Compress man pages
+mv $PKG/usr/share/man $PKG/usr/
+rm -rf $PKG/usr/{share,/doc/haproxy}
+
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-# Strip everything for good measure:
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -111,6 +109,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Build the package:
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/network/haproxy/haproxy.info b/network/haproxy/haproxy.info
index f5d187180d..c45ac13512 100644
--- a/network/haproxy/haproxy.info
+++ b/network/haproxy/haproxy.info
@@ -1,8 +1,8 @@
 PRGNAM="haproxy"
-VERSION="1.3.15.2"
+VERSION="1.3.15.7"
 HOMEPAGE="http://haproxy.1wt.eu/"
-DOWNLOAD="http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.15.2.tar.gz"
-MD5SUM="a64d7f5a7464e769f8676802be8e8f36"
+DOWNLOAD="http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.15.7.tar.gz"
+MD5SUM="6c1978071139c5cc27563232c2a488da"
 MAINTAINER="Cherife Li"
-EMAIL="cherife@dotimes.com"
-APPROVED="David Somero"
+EMAIL="cherife-#-dotimes.com"
+APPROVED="dsomero"
diff --git a/network/haproxy/rc.haproxy b/network/haproxy/rc.haproxy
index 6f224d7f76..5663cc37a1 100644
--- a/network/haproxy/rc.haproxy
+++ b/network/haproxy/rc.haproxy
@@ -1,35 +1,31 @@
 #!/bin/sh
 #
 # HAProxy daemon control script.
-# 
-# This is an init script for the haproxy daemon.
-# To use haproxy, you must first set up the config file(s).
-#
-# Written for Slackware Linux by Cherife Li <cherife@dotimes.com>.
-#
+# Written for Slackware Linux by Cherife Li <cherife-#-dotimes.com>.
 
-Bin=/usr/sbin/haproxy
-CfgFile=/etc/haproxy/haproxy.cfg
-PIDFile=/var/run/haproxy.pid
+BIN=/usr/sbin/haproxy
+CONF=/etc/haproxy/haproxy.cfg
+PID=/var/run/haproxy.pid
 
 case "$1" in
   check)
     echo "Checking HAProxy configuration file..."
-    $Bin -f $CfgFile -cV
+    $BIN -f $CONF -cV
     ;;
   start)
     echo "Starting HAProxy..."
-    $Bin -f $CfgFile -D -p $PIDFile
+    $BIN -f $CONF -D -p $PID
     ;;
   stop)
     echo "Shutting down HAProxy..."
-    kill -TERM `cat $PIDFile`
-    rm -f $PIDFile
+    kill -TERM `cat $PID`
+    rm -f $PID &> /dev/null
     ;;
   restart)
     stop
+    sleep 2
     start
     ;;
   *)
-    echo "usage $0 {check|start|stop|restart}"
+    echo "usage `basename $0` {check|start|stop|restart}"
 esac