From bdaaeeaa3e7f7e7175cbdb8bf7f61093d4564daf Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 19 Aug 2026 18:11:48 -0400 Subject: [PATCH] net-vpn/tor: systemd use cache dir, run as user, add template Improve systemd service: * Use the cache directory for cache data, instead of the default which to use the data directory * Run as the tor user by default instead of root * Add a systemd service template Bug: https://bugs.gentoo.org/706430 Bug: https://bugs.gentoo.org/547068 Bug: https://bugs.gentoo.org/694986 Signed-off-by: Craig Andrews Closes: https://github.com/gentoo/gentoo/pull/46695 --- net-vpn/tor/files/tor.service-r1 | 43 ++++++ net-vpn/tor/files/tor_at.service | 44 +++++++ net-vpn/tor/tor-0.4.9.11-r1.ebuild | 203 +++++++++++++++++++++++++++++ net-vpn/tor/tor-9999.ebuild | 3 +- 4 files changed, 292 insertions(+), 1 deletion(-) create mode 100644 net-vpn/tor/files/tor.service-r1 create mode 100644 net-vpn/tor/files/tor_at.service create mode 100644 net-vpn/tor/tor-0.4.9.11-r1.ebuild diff --git a/net-vpn/tor/files/tor.service-r1 b/net-vpn/tor/files/tor.service-r1 new file mode 100644 index 0000000000000..7abc07574e364 --- /dev/null +++ b/net-vpn/tor/files/tor.service-r1 @@ -0,0 +1,43 @@ +# tor.service -- this systemd configuration file for Tor sets up a +# relatively conservative, hardened Tor service. You may need to +# edit it if you are making changes to your Tor configuration that it +# does not allow. Package maintainers: this should be a starting point +# for your tor.service; it is not the last point. + +[Unit] +Description=Anonymizing overlay network for TCP +After=syslog.target network.target nss-lookup.target + +[Service] +User=tor +Type=notify +NotifyAccess=all +ExecStartPre=/usr/bin/tor --DataDirectory "$STATE_DIRECTORY" --CacheDirectory "$CACHE_DIRECTORY" -f /etc/tor/torrc --verify-config +ExecStart=/usr/bin/tor --DataDirectory "$STATE_DIRECTORY" --CacheDirectory "$CACHE_DIRECTORY" -f /etc/tor/torrc +ExecReload=/bin/kill -HUP ${MAINPID} +KillSignal=SIGINT +TimeoutSec=60 +Restart=on-failure +WatchdogSec=1m +LimitNOFILE=32768 + +# Hardening +Group=tor +CacheDirectory=tor +CacheDirectoryMode=0770 +StateDirectory=tor +StateDirectoryMode=0770 +LogsDirectory=tor +LogsDirectoryMode=0770 +RuntimeDirectory=tor +RuntimeDirectoryMode=0770 +PrivateTmp=yes +PrivateDevices=yes +ProtectHome=yes +ProtectSystem=full +ReadOnlyDirectories=/ +NoNewPrivileges=yes +CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE + +[Install] +WantedBy=multi-user.target diff --git a/net-vpn/tor/files/tor_at.service b/net-vpn/tor/files/tor_at.service new file mode 100644 index 0000000000000..ddc51f385d9b1 --- /dev/null +++ b/net-vpn/tor/files/tor_at.service @@ -0,0 +1,44 @@ +# tor@.service -- this systemd configuration file for Tor sets up a +# relatively conservative, hardened Tor service. You may need to +# edit it if you are making changes to your Tor configuration that it +# does not allow. Package maintainers: this should be a starting point +# for your tor.service; it is not the last point. + +[Unit] +Description=Anonymizing overlay network for TCP +After=syslog.target network.target nss-lookup.target + +[Service] +User=tor +Type=notify +NotifyAccess=all +ExecStartPre=/usr/bin/tor --DataDirectory "$STATE_DIRECTORY" --CacheDirectory "$CACHE_DIRECTORY" -f "/etc/tor/torrc-%i" --verify-config +ExecStart=/usr/bin/tor --DataDirectory "$STATE_DIRECTORY" --CacheDirectory "$CACHE_DIRECTORY" -f "/etc/tor/torrc-%i" +ExecReload=/bin/kill -HUP ${MAINPID} +KillSignal=SIGINT +TimeoutSec=60 +Restart=on-failure +WatchdogSec=1m +LimitNOFILE=32768 + +# Hardening +Group=tor +CacheDirectory=tor-%i +CacheDirectoryMode=0770 +StateDirectory=tor-%i +StateDirectoryMode=0770 +LogsDirectory=tor-%i +LogsDirectoryMode=0770 +RuntimeDirectory=tor-%i +RuntimeDirectoryMode=0770 +PrivateTmp=yes +PrivateDevices=yes +ProtectHome=yes +ProtectSystem=full +ReadOnlyDirectories=/ +NoNewPrivileges=yes +CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE + +[Install] +WantedBy=multi-user.target + diff --git a/net-vpn/tor/tor-0.4.9.11-r1.ebuild b/net-vpn/tor/tor-0.4.9.11-r1.ebuild new file mode 100644 index 0000000000000..c895fb676118e --- /dev/null +++ b/net-vpn/tor/tor-0.4.9.11-r1.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..14} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/torproject.org.asc +inherit edo python-any-r1 readme.gentoo-r1 systemd verify-sig + +MY_PV="$(ver_rs 4 -)" +MY_PF="${PN}-${MY_PV}" +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="https://www.torproject.org/ https://gitlab.torproject.org/tpo/core/tor/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.torproject.org/tpo/core/tor" + inherit autotools git-r3 +else + SRC_URI=" + https://www.torproject.org/dist/${MY_PF}.tar.gz + https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz + verify-sig? ( + https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum + https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc + ) + " + + S="${WORKDIR}/${MY_PF}" + + if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20250713 )" +fi + +# BSD in general, but for PoW, needs --enable-gpl (GPL-3 per --version) +# We also already had GPL-2 listed here for the init script, but obviously +# that's different from the actual binary. +LICENSE="BSD GPL-2 GPL-3" +SLOT="0" +IUSE="caps doc hardened lzma +man scrypt seccomp selinux +server systemd test zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/libevent-2.1.12-r1:=[ssl] + >=dev-libs/openssl-1.1.1:=[-bindist(-)] + virtual/zlib:= + caps? ( sys-libs/libcap ) + man? ( app-text/asciidoc ) + lzma? ( app-arch/xz-utils ) + scrypt? ( app-crypt/libscrypt ) + seccomp? ( >=sys-libs/libseccomp-2.4.1 ) + systemd? ( sys-apps/systemd:= ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + ${DEPEND} + ${PYTHON_DEPS} + ) +" +RDEPEND+=" + acct-user/tor + acct-group/tor + selinux? ( sec-policy/selinux-tor ) +" +BDEPEND+=" + acct-user/tor + acct-group/tor +" + +DOCS=() + +PATCHES=( + "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch +) + +QA_CONFIG_IMPL_DECL_SKIP=( + # test correctly fails because -lnacl fails if not available + # https://bugs.gentoo.org/900092 + crypto_scalarmult_curve25519 +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + if use verify-sig; then + cd "${DISTDIR}" || die + verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc} + verify-sig_verify_unsigned_checksums \ + ${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz + cd "${WORKDIR}" || die + fi + + default + fi +} + +src_prepare() { + default + + # Running shellcheck automagically isn't useful for ebuild testing. + echo "exit 0" > scripts/maint/checkShellScripts.sh || die + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi +} + +src_configure() { + use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING ) + + export ac_cv_lib_cap_cap_init=$(usex caps) + export tor_cv_PYTHON="${EPYTHON}" + # Already set by default in profiles for our toolchain + export tor_cv_cflags__fcf_protection_full=no + export tor_cv_cflags__mbranch_protection_standard=no + + local myeconfargs=( + --localstatedir="${EPREFIX}/var" + --disable-all-bugs-are-fatal + --enable-system-torrc + --disable-android + --disable-coverage + --disable-html-manual + --disable-libfuzzer + --enable-missing-doc-warnings + --disable-module-dirauth + --enable-pic + --disable-restart-debugging + + # Unless someone asks & has a compelling reason, just always + # build in GPL mode for pow, given we don't want yet another USE + # flag combination to have to test just for the sake of it. + # (PoW requires GPL.) + --enable-gpl + --enable-module-pow + + $(use_enable hardened gcc-hardening) + $(use_enable hardened linker-hardening) + $(use_enable man asciidoc) + $(use_enable man manpage) + $(use_enable lzma) + $(use_enable scrypt libscrypt) + $(use_enable seccomp) + $(use_enable server module-relay) + $(use_enable systemd) + $(use_enable test unittests) + $(use_enable zstd) + ) + + econf "${myeconfargs[@]}" +} + +src_test() { + local skip_tests=( + # Fails in sandbox + :sandbox/open_filename + :sandbox/openat_filename + ) + + if use arm ; then + skip_tests+=( + # bug #920905 + # https://gitlab.torproject.org/tpo/core/tor/-/issues/40912 + :sandbox/opendir_dirname + :sandbox/openat_filename + :sandbox/chmod_filename + :sandbox/chown_filename + :sandbox/rename_filename + ) + fi + + # The makefile runs these by parallel by chunking them with a script + # but that means we lose verbosity and can't skip individual tests easily + # either. + edo ./src/test/test --verbose "${skip_tests[@]}" +} + +src_install() { + default + readme.gentoo_create_doc + + newconfd "${FILESDIR}"/tor.confd tor + newinitd "${FILESDIR}"/tor.initd-r9 tor + systemd_newunit "${FILESDIR}"/tor.service-r1 "${PN}.service" + systemd_newunit "${FILESDIR}"/tor_at.service "${PN}@.service" + + keepdir /var/lib/tor + + fperms 750 /var/lib/tor + fowners tor:tor /var/lib/tor + + insinto /etc/tor/ + newins "${FILESDIR}"/torrc-r2 torrc +} diff --git a/net-vpn/tor/tor-9999.ebuild b/net-vpn/tor/tor-9999.ebuild index d76d79a26c9b8..c895fb676118e 100644 --- a/net-vpn/tor/tor-9999.ebuild +++ b/net-vpn/tor/tor-9999.ebuild @@ -190,7 +190,8 @@ src_install() { newconfd "${FILESDIR}"/tor.confd tor newinitd "${FILESDIR}"/tor.initd-r9 tor - systemd_dounit "${FILESDIR}"/tor.service + systemd_newunit "${FILESDIR}"/tor.service-r1 "${PN}.service" + systemd_newunit "${FILESDIR}"/tor_at.service "${PN}@.service" keepdir /var/lib/tor