Skip to content

Commit e067ae3

Browse files
committed
tinyproxy: drop no longer needed wrapper
All distros (Fedora, Debian, Arch, Ubuntu) places tinyproxy under /usr/bin, so this wrapper is no longer needed.
1 parent b637f14 commit e067ae3

File tree

5 files changed

+1
-16
lines changed

5 files changed

+1
-16
lines changed

debian/qubes-core-agent.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ usr/lib/qubes/upgrades-status-notify
192192
usr/lib/qubes/vm-file-editor
193193
usr/lib/qubes/xdg-icon
194194
usr/lib/qubes/set-default-text-editor
195-
usr/lib/qubes/tinyproxy-wrapper
196195
usr/share/glib-2.0/schemas/*
197196
usr/share/kde4/services/*.desktop
198197
usr/share/keyrings/qubes-archive-keyring.gpg

network/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ install:
1111
install -d $(DESTDIR)$(QUBESLIBDIR)
1212
install -t $(DESTDIR)$(QUBESLIBDIR) \
1313
setup-ip \
14-
tinyproxy-wrapper \
1514
update-proxy-configs
1615
install -d $(DESTDIR)$(BINDIR)
1716
install -t $(DESTDIR)$(BINDIR) \

network/tinyproxy-wrapper

Lines changed: 0 additions & 12 deletions
This file was deleted.

rpm_spec/core-agent.spec.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,6 @@ rm -f %{name}-%{version}
10421042
/usr/lib/qubes/qubes-sync-clock
10431043
/usr/lib/qubes/resize-rootfs
10441044
/usr/lib/qubes/set-default-text-editor
1045-
/usr/lib/qubes/tinyproxy-wrapper
10461045
/usr/lib/dracut/dracut.conf.d/30-qubes.conf
10471046
/usr/lib/environment.d/60-gnome-software-fix.conf
10481047
%dir /usr/lib/qubes/init

vm-systemd/qubes-updates-proxy.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ConditionPathExists=|/var/run/qubes-service/qubes-updates-proxy
44
After=qubes-iptables.service
55

66
[Service]
7-
ExecStart=/usr/lib/qubes/tinyproxy-wrapper -d -c /etc/tinyproxy/tinyproxy-updates.conf
7+
ExecStart=/usr/bin/tinyproxy -d -c /etc/tinyproxy/tinyproxy-updates.conf
88
Restart=on-failure
99
RestartSec=5s
1010

0 commit comments

Comments
 (0)