commit: c0fe6a0d4e379ce403f88e54f23d77695fe2cf05 Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com> AuthorDate: Sun Feb 25 00:26:52 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sun Feb 25 00:57:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fe6a0d
net-vpn/tor: Fix tor.service failure when /var/run is tmpfs Closes: https://bugs.gentoo.org/640040 .../files/tor-0.3.3.2-alpha-tor.service.in.patch | 12 +++ net-vpn/tor/tor-0.3.3.2_alpha-r1.ebuild | 85 ++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch b/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch new file mode 100644 index 00000000000..76e88bbaba9 --- /dev/null +++ b/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch @@ -0,0 +1,12 @@ +--- a/contrib/dist/tor.service.in 2017-11-11 13:40:46.000000000 -0500 ++++ b/contrib/dist/tor.service.in 2018-02-24 19:06:12.307506884 -0500 +@@ -21,6 +21,9 @@ + LimitNOFILE=32768 + + # Hardening ++Group=tor ++RuntimeDirectory=tor ++RuntimeDirectoryMode=0770 + PrivateTmp=yes + PrivateDevices=yes + ProtectHome=yes diff --git a/net-vpn/tor/tor-0.3.3.2_alpha-r1.ebuild b/net-vpn/tor/tor-0.3.3.2_alpha-r1.ebuild new file mode 100644 index 00000000000..65525074136 --- /dev/null +++ b/net-vpn/tor/tor-0.3.3.2_alpha-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit flag-o-matic readme.gentoo-r1 systemd versionator user + +MY_PV="$(replace_version_separator 4 -)" +MY_PF="${PN}-${MY_PV}" +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/"; +SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz + https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"; +S="${WORKDIR}/${MY_PF}" + +LICENSE="BSD GPL-2" +SLOT="0" +# We need to keyword app-arch/zstd +#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos" +IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd" + +DEPEND=" + app-text/asciidoc + dev-libs/libevent[ssl] + sys-libs/zlib + !libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + lzma? ( app-arch/xz-utils ) + scrypt? ( app-crypt/libscrypt ) + seccomp? ( sys-libs/libseccomp ) + systemd? ( sys-apps/systemd ) + zstd? ( app-arch/zstd )" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-tor )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch + "${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch +) + +DOCS=( README ChangeLog ReleaseNotes doc/HACKING ) + +pkg_setup() { + enewgroup tor + enewuser tor -1 -1 /var/lib/tor tor +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}/var" \ + --enable-system-torrc \ + --enable-asciidoc \ + --disable-android \ + --disable-libfuzzer \ + --disable-rust \ + --disable-restart-debugging \ + $(use_enable lzma) \ + $(use_enable scrypt libscrypt) \ + $(use_enable seccomp) \ + $(use_enable systemd) \ + $(use_enable tor-hardening gcc-hardening) \ + $(use_enable tor-hardening linker-hardening) \ + $(use_enable web tor2web-mode) \ + $(use_enable test unittests) \ + $(use_enable test coverage) \ + $(use_enable zstd) +} + +src_install() { + default + readme.gentoo_create_doc + + newconfd "${FILESDIR}"/tor.confd tor + newinitd "${FILESDIR}"/tor.initd-r8 tor + systemd_dounit contrib/dist/tor.service + + keepdir /var/lib/tor + + fperms 750 /var/lib/tor + fowners tor:tor /var/lib/tor + + insinto /etc/tor/ + newins "${FILESDIR}"/torrc-r1 torrc +}
