* [gentoo-commits] repo/gentoo:master commit in: net-misc/tor/, net-misc/tor/files/
@ 2015-10-22 1:20 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2015-10-22 1:20 UTC (permalink / raw
To: gentoo-commits
commit: 1c8fbe151cdb982fa006bfc9f1b88c75f9ae40b7
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 01:25:23 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 01:26:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8fbe15
net-misc/tor: version bump to 0.2.7.4_rc
Package-Manager: portage-2.2.20.1
net-misc/tor/Manifest | 1 +
net-misc/tor/files/tor-0.2.7.4-torrc.sample.patch | 31 +++++++
net-misc/tor/tor-0.2.7.4_rc.ebuild | 99 +++++++++++++++++++++++
3 files changed, 131 insertions(+)
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 4370c29..9fd0dd2 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,2 +1,3 @@
DIST tor-0.2.6.10.tar.gz 3587211 SHA256 0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d SHA512 4d1fd794d48ada725af829e1c1f3f3b7d8d04f2d1dd22e4f175ddc49401834f2001f04d78b011cdc7e953fe44972f2859d87078489a08ae126b44f93f6b9a438 WHIRLPOOL ba2685454ecb0dd94c568e05fb14526cd06beea6e9c6f7b27328f85c555392b6f42f35dc7860ae25299a830c7f6643963a9b9719a2557c28a7216019c96caf21
DIST tor-0.2.7.3-rc.tar.gz 4810396 SHA256 aeb84ab84475edef5a0545b5e19f154cc1c28bd6730197ffe0013790157470b8 SHA512 c3a61cffc1a3faaa46918566ef7b7f8718ee655358aa86b6121bf8fc706419af2ead7432c21e7a3e8280cc104fedc2a65a30fdd88d2fc44192b1b2c04917b8d1 WHIRLPOOL a1c13481eaf496d2afcd8c5c12ca07ba8ebabc10342819125b7ccccd96c2f2905f2195339ca195dcfe2492df898a9ca65e8a7b3d5e93a4f1a43781decac7ba3f
+DIST tor-0.2.7.4-rc.tar.gz 4830972 SHA256 6741c3e6abfedb76be781b767b77f794ee1a0f554cc4ccf083e44d4d9dc8af67 SHA512 e637cad37d26f7ceec52e2f78ff53ff2d9e362cefe0796b91fc91c7e2b01652d0333be44e48497cb54650ece3f606b20a7201b806775e9349eef99a288420e59 WHIRLPOOL 85dc797558391dc5e577fcdcb802ea027ff4ac787acfadd90b363bd6c60c7654fa16b15de74a84152ec081dda008a122029198cee5b12bf92730c5d160f7407b
diff --git a/net-misc/tor/files/tor-0.2.7.4-torrc.sample.patch b/net-misc/tor/files/tor-0.2.7.4-torrc.sample.patch
new file mode 100644
index 0000000..92eb03b
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.7.4-torrc.sample.patch
@@ -0,0 +1,31 @@
+diff -Nuar tor-0.2.7.4-rc.orig/src/config/torrc.sample.in tor-0.2.7.4-rc/src/config/torrc.sample.in
+--- tor-0.2.7.4-rc.orig/src/config/torrc.sample.in 2015-10-19 11:12:53.000000000 -0400
++++ tor-0.2.7.4-rc/src/config/torrc.sample.in 2015-10-21 21:18:49.151973113 -0400
+@@ -12,6 +12,11 @@
+ ## Tor will look for this file in various places based on your platform:
+ ## https://www.torproject.org/docs/faq#torrc
+
++## Default username and group the server will run as
++User tor
++
++PIDFile /var/run/tor/tor.pid
++
+ ## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't
+ ## configure one below. Set "SOCKSPort 0" if you plan to run Tor only
+ ## as a relay, and not make any local application connections yourself.
+@@ -42,6 +47,7 @@
+ #Log notice syslog
+ ## To send all messages to stderr:
+ #Log debug stderr
++Log warn syslog
+
+ ## Uncomment this to start the process in the background... or use
+ ## --runasdaemon 1 on the command line. This is ignored on Windows;
+@@ -51,6 +57,7 @@
+ ## The directory for keeping all the keys/etc. By default, we store
+ ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
+ #DataDirectory @LOCALSTATEDIR@/lib/tor
++DataDirectory /var/lib/tor/data
+
+ ## The port on which Tor will listen for local connections from Tor
+ ## controller applications, as documented in control-spec.txt.
diff --git a/net-misc/tor/tor-0.2.7.4_rc.ebuild b/net-misc/tor/tor-0.2.7.4_rc.ebuild
new file mode 100644
index 0000000..082da4f
--- /dev/null
+++ b/net-misc/tor/tor-0.2.7.4_rc.ebuild
@@ -0,0 +1,99 @@
+# 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 libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:= )
+ 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.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=/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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tor/, net-misc/tor/files/
@ 2016-08-03 8:22 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2016-08-03 8:22 UTC (permalink / raw
To: gentoo-commits
commit: d56b194b718f024d44eb31581e757dc6f0eae12f
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 08:22:21 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 08:22:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56b194b
net-misc/tor: remove older versions
Package-Manager: portage-2.2.28
net-misc/tor/Manifest | 3 -
.../files/tor-0.2.3.14_alpha-torrc.sample.patch | 31 --------
net-misc/tor/tor-0.2.8.3_alpha.ebuild | 87 ----------------------
net-misc/tor/tor-0.2.8.4_rc.ebuild | 87 ----------------------
net-misc/tor/tor-0.2.8.5_rc.ebuild | 87 ----------------------
5 files changed, 295 deletions(-)
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index c7a3727..93a530b 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,5 +1,2 @@
DIST tor-0.2.7.6.tar.gz 4869754 SHA256 493a8679f904503048114aca6467faef56861206bab8283d858f37141d95105d SHA512 9b0dbfabe6cd05189b179da24bfaa73b89ab237775e3b5b0ebc0a22ee98909e9b13e55841a466f04000e0ff876c15f76515ff46abca28d05eeddbdc52f183afc WHIRLPOOL 03adf1d113049ad0b7df11f4d7f2d21f2a4582fcf51046534666b748f8d2dae383fa9e9cc2b44a2388f993d21681801bff33cc2a0a9cb5aaa7cfb9600f62e4ad
-DIST tor-0.2.8.3-alpha.tar.gz 5116317 SHA256 88da40c24f0bb19e19b37b8deab1b0d86608798746c81380cf17996d269f9053 SHA512 8717501cc75c2e1f205e397d8a4aeeb6492bdd4d9d0ffd266242dc3903d3eebcabae0555643f1621c76d40c9b4ef8c5615a4b37dcbcd898349b179901ca2aac5 WHIRLPOOL f109d0e3d02bc874cb4f744ccee404ee2d37105708fb69b15a5b758646fa84a4771228f07df9da61a59f1a422c4eb15cf493ee751288126b3c97a63e912df6b1
-DIST tor-0.2.8.4-rc.tar.gz 5131763 SHA256 3070015123094bf576641a34aaf4cec17f548f0108447031445d42cae164f6ba SHA512 e7e2d3400172fb07305d62ebe83857d1d949dcd0b2a1e8bf6b0740222568bab628e897e1398d7e25c37fbbe4ee1e93f156c3e3f1077a6377896fc6bbf7769f37 WHIRLPOOL cf39b2732102265569d8c8b204596279092b77924cc08cc0673addd2275a392d161ee96bec71201bd2cd6ed0a57b106578793426433d74f00419fbe449256453
-DIST tor-0.2.8.5-rc.tar.gz 5145453 SHA256 715c15230f1160c170c61286b02620a1d99a8476dd9c4f80a2e66779be63780a SHA512 440c54db6124bdd59876a1724926dd34ba6768fda3e9728789e3ffdf2b6b3ccf4a4d32cbaeb5ba01c15a1a6eafdd5f123eb8c5ee6b0a35cc1a2c09c0dcb67be8 WHIRLPOOL bf94b7899ad9821c9f5ea3d8326f2b00ede415d827349d09e8412f4b842c3408314035d6d999d49baaed99aaf1bed905b628652ae4a71596b2bb4c162a07b27f
DIST tor-0.2.8.6.tar.gz 5163500 SHA256 3dc9fc02f7cd22ed5fce707e0d9b26a72b1bd0976766a804cb13078d32e3ab5a SHA512 2a550fa82135b3d5b0ae3c9e11d0fee1053a6b70e1dfd1921934bce280dc2a130966d541783f5f1a2d9f3c1ba87cec301d0d29acd9fbeaf47c0f206447d1bedc WHIRLPOOL dce56253ff0420dfceb66a9ade22318472f7161671039fe276a23000b85ec4fec749f8a7cf9b847dffb4f915e04fb6acb746413169e5b25f4becf1f65f997233
diff --git a/net-misc/tor/files/tor-0.2.3.14_alpha-torrc.sample.patch b/net-misc/tor/files/tor-0.2.3.14_alpha-torrc.sample.patch
deleted file mode 100644
index 1fa9d28..0000000
--- a/net-misc/tor/files/tor-0.2.3.14_alpha-torrc.sample.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur tor-0.2.3.14-alpha.orig//src/config/torrc.sample.in tor-0.2.3.14-alpha/src/config/torrc.sample.in
---- tor-0.2.3.14-alpha.orig//src/config/torrc.sample.in 2012-04-23 03:10:14.000000000 -0400
-+++ tor-0.2.3.14-alpha/src/config/torrc.sample.in 2012-04-24 06:30:21.000000000 -0400
-@@ -12,6 +12,11 @@
- ## Tor will look for this file in various places based on your platform:
- ## https://www.torproject.org/docs/faq#torrc
-
-+## Default username and group the server will run as
-+User tor
-+
-+PIDFile /var/run/tor/tor.pid
-+
- ## Tor opens a socks proxy on port 9050 by default -- even if you don't
- ## configure one below. Set "SocksPort 0" if you plan to run Tor only
- ## as a relay, and not make any local application connections yourself.
-@@ -41,6 +46,7 @@
- #Log notice syslog
- ## To send all messages to stderr:
- #Log debug stderr
-+Log warn syslog
-
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line. This is ignored on Windows;
-@@ -50,6 +56,7 @@
- ## The directory for keeping all the keys/etc. By default, we store
- ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
- #DataDirectory @LOCALSTATEDIR@/lib/tor
-+DataDirectory /var/lib/tor/data
-
- ## The port on which Tor will listen for local connections from Tor
- ## controller applications, as documented in control-spec.txt.
diff --git a/net-misc/tor/tor-0.2.8.3_alpha.ebuild b/net-misc/tor/tor-0.2.8.3_alpha.ebuild
deleted file mode 100644
index aeefa9f..0000000
--- a/net-misc/tor/tor-0.2.8.3_alpha.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.4_rc.ebuild b/net-misc/tor/tor-0.2.8.4_rc.ebuild
deleted file mode 100644
index aeefa9f..0000000
--- a/net-misc/tor/tor-0.2.8.4_rc.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.5_rc.ebuild b/net-misc/tor/tor-0.2.8.5_rc.ebuild
deleted file mode 100644
index aeefa9f..0000000
--- a/net-misc/tor/tor-0.2.8.5_rc.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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tor/, net-misc/tor/files/
@ 2016-09-24 1:03 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2016-09-24 1:03 UTC (permalink / raw
To: gentoo-commits
commit: 2fa0f1ef8f496d84505158682083789a82611df3
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 01:03:09 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 01:03:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa0f1ef
net-misc/tor: update openrc init scripts, bug #593794
Package-Manager: portage-2.2.28
net-misc/tor/files/tor.initd-r8 | 42 ++++++++++++++++++++++
.../{tor-0.2.8.8.ebuild => tor-0.2.8.8-r1.ebuild} | 2 +-
....3_alpha.ebuild => tor-0.2.9.3_alpha-r1.ebuild} | 2 +-
3 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/net-misc/tor/files/tor.initd-r8 b/net-misc/tor/files/tor.initd-r8
new file mode 100644
index 00000000..e1f6c59
--- /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.ebuild b/net-misc/tor/tor-0.2.8.8-r1.ebuild
similarity index 98%
rename from net-misc/tor/tor-0.2.8.8.ebuild
rename to net-misc/tor/tor-0.2.8.8-r1.ebuild
index aeefa9f..ee36db7 100644
--- a/net-misc/tor/tor-0.2.8.8.ebuild
+++ b/net-misc/tor/tor-0.2.8.8-r1.ebuild
@@ -69,7 +69,7 @@ src_install() {
readme.gentoo_create_doc
newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r7 tor
+ newinitd "${FILESDIR}"/tor.initd-r8 tor
systemd_dounit "${FILESDIR}/${PN}.service"
systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
diff --git a/net-misc/tor/tor-0.2.9.3_alpha.ebuild b/net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
similarity index 98%
rename from net-misc/tor/tor-0.2.9.3_alpha.ebuild
rename to net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
index 0f889a9..cd286ff 100644
--- a/net-misc/tor/tor-0.2.9.3_alpha.ebuild
+++ b/net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
@@ -67,7 +67,7 @@ src_install() {
readme.gentoo_create_doc
newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r7 tor
+ newinitd "${FILESDIR}"/tor.initd-r8 tor
systemd_dounit "${FILESDIR}/${PN}.service"
systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-24 1:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-22 1:20 [gentoo-commits] repo/gentoo:master commit in: net-misc/tor/, net-misc/tor/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2016-08-03 8:22 Anthony G. Basile
2016-09-24 1:03 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox