From 2d77f1aecd063f6a437289aec71fa40299a73407 Mon Sep 17 00:00:00 2001
From: Carl George <carlwgeorge@fedoraproject.org>
Date: Feb 14 2024 07:01:18 +0000
Subject: Run daemon in foreground to remove the need for pidfile tracking


---

diff --git a/tinyproxy.service b/tinyproxy.service
index 6e4c993..3d08a0b 100644
--- a/tinyproxy.service
+++ b/tinyproxy.service
@@ -4,10 +4,9 @@ Documentation=man:tinyproxy(8)
 After=network.target
 
 [Service]
-Type=forking
-ExecStart=/usr/bin/tinyproxy
+Type=exec
+ExecStart=/usr/bin/tinyproxy -d
 ExecReload=/usr/bin/kill -USR1 $MAINPID
-PIDFile=/run/tinyproxy/tinyproxy.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/tinyproxy.spec b/tinyproxy.spec
index 0bb23f4..0774a70 100644
--- a/tinyproxy.spec
+++ b/tinyproxy.spec
@@ -9,7 +9,6 @@ License:        GPL-2.0-or-later
 URL:            https://tinyproxy.github.io/
 Source0:        https://github.com/tinyproxy/tinyproxy/releases/download/%{version}/tinyproxy-%{version}.tar.xz
 Source1:        tinyproxy.service
-Source4:        tinyproxy.tmpfiles
 
 BuildRequires:  make
 BuildRequires:  gcc
@@ -41,8 +40,6 @@ sed -e '/^User / s/nobody/tinyproxy/' \
 %install
 %make_install
 install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/tinyproxy.service
-install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/tinyproxy.conf
-install -p -d -m 0700 %{buildroot}/run/tinyproxy
 
 
 %pre
@@ -54,7 +51,6 @@ exit 0
 
 
 %post
-/bin/systemd-tmpfiles --create %{_tmpfilesdir}/tinyproxy.conf
 %systemd_post tinyproxy.service
 
 
@@ -73,12 +69,9 @@ exit 0
 %{_mandir}/man8/tinyproxy.8*
 %{_mandir}/man5/tinyproxy.conf.5*
 %{_unitdir}/tinyproxy.service
-%{_tmpfilesdir}/tinyproxy.conf
 %{_datadir}/tinyproxy
 %dir %{_sysconfdir}/tinyproxy
-%ghost %dir /run/tinyproxy
 %config(noreplace) %{_sysconfdir}/tinyproxy/tinyproxy.conf
-%attr(0700,tinyproxy,tinyproxy) %ghost %dir /run/tinyproxy
 
 
 %changelog
@@ -87,6 +80,7 @@ exit 0
 - Switch to SPDX license identifier and mark license file appropriately
 - Use upstream default config file with minimal changes
 - Log to journal instead of files
+- Run daemon in foreground to remove the need for pidfile tracking
 
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/tinyproxy.tmpfiles b/tinyproxy.tmpfiles
deleted file mode 100644
index 69271a2..0000000
--- a/tinyproxy.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-D /run/tinyproxy 0750 tinyproxy tinyproxy -