network/privoxy: Updated for version 3.0.8

4 files changed, 109 insertions, 38 deletions

diff --git a/network/privoxy/README b/network/privoxy/README
index 1947b95a45..28c86916a1 100644
--- a/network/privoxy/README
+++ b/network/privoxy/README
@@ -6,8 +6,6 @@ and can be customized to suit individual needs and tastes.
 Privoxy has application for both stand-alone systems and multi-user 
 networks.
 
-Homepage:  http://www.privoxy.org/
-
 Before executing the script, you will need to create 
 a privoxy user and group.  To do that, run the following commands:
 
diff --git a/network/privoxy/doinst.sh b/network/privoxy/doinst.sh
new file mode 100644
index 0000000000..7d29feb84b
--- /dev/null
+++ b/network/privoxy/doinst.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+# Keep same perms on rc.privoxy.new:
+if [ -e etc/rc.d/rc.privoxy ]; then
+  cp -a etc/rc.d/rc.privoxy etc/rc.d/rc.privoxy.new.incoming
+  cat etc/rc.d/rc.privoxy.new > etc/rc.d/rc.privoxy.new.incoming
+  mv etc/rc.d/rc.privoxy.new.incoming etc/rc.d/rc.privoxy.new
+else
+  # Install executable otherwise - irrelevant unless user starts in rc.local
+  chmod 0755 etc/rc.d/rc.privoxy.new
+fi
+
+config etc/rc.d/rc.privoxy.new
+config etc/privoxy/templates/cgi-error-bad-param.new
+config etc/privoxy/templates/cgi-error-disabled.new
+config etc/privoxy/templates/cgi-error-file.new
+config etc/privoxy/templates/cgi-error-modified.new
+config etc/privoxy/templates/cgi-error-parse.new
+config etc/privoxy/templates/connect-failed.new
+config etc/privoxy/templates/default.new
+config etc/privoxy/templates/edit-actions-add-url-form.new
+config etc/privoxy/templates/edit-actions-for-url.new
+config etc/privoxy/templates/edit-actions-list.new
+config etc/privoxy/templates/edit-actions-list-button.new
+config etc/privoxy/templates/cgi-style.css.new
+config etc/privoxy/templates/edit-actions-list-section.new
+config etc/privoxy/templates/edit-actions-list-url.new
+config etc/privoxy/templates/edit-actions-remove-url-form.new
+config etc/privoxy/templates/edit-actions-url-form.new
+config etc/privoxy/templates/mod-local-help.new
+config etc/privoxy/templates/mod-support-and-service.new
+config etc/privoxy/templates/mod-title.new
+config etc/privoxy/templates/mod-unstable-warning.new
+config etc/privoxy/templates/no-such-domain.new
+config etc/privoxy/templates/show-request.new
+config etc/privoxy/templates/show-status-file.new
+config etc/privoxy/templates/show-version.new
+config etc/privoxy/templates/toggle.new
+config etc/privoxy/templates/toggle-mini.new
+config etc/privoxy/templates/untrusted.new
+config etc/privoxy/templates/forwarding-failed.new
+config etc/privoxy/templates/blocked.new
+config etc/privoxy/templates/cgi-error-404.new
+config etc/privoxy/templates/cgi-error-file-read-only.new
+config etc/privoxy/templates/edit-actions-for-url-filter.new
+config etc/privoxy/templates/show-status.new
+config etc/privoxy/templates/show-url-info.new
+config etc/privoxy/default.action.new
+config etc/privoxy/standard.action.new
+config etc/privoxy/user.action.new
+config etc/privoxy/user.filter.new
+config etc/privoxy/config.new
+config etc/privoxy/trust.new
+config etc/privoxy/default.filter.new
diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild
index b0016aaf37..e0a6845db6 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
diff --git a/network/privoxy/privoxy.info b/network/privoxy/privoxy.info
index e03f9b7259..43d258a42d 100644
--- a/network/privoxy/privoxy.info
+++ b/network/privoxy/privoxy.info
@@ -1,8 +1,8 @@
 PRGNAM="privoxy"
-VERSION="3.0.6"
+VERSION="3.0.8"
 HOMEPAGE="http://www.privoxy.org/"
-DOWNLOAD="http://dl.sourceforge.net/ijbswa/privoxy-3.0.6-stable-src.tar.gz"
-MD5SUM="c3b34c620e1174f0c0b91aa2a04ceae4"
-MAINTAINER="Alex Lysenka"
+DOWNLOAD="http://downloads.sourceforge.net/sourceforge/ijbswa/privoxy-3.0.8-stable-src.tar.gz"
+MD5SUM="252c0e085218fb930c4bc7563e9cedd9"
+MAINTAINER="alkos333"
 EMAIL="me@alkos333.net"
-APPROVED="BP{k}"
+APPROVED="David Somero"