From 074a79a5e6e3b30142443f8e505379e59aede74e Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Sun, 20 Mar 2016 02:50:42 -0500
Subject: network/squid: Fixup pid directory creation/usage

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

(limited to 'network/squid')

diff --git a/network/squid/rc.squid b/network/squid/rc.squid
index c3a680046e..7aef4777fe 100644
--- a/network/squid/rc.squid
+++ b/network/squid/rc.squid
@@ -32,6 +32,10 @@ squid_start() {
     fi
   done
 
+  # Create piddir and set proper permissions
+  mkdir -p /var/run/squid
+  chown root:@SQUIDGROUP@ /var/run/squid
+
   echo "Starting Squid:  $SQUIDCMD -F"
   $SQUIDCMD -F
 }
diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild
index a0100a442a..6182991c7f 100644
--- a/network/squid/squid.SlackBuild
+++ b/network/squid/squid.SlackBuild
@@ -110,9 +110,10 @@ cp -a \
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 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
+mkdir -p $PKG/etc/rc.d
+sed -e "s,@SQUIDGROUP@,$SQUIDGROUP," $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new
 
+mkdir -p $PKG/etc/logrotate.d
 sed -e "s,@USER@,$SQUIDUSER," -e "s,@GROUP@,$SQUIDGROUP," $CWD/squid.logrotate \
   > $PKG/etc/logrotate.d/squid.new
 
-- 
cgit v1.2.3