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

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

commit:     249e3fcbc8d769864a863f922b02d1ebac269448
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 23:37:51 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 23:37:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=249e3fcb

net-misc/tor: moved to tree

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

---
 net-misc/tor/ChangeLog                             |    7 ++
 net-misc/tor/Manifest                              |   17 +---
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 ------
 .../tor/files/tor-0.2.1.30-respect-CFLAGS.patch    |   38 --------
 .../files/tor-0.2.2.23_alpha-respect-CFLAGS.patch  |   38 --------
 net-misc/tor/files/tor.conf                        |    3 -
 net-misc/tor/files/tor.initd-r4                    |   57 ------------
 net-misc/tor/files/torrc                           |    5 -
 net-misc/tor/files/torrc.sample-0.1.2.6.patch      |   30 ------
 net-misc/tor/tor-0.2.1.30-r1.ebuild                |   95 --------------------
 10 files changed, 11 insertions(+), 307 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index c8e1f9a..0c85b95 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.225 2011/01/07 23:54:09 fauli Exp $
 
+  10 Apr 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-r1.ebuild, -files/tor-0.2.1.30-respect-CFLAGS.patch,
+  -files/tor-0.2.2.23_alpha-respect-CFLAGS.patch, -files/tor.conf,
+  -files/tor.initd-r4, -files/torrc:
+  moved to tree
+
   09 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
   tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch:
   backport of tor-0.2.2.23_alpha-respect-CFLAGS.patch

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 17ea9a6..92e9924 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,21 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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-0.2.2.23_alpha-respect-CFLAGS.patch 1460 RMD160 8a4245ab8132454e1ae1b12bbc241c8718854515 SHA1 bf8f56d78b4572caceaa5043f299c3255471e70a SHA256 7d8ed0359f108a32cdeb3c2b613cbaae6469124e07a0033a035e4b1670023782
-AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
-AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
-AUX torrc 119 RMD160 3b7ec5a87893d371b2659bb49ac77cf3deff0f38 SHA1 c573f42578261ccc7b223261d5083cdff5afe095 SHA256 97a80a09bb3d615b93947f0d1a9c1883ef340860e89b879f2247d61b1c2476f0
-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-r1.ebuild 3029 RMD160 cc28e282f1de5dcb23ed029d9a7b5ce526e52fda SHA1 ec56c04558cdca878e8b77021511c1efacd22392 SHA256 dc3d018672dfbaad0f01e13f3354621104755f69a20d6f765d414ca223c45dd9
-MISC ChangeLog 34550 RMD160 bbbea3c98f158d36813848197096d3f6c19e889f SHA1 daba92e0acf4abdee906a276f7c51930a71befff SHA256 31f71719889693f087173a9cfe5aedd414d13fd9a8ad279c279c0d1810598006
+MISC ChangeLog 34869 RMD160 6b5dc8287af2bfa76b6ec0b26ef8b592b7eaabae SHA1 47352d11c17e157fbdb674fd1f05936d810fadcf SHA256 507ce911d4a7a0aa104dd87086b520755e0cb8a38aa1e1f18276e4314734685d
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk2gmc8ACgkQl5yvQNBFVTWv1ACfZUaKMD08Q1aEqarROicE+R7H
-wtcAnjduE8HyvMwHAHxC/3P4vdUoJ+qS
-=uq//
+iEYEAREIAAYFAk2iP08ACgkQl5yvQNBFVTUiRQCfUuZsaCT/MhqW5Ehw2UcAKW/L
+UlMAoKEmWh5fqLxlF3oSbSoq5zrBb3MY
+=eCvZ
 -----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-0.2.2.23_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
deleted file mode 100644
index a762e2f..0000000
--- a/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur tor-0.2.2.23-alpha.orig/configure.in tor-0.2.2.23-alpha/configure.in
---- tor-0.2.2.23-alpha.orig/configure.in	2011-03-08 18:38:16.000000000 -0500
-+++ tor-0.2.2.23-alpha/configure.in	2011-03-27 19:53:55.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"
-@@ -865,12 +870,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
-@@ -945,6 +949,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 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 640fea1..0000000
--- a/net-misc/tor/files/torrc
+++ /dev/null
@@ -1,5 +0,0 @@
-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-r1.ebuild b/net-misc/tor/tor-0.2.1.30-r1.ebuild
deleted file mode 100644
index f17799b..0000000
--- a/net-misc/tor/tor-0.2.1.30-r1.ebuild
+++ /dev/null
@@ -1,95 +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.ebuild,v 1.5 2011/04/02 15:42:33 armin76 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() {
-	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
-
-	# 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
-}