From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 53F9713888F for ; Fri, 16 Oct 2015 05:05:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2822321C006; Fri, 16 Oct 2015 05:05:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E6D421C006 for ; Fri, 16 Oct 2015 05:05:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FC9B33D3CA for ; Fri, 16 Oct 2015 05:05:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4F24E6A for ; Fri, 16 Oct 2015 05:05:06 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1444972238.c4b4e6a0256f34ecf2f184eafaed6bf9fbab5546.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tor/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/tor/Manifest net-misc/tor/tor-0.2.6.7.ebuild net-misc/tor/tor-0.2.7.3_rc-r1.ebuild net-misc/tor/tor-0.2.7.3_rc.ebuild X-VCS-Directories: net-misc/tor/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: c4b4e6a0256f34ecf2f184eafaed6bf9fbab5546 X-VCS-Branch: master Date: Fri, 16 Oct 2015 05:05:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 471aa6ab-dfdc-463a-bca2-c3fe67633d71 X-Archives-Hash: 67ea6ee6f19f5e41be49b721ed8cd18a commit: c4b4e6a0256f34ecf2f184eafaed6bf9fbab5546 Author: Anthony G. Basile gentoo org> AuthorDate: Fri Oct 16 05:10:38 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Oct 16 05:10:38 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b4e6a0 net-misc/tor: depend on openssl[-bindist] for 0.2.7.X, bug #556210. Package-Manager: portage-2.2.20.1 net-misc/tor/Manifest | 1 - net-misc/tor/tor-0.2.6.7.ebuild | 100 ---------------------------------- net-misc/tor/tor-0.2.7.3_rc-r1.ebuild | 2 +- net-misc/tor/tor-0.2.7.3_rc.ebuild | 97 --------------------------------- 4 files changed, 1 insertion(+), 199 deletions(-) diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest index 5e8790f..4370c29 100644 --- a/net-misc/tor/Manifest +++ b/net-misc/tor/Manifest @@ -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 index 94865d5..0000000 --- a/net-misc/tor/tor-0.2.6.7.ebuild +++ /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 -} diff --git a/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild b/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild index 940f951..f59235e 100644 --- a/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild +++ b/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild @@ -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 index c1830cb..0000000 --- a/net-misc/tor/tor-0.2.7.3_rc.ebuild +++ /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 -}