[gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     fe183fef9c61b424b725c720f84945524110bf68
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 11:17:51 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue May 10 11:17:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=fe183fef

net-misc/tor-0.2.3.1_alpha: moved to tree

(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-misc/tor/ChangeLog                             |    6 ++
 net-misc/tor/Manifest                              |   20 +++--
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 -------
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 ------
 net-misc/tor/files/tor.conf                        |    3 -
 net-misc/tor/files/tor.initd-r4                    |   57 -------------
 net-misc/tor/files/torrc                           |    8 --
 net-misc/tor/files/torrc.sample-0.1.2.6.patch      |   30 -------
 net-misc/tor/tor-0.2.3.1_alpha.ebuild              |   84 --------------------
 9 files changed, 17 insertions(+), 243 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 4f37d99..9887167 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.253 2011/04/29 20:15:56 blueness Exp $
 
+  10 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
+  -files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, -tor-0.2.3.1_alpha.ebuild,
+  -files/tor.conf, -files/tor.initd-r4, -files/torrc:
+  moved to tree
+
 *tor-0.2.3.1_alpha (07 May 2011)
 
   07 May 2011; Anthony G. Basile <blueness@gentoo.org>

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 733bdbd..fa85021 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,10 +1,12 @@
-AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
-AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
-AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
-AUX tor.initd-r4 1566 RMD160 410611175c20425f48d340216ef680650bf6fa3d SHA1 dbdfd68db76871be8606d1196c0c2a7ba257aac0 SHA256 095334e62ee28d3346f84831015dc9c45f7224d8a6f3588974de7b26352e2824
-AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
-AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
-DIST tor-0.2.3.1-alpha.tar.gz 2686119 RMD160 9f6f69db3541395bb34d3f4b3db30577a4cd5f6e SHA1 577d34efa66e5f6ba72d010b38fb48ff5b9796e3 SHA256 8906e80068952a4d3d9f65dfea2f4b0fd76b6b301fd1e62adac6c1b3bebe360e
-EBUILD tor-0.2.3.1_alpha.ebuild 2375 RMD160 53f8494ce98a86e56638d152ceeeac4185a6c1f0 SHA1 d56bf448cfea86d44f90875308795cf40c58c693 SHA256 4351c3cfcd94fb1919b399d20854a895cfb3792706fecdeff2d1e0c1c0b86c9c
-MISC ChangeLog 36826 RMD160 820857019bfb7be1ffa5254582a02048f5338c61 SHA1 023e041327fe5224f0a597b6a43e86085f34c166 SHA256 15bcef1e5b066aecb8fe2df650ba55a675371e00063557f5ba437715411748f6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+MISC ChangeLog 37103 RMD160 84f50c5c6be079df7b0855a9140b4ca34c9813cb SHA1 39e9e2395185e5fd7c9548e9ed95083ce7201e82 SHA256 22a8f3627e27d8e3e648f60f2db8998c1dfda1cbf9f3f9e6dacd43b9897d7349
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk3JHt8ACgkQl5yvQNBFVTW1XACfZ2KfQM2U81bAoCTPqwqSQIWC
+pcIAnjQUt0NShZCz7G8VYhwgqq9Z/lJK
+=7wO/
+-----END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor-0.2.1.19-logrotate.patch b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
deleted file mode 100644
index 3eadcaa..0000000
--- a/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-* Change log dir from /var/lib/log to /var/log (#281439, Martin von Gagern)
-* Change user and group name from _tor to tor (#281439, Martin von Gagern)
-* Avoid error if tor is not running (#178975, Gustavo Felisberto)
-
-References:
-http://bugs.gentoo.org/281439
-http://bugs.gentoo.org/178975
-
---- tor-0.2.1.19/contrib/tor.logrotate.in
-+++ tor-0.2.1.19/contrib/tor.logrotate.in
-@@ -1,4 +1,4 @@
--@LOCALSTATEDIR@/log/tor/*log {
-+/var/log/tor/*.log {
- 	daily
- 	rotate 5
- 	compress
-@@ -6,9 +6,9 @@
- 	missingok
- 	notifempty
- 	# you may need to change the username/groupname below
--	create 0640 _tor _tor
-+	create 0640 tor tor
- 	sharedscripts
- 	postrotate
--		/etc/init.d/tor reload > /dev/null
-+		/etc/init.d/tor reload > /dev/null || true
- 	endscript
- }

diff --git a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
deleted file mode 100644
index 86b797b..0000000
--- a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
---- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
-+++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
-@@ -9,6 +9,11 @@
- 
- AC_CANONICAL_HOST
- 
-+GENTOO_CFLAGS="$CFLAGS"
-+GENTOO_LDFLAGS="$LDFLAGS"
-+CFLAGS=
-+LDFLAGS=
-+
- if test -f /etc/redhat-release ; then
-   if test -f /usr/kerberos/include ; then
-     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-@@ -971,6 +976,8 @@
- 
- 
- CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
-+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
- 
- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

diff --git a/net-misc/tor/files/tor.conf b/net-misc/tor/files/tor.conf
deleted file mode 100644
index 4e4c639..0000000
--- a/net-misc/tor/files/tor.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-tor           hard    nofile          30000
-tor           soft    nofile          30000
-

diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4
deleted file mode 100644
index c95ef19..0000000
--- a/net-misc/tor/files/tor.initd-r4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.5 2009/09/07 11:23:31 fauli Exp $
-
-opts="${opts} checkconfig reload"
-PIDFILE=/var/run/tor/tor.pid
-CONFFILE=/etc/tor/torrc
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        # first check that it exists
-        if [ ! -f ${CONFFILE} ] ; then
-                eerror "You need to setup ${CONFFILE} first"
-                eerror "Example is in ${CONFFILE}.sample"
-                return 1
-	fi
-
-	# now verify whether the configuration is valid
-	/usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1
-	if [ $? -eq 0 ] ; then
-		einfo "Tor configuration (${CONFFILE}) is valid."
-		return 0
-	else
-		eerror "Tor configuration (${CONFFILE}) not valid."
-		/usr/bin/tor --verify-config -f ${CONFFILE}
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-        ebegin "Starting Tor"
-        HOME=/var/lib/tor
-	start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Tor"
-	start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
-        eend $?
-}
-
-reload() {
-	if [ ! -f ${PIDFILE} ]; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading Tor configuration"
-	start-stop-daemon --stop --oknodo --signal HUP --pidfile ${PIDFILE}
-	eend $?
-}

diff --git a/net-misc/tor/files/torrc b/net-misc/tor/files/torrc
deleted file mode 100644
index dc2dea3..0000000
--- a/net-misc/tor/files/torrc
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Minimal torrc so tor will work out of the box
-#
-User tor
-Group tor
-PIDFile /var/run/tor/tor.pid
-Log notice file /var/log/tor/tor.log
-DataDirectory /var/lib/tor/data

diff --git a/net-misc/tor/files/torrc.sample-0.1.2.6.patch b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
deleted file mode 100644
index 7317552..0000000
--- a/net-misc/tor/files/torrc.sample-0.1.2.6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/config/torrc.sample.in.orig	2007-01-27 23:41:23.000000000 +0000
-+++ src/config/torrc.sample.in	2007-01-27 23:43:47.000000000 +0000
-@@ -18,6 +18,11 @@
- ## With the default Mac OS X installer, Tor will look in ~/.tor/torrc or
- ## /Library/Tor/torrc
- 
-+## Default username and group the server will run as
-+User tor
-+Group tor
-+
-+PIDFile /var/run/tor/tor.pid
- 
- ## Replace this with "SocksPort 0" if you plan to run Tor only as a
- ## server, and not make any local application connections yourself.
-@@ -46,6 +51,7 @@
- #Log notice syslog
- ## To send all messages to stderr:
- #Log debug stderr
-+Log notice file /var/log/tor/tor.log
- 
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line. This is ignored on Windows;
-@@ -55,6 +61,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.3.1_alpha.ebuild b/net-misc/tor/tor-0.2.3.1_alpha.ebuild
deleted file mode 100644
index 77b7ee7..0000000
--- a/net-misc/tor/tor-0.2.3.1_alpha.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.25_alpha.ebuild,v 1.1 2011/04/29 20:11:45 blueness Exp $
-
-EAPI=3
-
-inherit autotools eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0"
-# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
-RDEPEND="${DEPEND}
-	net-proxy/tsocks[tordns]"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
-
-	einfo "Regenerating autotools files ..."
-	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
-	eautoreconf || die "eautoreconf failed"
-}
-
-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 --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/README
-
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-
-	insinto /etc/tor/
-	doins "${FILESDIR}"/torrc
-
-	insinto /etc/logrotate.d
-	newins contrib/tor.logrotate tor
-
-	# allow the tor user more open files to avoid errors, see bug 251171
-	insinto /etc/security/limits.d/
-	doins "${FILESDIR}"/tor.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}