net-misc/tor: depend on openssl[-bindist] for 0.2.7.X, bug #556210.
authorAnthony G. Basile <blueness@gentoo.org>
Fri, 16 Oct 2015 05:10:38 +0000 (01:10 -0400)
committerAnthony G. Basile <blueness@gentoo.org>
Fri, 16 Oct 2015 05:10:38 +0000 (01:10 -0400)
Package-Manager: portage-2.2.20.1

net-misc/tor/Manifest
net-misc/tor/tor-0.2.6.7.ebuild [deleted file]
net-misc/tor/tor-0.2.7.3_rc-r1.ebuild
net-misc/tor/tor-0.2.7.3_rc.ebuild [deleted file]

index 5e8790f5fd621786e99a4f07d7adadc298ac9c8f..4370c29baa258bbef7efba1b0d95e707be24f626 100644 (file)
@@ -1,3 +1,2 @@
 DIST tor-0.2.6.10.tar.gz 3587211 SHA256 0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d SHA512 4d1fd794d48ada725af829e1c1f3f3b7d8d04f2d1dd22e4f175ddc49401834f2001f04d78b011cdc7e953fe44972f2859d87078489a08ae126b44f93f6b9a438 WHIRLPOOL ba2685454ecb0dd94c568e05fb14526cd06beea6e9c6f7b27328f85c555392b6f42f35dc7860ae25299a830c7f6643963a9b9719a2557c28a7216019c96caf21
-DIST tor-0.2.6.7.tar.gz 3595669 SHA256 8c2be88a542ed1b22a8d3d595ec0acd0e28191de273dbcaefc64fdce92b89e6c SHA512 96e3cb5bcafddb1655663091ecf08f708213e47529d9701d67256e88d5fc2e70acffc6c062df6b8f0f4a4e3ef3d0dda76b5127ef9eeee06371ce0a66e53815b0 WHIRLPOOL 5da1f3e2ed1c12a1efba3eee91016beeaa5c40434831e684bb33670ae301e1661096c4a4231cd345c5dd833e8547f71f0c28d22c6d4b51a43bd0d6603160973c
 DIST tor-0.2.7.3-rc.tar.gz 4810396 SHA256 aeb84ab84475edef5a0545b5e19f154cc1c28bd6730197ffe0013790157470b8 SHA512 c3a61cffc1a3faaa46918566ef7b7f8718ee655358aa86b6121bf8fc706419af2ead7432c21e7a3e8280cc104fedc2a65a30fdd88d2fc44192b1b2c04917b8d1 WHIRLPOOL a1c13481eaf496d2afcd8c5c12ca07ba8ebabc10342819125b7ccccd96c2f2905f2195339ca195dcfe2492df898a9ca65e8a7b3d5e93a4f1a43781decac7ba3f
diff --git a/net-misc/tor/tor-0.2.6.7.ebuild b/net-misc/tor/tor-0.2.6.7.ebuild
deleted file mode 100644 (file)
index 94865d5..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs 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"
-IUSE="-bufferevents nat-pmp scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test upnp web"
-
-DEPEND="dev-libs/openssl
-       sys-libs/zlib
-       dev-libs/libevent
-       bufferevents? ( dev-libs/libevent[ssl] )
-       nat-pmp? ( net-libs/libnatpmp )
-       scrypt? ( app-crypt/libscrypt )
-       seccomp? ( sys-libs/libseccomp )
-       upnp? ( net-libs/miniupnpc )"
-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.3.14_alpha-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=/usr/share/doc/${PF} \
-               $(use_enable stats instrument-downloads) \
-               $(use_enable bufferevents) \
-               $(use_enable nat-pmp) \
-               $(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 upnp) \
-               $(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 README ChangeLog ReleaseNotes doc/HACKING
-
-       fperms 750 /var/lib/tor
-       fowners tor:tor /var/lib/tor
-
-       insinto /etc/tor/
-       newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-       readme.gentoo_pkg_postinst
-
-       if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
-               ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
-               ewarn "loop.  See:"
-               ewarn
-               ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
-               ewarn "    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
-               ewarn
-       fi
-}
index 940f9515022fb3e2624de9617ad037e9f73965c8..f59235e0abbbb70209dd2bb0a5531a177cf8c4b9 100644 (file)
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web"
 
 DEPEND="
-       !libressl? ( dev-libs/openssl:0= )
+       !libressl? ( dev-libs/openssl:0=[-bindist] )
        libressl? ( dev-libs/libressl:= )
        sys-libs/zlib
        dev-libs/libevent
diff --git a/net-misc/tor/tor-0.2.7.3_rc.ebuild b/net-misc/tor/tor-0.2.7.3_rc.ebuild
deleted file mode 100644 (file)
index c1830cb..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs 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"
-IUSE="-bufferevents scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web"
-
-DEPEND="dev-libs/openssl:=
-       sys-libs/zlib
-       dev-libs/libevent
-       bufferevents? ( dev-libs/libevent[ssl] )
-       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.3.14_alpha-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=/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 README ChangeLog ReleaseNotes doc/HACKING
-
-       fperms 750 /var/lib/tor
-       fowners tor:tor /var/lib/tor
-
-       insinto /etc/tor/
-       newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-       readme.gentoo_pkg_postinst
-
-       if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
-               ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
-               ewarn "loop.  See:"
-               ewarn
-               ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
-               ewarn "    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
-               ewarn
-       fi
-}