commit: c4ca4048f6651a21686cd26140f23d258fe003fa
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 23:41:05 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 23:41:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ca4048
net-misc/tor: security version bump to 0.2.8.9 and 0.2.9.4
Package-Manager: portage-2.2.28
net-misc/tor/Manifest | 6 +-
net-misc/tor/tor-0.2.8.7.ebuild | 87 ----------------------
.../{tor-0.2.8.8-r1.ebuild => tor-0.2.8.9.ebuild} | 0
net-misc/tor/tor-0.2.9.2_alpha.ebuild | 85 ---------------------
....3_alpha-r1.ebuild => tor-0.2.9.4_alpha.ebuild} | 6 +-
5 files changed, 4 insertions(+), 180 deletions(-)
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 5ca465e..c168fa2 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,5 +1,3 @@
DIST tor-0.2.7.6.tar.gz 4869754 SHA256
493a8679f904503048114aca6467faef56861206bab8283d858f37141d95105d SHA512
9b0dbfabe6cd05189b179da24bfaa73b89ab237775e3b5b0ebc0a22ee98909e9b13e55841a466f04000e0ff876c15f76515ff46abca28d05eeddbdc52f183afc
WHIRLPOOL
03adf1d113049ad0b7df11f4d7f2d21f2a4582fcf51046534666b748f8d2dae383fa9e9cc2b44a2388f993d21681801bff33cc2a0a9cb5aaa7cfb9600f62e4ad
-DIST tor-0.2.8.7.tar.gz 5179093 SHA256
ae44e2b699e82db7ff318432fd558dfa941ad154e4055f16d208514951742fc6 SHA512
79156110804497509564d53a806dc8237e97755556bbaaed83d0f6a3470942a480e53693a7192996bad2b33fe1f77f60eb45e8122af9bfdc4a8f12b943cbc660
WHIRLPOOL
7223eb53f548f4ecbb96a74b809b84772faf9dbf4741ffcdda7872de9c32029f498a0a4f5e0384c64e1f6c9108292ad878bf0630c0b52766fe4b358131a8f098
-DIST tor-0.2.8.8.tar.gz 5093794 SHA256
b1af02c61253dcdb4e1a4f552adaba4e07aed0e5468e45c0764550161480e3de SHA512
741521663509d5983aed3561b2aaacab9355a1964b4a24f8e046c116159b22e3df9c76705c11afb84f2cedacaab77f429978ff6920306aa8fdab74fd22950cf6
WHIRLPOOL
f35c19de021fe4d8bc724902fca54b820601bce772b8911b570a5607379f5d7e23b39f412c8e1c15303b47e41946724f96f85825dc8ebd4dc80368e4d5a34f52
-DIST tor-0.2.9.2-alpha.tar.gz 5294923 SHA256
dd93cf6b8531acf68152adbfa2f693cebd1b3254bc6190c920a99cc587944922 SHA512
9baed516ad5dffe61ad0bf1dbd0575e5fdcb369b3afde54b11ab06b23fd7f440a66734828077b1ddf6f7103e12d47eb76ba57da72002c426d4fcc5be8edaf1b1
WHIRLPOOL
790738369837cf30fdffbea047eb3102a408345e87e1bad5552657420ca1d0f7d36f9c45eb5e68bded8bc464d6c42ff116628a4f5a529b6b812a22191a8d4911
-DIST tor-0.2.9.3-alpha.tar.gz 5240054 SHA256
ee51f62191a33b2b3f50a2cf691dd6250fd0c110f97b8360785a1b56be5eee15 SHA512
acfaac77a2f2f8b6969727f3b113dfc8c267f5f68d6e3ee9d35ec0229cbe2fbcf639992e0387fbece87a1e63cecea4454d493f7922fa70d75162468ee000a0ad
WHIRLPOOL
428496087a7aa196434ba4e36b82c3f174f9a38bd67e472e704640b65ef5c0a3b82ad19029f4a7630bf9a4eeb01ffa38ff02ec2db0b0289c0767e0af3a6e4a28
+DIST tor-0.2.8.9.tar.gz 5306773 SHA256
3f5c273bb887be4aff11f4d99b9e2e52d293b81ff4f6302b730161ff16dc5316 SHA512
9a02e4f7901c2abb22f8250077bc078e9b6ae122ee54fbe7ecfb505d449e6e1766f6d9f95d7b794063471cbefe7410fece8524910f83579bff00d6da2a8ea6c1
WHIRLPOOL
6b97ad6405ca5043dbdb0c688f736ba4772ff997540dbc8be72755fdd0a53f8fcf8617920fff204d9bbdbf64bd4a1ca605799df364468732c633f45012212025
+DIST tor-0.2.9.4-alpha.tar.gz 5481286 SHA256
fc5664fff4c86d3644043a068f11b17c57f9a295c37b7186bf90bb237913e400 SHA512
f3e87e2985a9f99ceab57e06eca701b5e00f74f1c9322ebc0e8e388723697d320634d2a06ed674d3fc6566994ddc9aba54046cd5e243a97df2aef724542bc859
WHIRLPOOL
53f7e9b308b53ad776ccb890330bd109148ceab0dfab17538a1fa02ba6a2e0bd7b635c8bad2343644c9f25ccf113bf8f8367d600e7cc1c485c64691dbdede2e5
diff --git a/net-misc/tor/tor-0.2.8.7.ebuild b/net-misc/tor/tor-0.2.8.7.ebuild
deleted file mode 100644
index aeefa9f..00000000
--- a/net-misc/tor/tor-0.2.8.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils 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"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd
tor-hardening transparent-proxy test web"
-
-DEPEND="
- app-text/asciidoc
- dev-libs/libevent
- sys-libs/zlib
- bufferevents? ( dev-libs/libevent[ssl] )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- scrypt? ( app-crypt/libscrypt )
- seccomp? ( sys-libs/libseccomp )
- systemd? ( sys-apps/systemd )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-tor )"
-
-pkg_setup() {
- enewgroup tor
- enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
- epatch_user
-}
-
-src_configure() {
- # Upstream isn't sure of all the user provided CFLAGS that
- # will break tor, but does recommend against -fstrict-aliasing.
- # We'll filter-flags them here as we encounter them.
- filter-flags -fstrict-aliasing
-
- econf \
- --enable-system-torrc \
- --enable-asciidoc \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_enable stats instrument-downloads) \
- $(use_enable bufferevents) \
- $(use_enable scrypt libscrypt) \
- $(use_enable seccomp) \
- $(use_enable systemd) \
- $(use_enable tor-hardening gcc-hardening) \
- $(use_enable tor-hardening linker-hardening) \
- $(use_enable transparent-proxy transparent) \
- $(use_enable web tor2web-mode) \
- $(use_enable test unittests) \
- $(use_enable test coverage)
-}
-
-src_install() {
- readme.gentoo_create_doc
-
- newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r7 tor
- systemd_dounit "${FILESDIR}/${PN}.service"
- systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
- emake DESTDIR="${D}" install
-
- keepdir /var/lib/tor
-
- dodoc -r README ChangeLog ReleaseNotes doc/HACKING
-
- fperms 750 /var/lib/tor
- fowners tor:tor /var/lib/tor
-
- insinto /etc/tor/
- newins "${FILESDIR}"/torrc-r1 torrc
-}
diff --git a/net-misc/tor/tor-0.2.8.8-r1.ebuild
b/net-misc/tor/tor-0.2.8.9.ebuild
similarity index 100%
rename from net-misc/tor/tor-0.2.8.8-r1.ebuild
rename to net-misc/tor/tor-0.2.8.9.ebuild
diff --git a/net-misc/tor/tor-0.2.9.2_alpha.ebuild
b/net-misc/tor/tor-0.2.9.2_alpha.ebuild
deleted file mode 100644
index 0f889a9..00000000
--- a/net-misc/tor/tor-0.2.9.2_alpha.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils 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"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-IUSE="-bufferevents libressl scrypt seccomp selinux systemd tor-hardening test
web"
-
-DEPEND="
- app-text/asciidoc
- dev-libs/libevent
- sys-libs/zlib
- bufferevents? ( dev-libs/libevent[ssl] )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- scrypt? ( app-crypt/libscrypt )
- seccomp? ( sys-libs/libseccomp )
- systemd? ( sys-apps/systemd )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-tor )"
-
-pkg_setup() {
- enewgroup tor
- enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
- epatch_user
-}
-
-src_configure() {
- # Upstream isn't sure of all the user provided CFLAGS that
- # will break tor, but does recommend against -fstrict-aliasing.
- # We'll filter-flags them here as we encounter them.
- filter-flags -fstrict-aliasing
-
- econf \
- --enable-system-torrc \
- --enable-asciidoc \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_enable bufferevents) \
- $(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)
-}
-
-src_install() {
- readme.gentoo_create_doc
-
- newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r7 tor
- systemd_dounit "${FILESDIR}/${PN}.service"
- systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
- emake DESTDIR="${D}" install
-
- keepdir /var/lib/tor
-
- dodoc -r README ChangeLog ReleaseNotes doc/HACKING
-
- fperms 750 /var/lib/tor
- fowners tor:tor /var/lib/tor
-
- insinto /etc/tor/
- newins "${FILESDIR}"/torrc-r1 torrc
-}
diff --git a/net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
b/net-misc/tor/tor-0.2.9.4_alpha.ebuild
similarity index 92%
rename from net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
rename to net-misc/tor/tor-0.2.9.4_alpha.ebuild
index cd286ff..580de80 100644
--- a/net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
+++ b/net-misc/tor/tor-0.2.9.4_alpha.ebuild
@@ -17,13 +17,12 @@ S="${WORKDIR}/${MY_PF}"
LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-IUSE="-bufferevents libressl scrypt seccomp selinux systemd tor-hardening test
web"
+IUSE="libressl scrypt seccomp selinux systemd tor-hardening test web"
DEPEND="
app-text/asciidoc
- dev-libs/libevent
+ dev-libs/libevent[ssl]
sys-libs/zlib
- bufferevents? ( dev-libs/libevent[ssl] )
!libressl? ( dev-libs/openssl:0=[-bindist] )
libressl? ( dev-libs/libressl:0= )
scrypt? ( app-crypt/libscrypt )
@@ -52,7 +51,6 @@ src_configure() {
--enable-system-torrc \
--enable-asciidoc \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_enable bufferevents) \
$(use_enable scrypt libscrypt) \
$(use_enable seccomp) \
$(use_enable systemd) \
