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

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

commit:     3ae278a824bfda747995a43f01d0dff31d3c29b5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 21:16:37 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 21:16:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=3ae278a8

net-misc/tor: solved bug #268396, 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 ------
 .../tor/files/tor-0.2.1.30-respect-CFLAGS.patch    |   38 --------
 net-misc/tor/files/tor.confd                       |    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.1.30-r2.ebuild                |   94 --------------------
 9 files changed, 17 insertions(+), 267 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 06e7f0f..bd77743 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 $
 
+  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
+  -tor-0.2.1.30-r2.ebuild, -files/tor-0.2.1.30-respect-CFLAGS.patch,
+  -files/tor.confd, -files/tor.initd-r4, -files/torrc:
+  moved to tree
+
 *tor-0.2.1.30-r2 (06 Jun 2011)
 
   06 Jun 2011; Anthony G. Basile <blueness@gentoo.org>

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 2b3c0e5..e7cc9cf 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.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
-AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
-AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
-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.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109
-EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 b358d41321da83d5a27b3e3181620186b3619e58 SHA1 f29769c22765af3213a1c7ea77d381b800d5a10a SHA256 18fd05198917c8d511ed8c1221c28db855ee53be25e6b99adce357d14f90d3d0
-MISC ChangeLog 37564 RMD160 15dea18a2fadc2182ac444ff2e492800f10aa75e SHA1 740a779c4f797b49bef43ffd42127a520b47b072 SHA256 a3131f4c083859c99cc32ffb356d8763fd5fb6490c9c386dc524c64ad39ab230
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+MISC ChangeLog 37834 RMD160 c8924142415a2a8a8052169cc697c69643538363 SHA1 09ba07a3a40b3cff434dd4d34126cce1a99053ca SHA256 9ef95f6327b2165fcd6a0ec6928af6eb98b3b4888ce7b1e9aa09cce748a19728
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk3ulTUACgkQl5yvQNBFVTWrTwCeOo9v1KYSAKWAPpoqToLwpqwe
+1rwAnilE+jf5Kli5wCqRXkUt/o29f+w4
+=3p10
+-----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.1.30-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
deleted file mode 100644
index 3776756..0000000
--- a/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur tor-0.2.1.30.orig/configure.in tor-0.2.1.30/configure.in
---- tor-0.2.1.30.orig/configure.in	2011-02-23 03:25:39.000000000 -0500
-+++ tor-0.2.1.30/configure.in	2011-04-09 13:25:40.000000000 -0400
-@@ -10,6 +10,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"
-@@ -784,12 +789,11 @@
- # Set CFLAGS _after_ all the above checks, since our warnings are stricter
- # than autoconf's macros like.
- if test "$GCC" = yes; then
--  CFLAGS="$CFLAGS -Wall -g -O2"
-+  CFLAGS="$CFLAGS -Wall"
-   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
-   # accident waiting to happen.
-   CFLAGS="$CFLAGS -fno-strict-aliasing"
- else
--  CFLAGS="$CFLAGS -g -O"
-   enable_gcc_warnings=no
-   enable_gcc_warnings_advisory=no
- fi
-@@ -865,6 +869,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 contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
deleted file mode 100644
index 4195bf3..0000000
--- a/net-misc/tor/files/tor.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Set the file limit
-rc_ulimit="-n 30000"

diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4
deleted file mode 100644
index 24d8a9a..0000000
--- a/net-misc/tor/files/tor.initd-r4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 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.1.30-r2.ebuild b/net-misc/tor/tor-0.2.1.30-r2.ebuild
deleted file mode 100644
index 13a7382..0000000
--- a/net-misc/tor/tor-0.2.1.30-r2.ebuild
+++ /dev/null
@@ -1,94 +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.1.30-r1.ebuild,v 1.1 2011/04/10 17:42:03 blueness Exp $
-
-EAPI=2
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-1.2"
-# 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.1.30-respect-CFLAGS.patch
-	eautoreconf || die "eautoreconf failed"
-
-	# Normally tor uses a bundled libevent fragment to provide
-	# asynchronous DNS requests.  This is generally a bad idea, but at
-	# the moment the official libevent does not have the 0x20 hack, so
-	# anonymity is higher with the bundled variant.  Remove patch as
-	# soon as upstream has installed the autoconf option to use
-	# system's libevent.  This hasn't happened, so we
-	# have to live with the bundled libevent for this release, as the
-	# current version in tree won't suffice for tor to build
-	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
-	# for upstream's report
-	# Let's revisit this when libevent-2* is unmasked
-	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
-}
-
-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 $(use_enable debug)
-}
-
-src_install() {
-	# allow the tor user more open files to avoid errors, see bug 251171
-	newconfd "${FILESDIR}"/tor.confd tor
-
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS ReleaseNotes \
-		doc/{HACKING,TODO}
-
-	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
-}
-
-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
-}