From 8ac78dc4bcdd624e2aa99dd611e8022b388b716a Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Tue, 11 Sep 2012 20:38:05 -0500
Subject: network/squid: Fixed logrotate script (added "su" directive)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 network/squid/squid.SlackBuild | 8 +++-----
 network/squid/squid.logrotate  | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'network/squid')

diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild
index 4b4349e874..f28cacd2e9 100644
--- a/network/squid/squid.SlackBuild
+++ b/network/squid/squid.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=squid
 VERSION=${VERSION:-3.1.20}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -113,10 +113,8 @@ chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/*
 mkdir -p $PKG/etc/{logrotate.d,rc.d} 
 cat $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new
 
-# Note that the .new file left hanging around in /etc/logrotate.d/ will
-# probably/surely make cron'd logrotations fail, but not installing it
-# as .new here will clobber a potentially custom file.
-cat $CWD/squid.logrotate > $PKG/etc/logrotate.d/squid.new
+sed -e "s,@USER@,$SQUIDUSER," -e "s,@GROUP@,$SQUIDGROUP," $CWD/squid.logrotate \
+  > $PKG/etc/logrotate.d/squid.new
 
 mv $PKG/etc/squid/mime.conf $PKG/etc/squid/mime.conf.new
 mv $PKG/etc/squid/cachemgr.conf $PKG/etc/squid/cachemgr.conf.new
diff --git a/network/squid/squid.logrotate b/network/squid/squid.logrotate
index cad527de36..eeca36223f 100644
--- a/network/squid/squid.logrotate
+++ b/network/squid/squid.logrotate
@@ -7,6 +7,7 @@
 # reopen squid.log, effectively using the new logfile.  The old logfile
 # (squid.log.1) will be compressed by logrotate's next invocation.
 /var/log/squid/*.log {
+    su @USER@ @GROUP@
     weekly
     rotate 5
     compress
-- 
cgit v1.2.3