network/privoxy: Updated for version 3.0.21.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

1 files changed, 8 insertions, 11 deletions

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