From b637f14b0ee61ddc115a9b7b76333664439d2068 Mon Sep 17 00:00:00 2001
From: Yanase Yuki <dev@zpc.st>
Date: Sat, 5 Jul 2025 15:16:52 +0900
Subject: [PATCH 1/2] tinyproxy: drop unused configs

Upstream commit b935dc8 dropped these configs.
---
 network/tinyproxy-updates.conf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/network/tinyproxy-updates.conf b/network/tinyproxy-updates.conf
index b88c9179..6568a87b 100644
--- a/network/tinyproxy-updates.conf
+++ b/network/tinyproxy-updates.conf
@@ -11,10 +11,6 @@ LogLevel Notice
 PidFile "/var/run/tinyproxy-updates/tinyproxy.pid"
 
 MaxClients 50
-MinSpareServers 2
-MaxSpareServers 10
-StartServers 2
-MaxRequestsPerChild 0
 DisableViaHeader Yes
 
 Allow 127.0.0.1

From e067ae3a83814e2e0bc098157b1bd4916805e886 Mon Sep 17 00:00:00 2001
From: Yanase Yuki <dev@zpc.st>
Date: Sat, 5 Jul 2025 15:23:38 +0900
Subject: [PATCH 2/2] tinyproxy: drop no longer needed wrapper

All distros (Fedora, Debian, Arch, Ubuntu)
places tinyproxy under /usr/bin, so this wrapper
is no longer needed.
---
 debian/qubes-core-agent.install        |  1 -
 network/Makefile                       |  1 -
 network/tinyproxy-wrapper              | 12 ------------
 rpm_spec/core-agent.spec.in            |  1 -
 vm-systemd/qubes-updates-proxy.service |  2 +-
 5 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 network/tinyproxy-wrapper

diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 57fa6dfa..32ba1881 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -192,7 +192,6 @@ usr/lib/qubes/upgrades-status-notify
 usr/lib/qubes/vm-file-editor
 usr/lib/qubes/xdg-icon
 usr/lib/qubes/set-default-text-editor
-usr/lib/qubes/tinyproxy-wrapper
 usr/share/glib-2.0/schemas/*
 usr/share/kde4/services/*.desktop
 usr/share/keyrings/qubes-archive-keyring.gpg
diff --git a/network/Makefile b/network/Makefile
index 30d9eb2a..1d0bca49 100644
--- a/network/Makefile
+++ b/network/Makefile
@@ -11,7 +11,6 @@ install:
 	install -d $(DESTDIR)$(QUBESLIBDIR)
 	install -t $(DESTDIR)$(QUBESLIBDIR) \
 		setup-ip \
-		tinyproxy-wrapper \
 		update-proxy-configs
 	install -d $(DESTDIR)$(BINDIR)
 	install -t $(DESTDIR)$(BINDIR) \
diff --git a/network/tinyproxy-wrapper b/network/tinyproxy-wrapper
deleted file mode 100644
index 672c45b3..00000000
--- a/network/tinyproxy-wrapper
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [ -e /usr/sbin/tinyproxy ]; then
-    echo "Found tinyproxy at /usr/sbin/tinyproxy"
-    exec /usr/sbin/tinyproxy "$@"
-elif [ -e /usr/bin/tinyproxy ]; then
-    echo "Found tinyproxy at /usr/bin/tinyproxy"
-    exec /usr/bin/tinyproxy "$@"
-else
-    echo "tinyproxy not found"
-    exit 1
-fi
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index b58f8c37..4e627d1f 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -1042,7 +1042,6 @@ rm -f %{name}-%{version}
 /usr/lib/qubes/qubes-sync-clock
 /usr/lib/qubes/resize-rootfs
 /usr/lib/qubes/set-default-text-editor
-/usr/lib/qubes/tinyproxy-wrapper
 /usr/lib/dracut/dracut.conf.d/30-qubes.conf
 /usr/lib/environment.d/60-gnome-software-fix.conf
 %dir /usr/lib/qubes/init
diff --git a/vm-systemd/qubes-updates-proxy.service b/vm-systemd/qubes-updates-proxy.service
index 11688b93..388b560e 100644
--- a/vm-systemd/qubes-updates-proxy.service
+++ b/vm-systemd/qubes-updates-proxy.service
@@ -4,7 +4,7 @@ ConditionPathExists=|/var/run/qubes-service/qubes-updates-proxy
 After=qubes-iptables.service
 
 [Service]
-ExecStart=/usr/lib/qubes/tinyproxy-wrapper -d -c /etc/tinyproxy/tinyproxy-updates.conf
+ExecStart=/usr/bin/tinyproxy -d -c /etc/tinyproxy/tinyproxy-updates.conf
 Restart=on-failure
 RestartSec=5s