From 56877006d5afc3ff6136de7ce335497c188adf9c Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Tue, 12 Nov 2013 00:05:17 -0600 Subject: network/privoxy: Fix .new file creation Signed-off-by: Kyle Guinn Signed-off-by: Robby Workman --- network/privoxy/privoxy.SlackBuild | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild index fdea19131d..48b42c4279 100644 --- a/network/privoxy/privoxy.SlackBuild +++ b/network/privoxy/privoxy.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=privoxy VERSION=${VERSION:-3.0.21} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -89,6 +89,10 @@ 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 +# The Makefile checks if certain config files exist, and if so, adds a +# .new suffix. Turn this behavior off. We will do it below. +sed -i "s/\[ -s \"\$(CONF_DEST)\/\$\$i\" \]/false/" GNUmakefile.in + autoheader autoconf CFLAGS="$SLKCFLAGS" \ @@ -127,7 +131,9 @@ 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 the user-editable files. +for i in config match-all.action trust user.action user.filter; do + mv $PKG/etc/privoxy/$i $PKG/etc/privoxy/$i.new +done # 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 \; -- cgit v1.2.3