From 2fa0f1ef8f496d84505158682083789a82611df3 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Fri, 23 Sep 2016 21:03:09 -0400 Subject: net-misc/tor: update openrc init scripts, bug #593794 Package-Manager: portage-2.2.28 --- net-misc/tor/files/tor.initd-r8 | 42 +++++++++++++++ net-misc/tor/tor-0.2.8.8-r1.ebuild | 87 ++++++++++++++++++++++++++++++++ net-misc/tor/tor-0.2.8.8.ebuild | 87 -------------------------------- net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild | 85 +++++++++++++++++++++++++++++++ net-misc/tor/tor-0.2.9.3_alpha.ebuild | 85 ------------------------------- 5 files changed, 214 insertions(+), 172 deletions(-) create mode 100644 net-misc/tor/files/tor.initd-r8 create mode 100644 net-misc/tor/tor-0.2.8.8-r1.ebuild delete mode 100644 net-misc/tor/tor-0.2.8.8.ebuild create mode 100644 net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild delete mode 100644 net-misc/tor/tor-0.2.9.3_alpha.ebuild (limited to 'net-misc') diff --git a/net-misc/tor/files/tor.initd-r8 b/net-misc/tor/files/tor.initd-r8 new file mode 100644 index 00000000000..e1f6c599ca4 --- /dev/null +++ b/net-misc/tor/files/tor.initd-r8 @@ -0,0 +1,42 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +command=/usr/bin/tor +pidfile=/var/run/tor/tor.pid +command_args="--hush --runasdaemon 1 --pidfile \"${pidfile}\"" +retry=${GRACEFUL_TIMEOUT:-60} + +extra_commands="checkconfig" +extra_started_commands="reload" +description="Anonymizing overlay network for TCP" +description_checkconfig="Check for valid config file" +description_reload="Reload the configuration" + +checkconfig() { + ${command} --verify-config --hush > /dev/null 2>&1 + if [ $? -ne 0 ] ; then + eerror "Tor configuration (/etc/tor/torrc) is not valid." + eerror "Example is in /etc/tor/torrc.sample" + return 1 + fi +} + +start_pre() { + checkconfig || return 1 + checkpath -d -m 0755 -o tor:tor /var/run/tor +} + +stop() { + ebegin "Stopping Tor (waiting up to ${retry} seconds)" + start-stop-daemon -K -s INT -R ${retry} -P -p ${pidfile} + eend $? +} + +reload() { + checkconfig || return 1 + ebegin "Reloading Tor configuration" + start-stop-daemon -s HUP --pidfile ${pidfile} + eend $? +} diff --git a/net-misc/tor/tor-0.2.8.8-r1.ebuild b/net-misc/tor/tor-0.2.8.8-r1.ebuild new file mode 100644 index 00000000000..ee36db79dda --- /dev/null +++ b/net-misc/tor/tor-0.2.8.8-r1.ebuild @@ -0,0 +1,87 @@ +# 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-r8 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.ebuild b/net-misc/tor/tor-0.2.8.8.ebuild deleted file mode 100644 index aeefa9fc3aa..00000000000 --- a/net-misc/tor/tor-0.2.8.8.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.9.3_alpha-r1.ebuild b/net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild new file mode 100644 index 00000000000..cd286ff2312 --- /dev/null +++ b/net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild @@ -0,0 +1,85 @@ +# 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-r8 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.ebuild b/net-misc/tor/tor-0.2.9.3_alpha.ebuild deleted file mode 100644 index 0f889a958bc..00000000000 --- a/net-misc/tor/tor-0.2.9.3_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 -} -- cgit v1.2.1