network/privoxy: Updated for version 3.0.8

1 files changed, 39 insertions, 31 deletions

diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild
index b0016aaf3711..e0a6845db66e 100644
--- a/network/privoxy/privoxy.SlackBuild
+++ b/network/privoxy/privoxy.SlackBuild
@@ -1,38 +1,40 @@
 #!/bin/sh
 
-# Build script for privoxy
-# Written by Alex Lysenka <me@alkos333.net>
 
-# Copyright  2007 Alex Lysenka <me@alkos333.net)
+# Slackware build script for privoxy
+# Copyright (c) 2007  alkos333 <me@alkos333.net>
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by the SlackBuilds.org project
 
 set -e
 
 PRGNAM=privoxy
-VERSION=3.0.6
+VERSION=3.0.8
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=$( pwd )
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,7 +49,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION-stable-src.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-stable-src.tar.gz
 cd $PRGNAM-$VERSION-stable
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -79,23 +81,29 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 mkdir $PKG/etc/rc.d
-cat $TMP/$PRGNAM-$VERSION-stable/slackware/rc.privoxy.orig > $PKG/etc/rc.d/rc.privoxy
-sed "	s/%PROGRAM%/$PRGNAM/
-	s/%SBIN_DEST%/\/usr\/bin/
-	s/%CONF_DEST%/\/etc\/$PRGNAM/
-	s/%USER%/$PRGNAM/
-	s/%GROUP%/$PRGNAM/
-	s/\/var\/run\/\$PRIVOXY_PRG/\/var\/run/
-" $PKG/etc/rc.d/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.tmp
-mv $PKG/etc/rc.d/rc.$PRGNAM.tmp $PKG/etc/rc.d/rc.$PRGNAM
-chmod +x $PKG/etc/rc.d/rc.$PRGNAM
+cat $TMP/$PRGNAM-$VERSION-stable/slackware/rc.privoxy.orig > $PKG/etc/rc.d/rc.$PRGNAM.new
+sed -i "	s/%PROGRAM%/$PRGNAM/
+		s/%SBIN_DEST%/\/usr\/bin/
+		s/%CONF_DEST%/\/etc\/$PRGNAM/
+		s/%USER%/$PRGNAM/
+		s/%GROUP%/$PRGNAM/
+		s/\/var\/run\/\$PRIVOXY_PRG/\/var\/run/
+" $PKG/etc/rc.d/rc.$PRGNAM.new 
 
 # Fix Path within the configuration files (thanks to h4kteur)
 sed -i "s#$PKG##g" $PKG/etc/$PRGNAM/config
-# Fix Path with the config file to point to right usermanual (--BP{k}
+# Fix Path with the config file to point to right usermanual (thanks toBP{k})
 sed -i "s#user-manual /usr/doc/$PRGNAM#user-manual /usr/doc/$PRGNAM-$VERSION#" $PKG/etc/privoxy/config
+
+# Make .new files so we dont clobber existing configuration
+find $PKG/etc/privoxy -type f -exec mv {} {}.new \;
+
+# Remove this directory since it empty and part of Slackware base 
+rmdir $PKG/var/run
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz