From f676ad7993b51a9e1c46325f3fe1a91a821d76ad Mon Sep 17 00:00:00 2001
From: Kyle Guinn <elyk03@gmail.com>
Date: Wed, 24 Apr 2013 14:50:39 -0300
Subject: network/privoxy: Updated for version 3.0.21.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 network/privoxy/doinst.sh          | 13 ++++++++-----
 network/privoxy/privoxy.SlackBuild | 19 ++++++++-----------
 network/privoxy/privoxy.info       |  6 +++---
 network/privoxy/slack-desc         | 10 +++++-----
 4 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'network/privoxy')

diff --git a/network/privoxy/doinst.sh b/network/privoxy/doinst.sh
index 69368538fb..025c5a771f 100644
--- a/network/privoxy/doinst.sh
+++ b/network/privoxy/doinst.sh
@@ -31,12 +31,15 @@ fi
 
 preserve_perms etc/rc.d/rc.privoxy.new
 config etc/privoxy/config.new
-config etc/privoxy/default.action.new
-config etc/privoxy/default.filter.new
 config etc/privoxy/match-all.action.new
 config etc/privoxy/trust.new
 config etc/privoxy/user.action.new
 config etc/privoxy/user.filter.new
-for conf_file in etc/privoxy/templates/*.new; do
-  config $conf_file
-done
+
+# These files are not intended to be edited and will be overwritten.
+# To disregard, uncomment these and the .new renaming in privoxy.SlackBuild.
+#config etc/privoxy/default.action.new
+#config etc/privoxy/default.filter.new
+#for conf_file in etc/privoxy/templates/*.new; do
+#  config $conf_file
+#done
diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild
index 6023e73d82..fdea19131d 100644
--- a/network/privoxy/privoxy.SlackBuild
+++ b/network/privoxy/privoxy.SlackBuild
@@ -27,7 +27,7 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=privoxy
-VERSION=${VERSION:-3.0.19}
+VERSION=${VERSION:-3.0.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,19 +84,14 @@ rm -rf $PRGNAM-$VERSION-stable
 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 .
+chmod -R u+w,go-w,a+rX-st .
 
 # Put the docs where we tell them to go.
-# Also fix their permissions.
-sed -i \
-  -e "/^DOC_DEST/s/= .*/= @docdir@/" \
-  -e "/^RA_MODE/s/0664/0644/" \
-  GNUmakefile.in
+sed -i "/^DOC_DEST/s/= .*/= @docdir@/" GNUmakefile.in
 
 autoheader
 autoconf
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -132,9 +127,11 @@ sed -i \
   $PKG/etc/rc.d/rc.$PRGNAM.new 
 
 # Make .new files so we don't clobber the existing configuration.
-# The makefile already adds the .new extension to some files,
-# perhaps those are the only ones that are meant to be edited?
-find $PKG/etc/privoxy -name '*.new' -prune -o -type f -exec mv {} {}.new \;
+# The makefile already adds the .new extension to the user-editable files.
+# Others are not intended to be user-editable and will be overwritten.
+# To disregard, uncomment this and the corresponding lines in doinst.sh.
+#find $PKG/etc/privoxy -name '*.new' -prune -o -type f -exec mv {} {}.new \;
+
 # Don't clobber the logfile either.
 mv $PKG/var/log/privoxy/logfile $PKG/var/log/privoxy/logfile.new
  
diff --git a/network/privoxy/privoxy.info b/network/privoxy/privoxy.info
index ec25510b77..f126158407 100644
--- a/network/privoxy/privoxy.info
+++ b/network/privoxy/privoxy.info
@@ -1,8 +1,8 @@
 PRGNAM="privoxy"
-VERSION="3.0.19"
+VERSION="3.0.21"
 HOMEPAGE="http://www.privoxy.org/"
-DOWNLOAD="http://downloads.sourceforge.net/ijbswa/privoxy-3.0.19-stable-src.tar.gz"
-MD5SUM="57acc79059565cc42eda67982842785d"
+DOWNLOAD="http://downloads.sourceforge.net/ijbswa/privoxy-3.0.21-stable-src.tar.gz"
+MD5SUM="79558f2545cfcf9731f7de611646d837"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/privoxy/slack-desc b/network/privoxy/slack-desc
index 7bcb90f85e..94ca4836b3 100644
--- a/network/privoxy/slack-desc
+++ b/network/privoxy/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 privoxy: Privoxy (a web proxy with advanced filtering capabilities)
-- 
cgit v1.2.3