Fix: use Tor package from trashman

diff --git a/share/trashman/tor-transproxy/unix/linux/debian/install b/share/trashman/tor-transproxy/unix/linux/debian/install
index 125dc2d918816e134f849040bcc39472ad683acc..9508091f5c7a4ea656553fc6c8fe565b819e4b2f 100755 (executable)
--- a/share/trashman/tor-transproxy/unix/linux/debian/install
+++ b/share/trashman/tor-transproxy/unix/linux/debian/install
@@ -11,7 +11,9 @@ SHARE="$1"
 . $SHARE/trashman/debian    || exit 1
 
 # Dependencies
-trashman_apt_install tor iptables
+#trashman_apt_install tor iptables
+trashman_apt_install iptables
+trashman install tor
 
 # Firewall config
 cp $SHARE/tor-transproxy/unix/linux/debian/files/etc/network/if-pre-up.d/iptables /etc/network/if-pre-up.d/iptables

diff --git a/share/trashman/tor/unix/linux/debian/install b/share/trashman/tor/unix/linux/debian/install
index 71f1cb92ba772958dc968b2d3681a9cec248ad11..7a8055e0c81374cb308584545800474c0befee2b 100755 (executable)
--- a/share/trashman/tor/unix/linux/debian/install
+++ b/share/trashman/tor/unix/linux/debian/install
@@ -16,7 +16,8 @@ REQUIREMENTS="apt-transport-https wget gnupg"
 trashman_apt_install_packages $REQUIREMENTS
 
 # Additional parameters
-DISTRIBUTION="bullseye"
+#DISTRIBUTION="bullseye"
+DISTRIBUTION="`trashman_debian_major_version_name`"
 
 cat <<-EOF > /etc/apt/sources.list.d/tor.list
    deb     [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $DISTRIBUTION main