4 files changed, 39 insertions, 51 deletions
diff --git a/network/privoxy/README b/network/privoxy/README
index 587259a77a749..f1696bd9c74e9 100644
--- a/network/privoxy/README
+++ b/network/privoxy/README
@@ -12,4 +12,15 @@ a privoxy user and group.  To do that, run the following commands:
 groupadd -g 206 privoxy
 useradd -u 206 -g 206 -c "Web Proxy" -d /dev/null -s /bin/false privoxy
 
-See README.SLACKWARE for setup information.
+To run privoxy at boot, the following code needs to
+be added to /etc/rc.d/rc.local:
+
+  if [ -x /etc/rc.d/rc.privoxy ]; then
+    /etc/rc.d/rc.privoxy start
+  fi
+
+Then add the following to /etc/rc.d/rc.local_shutdown:
+
+  if [ -x /etc/rc.d/rc.privoxy ]; then
+    /etc/rc.d/rc.privoxy stop
+  fi
diff --git a/network/privoxy/README.SLACKWARE b/network/privoxy/README.SLACKWARE
deleted file mode 100644
index 0e1e7c0ef850d..0000000000000
--- a/network/privoxy/README.SLACKWARE
+++ /dev/null
@@ -1,15 +0,0 @@
-README.SLACKWARE for privoxy
-
-To run privoxy at boot, the following code needs to
-be added to /etc/rc.d/rc.local:
-
-  if [ -x /etc/rc.d/rc.privoxy ];  then
-    /etc/rc.d/rc.privoxy start
-  fi
-
-Then add the following to /etc/rc.d/rc.local_shutdown:
-
-  if [ -x /etc/rc.d/rc.privoxy ];  then
-    /etc/rc.d/rc.privoxy stop
-  fi
-
diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild
index 4e72ebb603b31..4a7d8ef65f79f 100644
--- a/network/privoxy/privoxy.SlackBuild
+++ b/network/privoxy/privoxy.SlackBuild
@@ -3,32 +3,29 @@
 # Slackware build script for privoxy
 
 # Copyright (c) 2007  alkos333 <me@alkos333.net>
+# Copyright 2014 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
 #
-# 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
+#  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.
 
 PRGNAM=privoxy
-VERSION=${VERSION:-3.0.21}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.0.22}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -84,11 +81,7 @@ rm -rf $PRGNAM-$VERSION-stable
 tar xvf $CWD/$PRGNAM-$VERSION-stable-src.tar.gz
 cd $PRGNAM-$VERSION-stable
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R u+w,go-w,a+rX-st .
 
 # Put the docs where we tell them to go.
 sed -i "/^DOC_DEST/s/= .*/= @docdir@/" GNUmakefile.in
@@ -118,21 +111,20 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+find $PKG/usr/man -type f -exec gzip -9 {} +
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
-mkdir $PKG/etc/rc.d
-cat slackware/rc.privoxy.orig > $PKG/etc/rc.d/rc.$PRGNAM.new
-chmod +x $PKG/etc/rc.d/rc.$PRGNAM.new
-sed -i \
+mkdir -p $PKG/etc/rc.d
+sed \
   -e "s/%PROGRAM%/$PRGNAM/" \
   -e "s,%SBIN_DEST%,/usr/sbin," \
   -e "s,%CONF_DEST%,/etc/$PRGNAM," \
   -e "s/%USER%/$PRIVOXY_USER/" \
   -e "s/%GROUP%/$PRIVOXY_GROUP/" \
-  $PKG/etc/rc.d/rc.$PRGNAM.new
+  slackware/rc.privoxy.orig \
+  > $PKG/etc/rc.d/rc.privoxy.new
+chmod +x $PKG/etc/rc.d/rc.privoxy.new
 
 # Make .new files so we don't clobber the existing configuration.
 for i in config match-all.action trust user.action user.filter; do
diff --git a/network/privoxy/privoxy.info b/network/privoxy/privoxy.info
index f12615840710f..4bdaea074ab74 100644
--- a/network/privoxy/privoxy.info
+++ b/network/privoxy/privoxy.info
@@ -1,8 +1,8 @@
 PRGNAM="privoxy"
-VERSION="3.0.21"
+VERSION="3.0.22"
 HOMEPAGE="http://www.privoxy.org/"
-DOWNLOAD="http://downloads.sourceforge.net/ijbswa/privoxy-3.0.21-stable-src.tar.gz"
-MD5SUM="79558f2545cfcf9731f7de611646d837"
+DOWNLOAD="http://downloads.sourceforge.net/ijbswa/privoxy-3.0.22-stable-src.tar.gz"
+MD5SUM="aa121751d332a51d37d3c6e4b7594daa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""