From e83ebc1600d5940e75256fd4eaafb88ba60992013fa0ff6104792bc137ad3599 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Mon, 29 Aug 2022 11:10:51 +0000
Subject: [PATCH] Accepting request 999891 from home:computersalat:devel:proxy

fix PIDFile

OBS-URL: https://build.opensuse.org/request/show/999891
OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=258
---
 squid.changes | 8 ++++++++
 squid.service | 1 -
 squid.spec    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/squid.changes b/squid.changes
index 53362ab..35a11a0 100644
--- a/squid.changes
+++ b/squid.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug 29 08:25:53 UTC 2022 - chris@computersalat.de
+
+- fix PIDFile
+  * NOT needed in service file
+    (squid.service: Can't open PID file /run/squid.pid)
+  * placed to tmpfilesdir
+
 -------------------------------------------------------------------
 Wed Jun 29 11:31:00 UTC 2022 - Stefan Schubert <schubi@suse.com>
 
diff --git a/squid.service b/squid.service
index 4fc3486..b5523df 100644
--- a/squid.service
+++ b/squid.service
@@ -22,7 +22,6 @@ ExecStartPre=%{_libexecdir}/squid/initialize_cache_if_needed.sh
 ExecStart=/usr/sbin/squid -FC
 ExecReload=/usr/bin/kill -HUP $MAINPID
 LimitNOFILE=4096
-PIDFile=/run/squid.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/squid.spec b/squid.spec
index be1c80a..31e0349 100644
--- a/squid.spec
+++ b/squid.spec
@@ -121,7 +121,7 @@ export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,relro,-z,now -pie"
 	--datadir=%{_datadir}/squid \
 	--sharedstatedir=%{_localstatedir}/squid \
 	--with-logdir=%{_localstatedir}/log/squid \
-	--with-pidfile=/run/squid.pid \
+	--with-pidfile=%{_rundir}/%{name}/squid.pid \
 	--with-dl \
 	--enable-disk-io \
 	--enable-storeio \