commit: 70608fb75bb09f0e1bb5e0fa5ee73f67d13e53e1
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 20:30:59 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 20:31:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70608fb7
net-vpn/tor: bumps to 0.4.0.6, 0.4.1.7, 0.4.2.5, remove older
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-vpn/tor/Manifest | 5 +++--
.../{tor-0.4.1.6-r1.ebuild => tor-0.4.0.6.ebuild} | 21 ++++++++++++---------
.../{tor-0.4.1.6-r1.ebuild => tor-0.4.1.7.ebuild} | 0
...{tor-0.4.2.4_rc-r1.ebuild => tor-0.4.2.5.ebuild} | 0
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index f32027de0c5..bcabedfe421 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,3 +1,4 @@
DIST tor-0.4.0.5.tar.gz 7203877 BLAKE2B
e03710038615a5b9baf327933917c369bb3fabd4df6dd9f16053a0b72bcf20219e956e74258d0e39ae297d406035a89fab017d2e28c795f5d713c3933ad7cd29
SHA512
f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
-DIST tor-0.4.1.6.tar.gz 7390096 BLAKE2B
b98f06b771953de781f446528096ff3c688599bae4c141f14a6be06373deebf11f6c15faf2168aee672bf75fcd25f42e2142e469046cd0a442b558c7cf41b28b
SHA512
9e4625216e25b9498d6054a9920e5a8932ca7b28c5131062eac637b69c80cdf05bc3fd008b833e5359d8849e256f1f405abd56b07f50fd91077b153ba60503da
-DIST tor-0.4.2.4-rc.tar.gz 7567877 BLAKE2B
a2f8616c7ff3d03b6480d76e01715e707c7c5f57b934c178b76ee7998abad6b5da98a7d76314ff3d641806324936f8b67fb009f9a3996d201ab1b92bbf069df4
SHA512
689dee6abc5c2bc9cc9018f506da3e38ea579ec582214b5ad987b0fd1432a7a0b9997a3981b89c5e204b289ffcb2d59f2273ba7ceda8941611eac55d898b5b98
+DIST tor-0.4.0.6.tar.gz 7380018 BLAKE2B
d013fdb5c253be934e28d312fb1e9f03b679651a42878859375d12620fcbe30e077870b1714f2e52f5d7836351dbb1cc0805535c2a7e32256ebf1fce1ba68d63
SHA512
6ed701e5a3c05437877b7c3891c924655f2e47585ac3e2e6ac2fb5604a3ebf8a945f17f03e042d491d4d956da653ba110aa7e5f8bfa231fc0476d36a0a7f02e5
+DIST tor-0.4.1.7.tar.gz 7512661 BLAKE2B
34c1c8e40c6a2a2aeb19e1161b3b32d1683da246c5839c9fc4375471d8e7c46bb1277bcf8fc700898580a6b15d8f401ee61f422ecd7a88c783cffb1157150fc5
SHA512
f6ead1412d23516a16f31e1157b4538071752ae09a421d9dceaa7cf76599c01490f9bfcb8e26f1a75e888359adf6adcd029ca64cf48e3b45b07e2d62482c9541
+DIST tor-0.4.2.5.tar.gz 7596836 BLAKE2B
0c7fa5d427f9d0683846c1023a4539ae4042c0d26f1c5afff20037f0681f6ea0dfb735e9c0e9d14bd7dddbfd5a0023064dc6e6cf6e6629402a6a13248129e6c5
SHA512
e63157713caa3590324f652f17c5c5634bab015dcde5c7832eb725351c3a91c1051dd8a95650502703e9c3dd5daefc2867ff3d20530dfec17310bb3dd4bb5b7d
diff --git a/net-vpn/tor/tor-0.4.1.6-r1.ebuild b/net-vpn/tor/tor-0.4.0.6.ebuild
similarity index 87%
copy from net-vpn/tor/tor-0.4.1.6-r1.ebuild
copy to net-vpn/tor/tor-0.4.0.6.ebuild
index 8085c15bf0a..cfb78c50ce3 100644
--- a/net-vpn/tor/tor-0.4.1.6-r1.ebuild
+++ b/net-vpn/tor/tor-0.4.0.6.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit flag-o-matic readme.gentoo-r1 systemd
+inherit flag-o-matic readme.gentoo-r1 systemd user
MY_PV="$(ver_rs 4 -)"
MY_PF="${PN}-${MY_PV}"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
~ppc-macos"
IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening
test zstd"
DEPEND="
- dev-libs/libevent:=[ssl]
+ dev-libs/libevent[ssl]
sys-libs/zlib
caps? ( sys-libs/libcap )
man? ( app-text/asciidoc )
@@ -27,13 +27,10 @@ DEPEND="
libressl? ( dev-libs/libressl:0= )
lzma? ( app-arch/xz-utils )
scrypt? ( app-crypt/libscrypt )
- seccomp? ( >=sys-libs/libseccomp-2.4.1 )
+ seccomp? ( sys-libs/libseccomp )
systemd? ( sys-apps/systemd )
zstd? ( app-arch/zstd )"
-RDEPEND="
- acct-user/tor
- acct-group/tor
- ${DEPEND}
+RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-tor )"
PATCHES=(
@@ -45,6 +42,11 @@ DOCS=()
RESTRICT="!test? ( test )"
+pkg_setup() {
+ enewgroup tor
+ enewuser tor -1 -1 /var/lib/tor tor
+}
+
src_configure() {
use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
export ac_cv_lib_cap_cap_init=$(usex caps)
@@ -75,7 +77,7 @@ src_install() {
readme.gentoo_create_doc
newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r9 tor
+ newinitd "${FILESDIR}"/tor.initd-r8 tor
systemd_dounit contrib/dist/tor.service
keepdir /var/lib/tor
@@ -84,5 +86,6 @@ src_install() {
fowners tor:tor /var/lib/tor
insinto /etc/tor/
- newins "${FILESDIR}"/torrc-r2 torrc
+ newins "${FILESDIR}"/torrc-r1 torrc
+
}
diff --git a/net-vpn/tor/tor-0.4.1.6-r1.ebuild b/net-vpn/tor/tor-0.4.1.7.ebuild
similarity index 100%
rename from net-vpn/tor/tor-0.4.1.6-r1.ebuild
rename to net-vpn/tor/tor-0.4.1.7.ebuild
diff --git a/net-vpn/tor/tor-0.4.2.4_rc-r1.ebuild
b/net-vpn/tor/tor-0.4.2.5.ebuild
similarity index 100%
rename from net-vpn/tor/tor-0.4.2.4_rc-r1.ebuild
rename to net-vpn/tor/tor-0.4.2.5.ebuild
