From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QR9ON-0006UI-Hs for garchives@archives.gentoo.org; Mon, 30 May 2011 20:48:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E640E1C00A; Mon, 30 May 2011 20:48:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7C6491C00A for ; Mon, 30 May 2011 20:48:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E27131B400C for ; Mon, 30 May 2011 20:48:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0BD3E80508 for ; Mon, 30 May 2011 20:48:42 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <2a81a27764a77ca353afaea4b2637c8d38a0e4ba.blueness@gentoo> Subject: [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/ X-VCS-Repository: dev/blueness X-VCS-Files: net-misc/tor/Manifest net-misc/tor/files/tor-0.2.1.19-logrotate.patch net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch net-misc/tor/files/tor.conf net-misc/tor/files/tor.initd-r4 net-misc/tor/files/torrc net-misc/tor/files/torrc.sample-0.1.2.6.patch X-VCS-Directories: net-misc/tor/files/ net-misc/tor/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 2a81a27764a77ca353afaea4b2637c8d38a0e4ba Date: Mon, 30 May 2011 20:48:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: ae0f43608c52df971e1e241c9b305515 commit: 2a81a27764a77ca353afaea4b2637c8d38a0e4ba Author: Anthony G. Basile gentoo org> AuthorDate: Mon May 30 20:48:35 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon May 30 20:48:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3D2a81a277 net-misc/tor: added missing (Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with = key 0xD0455535) --- net-misc/tor/Manifest | 13 ++++- 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.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 ++++++++++ 8 files changed, 198 insertions(+), 3 deletions(-) diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest index f838e38..cea9d3c 100644 --- a/net-misc/tor/Manifest +++ b/net-misc/tor/Manifest @@ -1,6 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 =20 +AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16= feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb= 70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3 +AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca= 724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 9= 1952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776 +AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175= c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SH= A256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8 +AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2= a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a6= 45d67c660e2930a9dbadf010803b8fd095a0 +AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SH= A1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c= 3750a24f4589a480555f7c6ed579aa1c621ad09efc +AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061= 474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b= 4bf79bb6324a4c7ab86eeb81cdaec86a97 +AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d= 437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8= c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1 DIST tor-0.2.2.27-beta.tar.gz 2633715 RMD160 5a475497b035e676b953e1c0b53= 1bead45ecbccb SHA1 c49d0970ecd5d418128d068a4db87cc25349f366 SHA256 61e184= 846ec38f4301ccfc7445567e89168e1d3e6c2e4bfed2d4ba5517ff4d68 EBUILD tor-0.2.2.27_beta.ebuild 2375 RMD160 53f8494ce98a86e56638d152ceee= ac4185a6c1f0 SHA1 d56bf448cfea86d44f90875308795cf40c58c693 SHA256 4351c3c= fcd94fb1919b399d20854a895cfb3792706fecdeff2d1e0c1c0b86c9c MISC ChangeLog 37254 RMD160 e55d254e19c644b7484fbcc1c107369ddbedc1a6 SHA= 1 65e00c523c451883f19ebeee70b0cdde33ab0c3d SHA256 ea5451b27103a030a5c28d5= c123ade113c2bf15b68242f176e687d5b53d766eb @@ -8,7 +15,7 @@ MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b= 9c6724f75721c SHA1 6354a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iEYEAREIAAYFAk3jyuIACgkQl5yvQNBFVTX2CwCdEig3SPfewvh518wpxQISH9JM -e50AmgMXeWS/53IZnI5JK0BSP+owrpyt -=3DoKJT +iEYEAREIAAYFAk3kAqMACgkQl5yvQNBFVTXWHgCdF/l645/1OvHSRv54ISj+O61V +9WUAnRVIsKMiJMMEpeurd7XJxDqAswwo +=3DMco9 -----END PGP SIGNATURE----- diff --git a/net-misc/tor/files/tor-0.2.1.19-logrotate.patch b/net-misc/t= or/files/tor-0.2.1.19-logrotate.patch new file mode 100644 index 0000000..3eadcaa --- /dev/null +++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch @@ -0,0 +1,28 @@ +* Change log dir from /var/lib/log to /var/log (#281439, Martin von Gage= rn) +* Change user and group name from _tor to tor (#281439, Martin von Gager= n) +* 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-m= isc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch new file mode 100644 index 0000000..3776756 --- /dev/null +++ b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch @@ -0,0 +1,38 @@ +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 @@ +=20 + AC_CANONICAL_HOST +=20 ++GENTOO_CFLAGS=3D"$CFLAGS" ++GENTOO_LDFLAGS=3D"$LDFLAGS" ++CFLAGS=3D ++LDFLAGS=3D ++ + if test -f /etc/redhat-release ; then + if test -f /usr/kerberos/include ; then + CPPFLAGS=3D"$CPPFLAGS -I/usr/kerberos/include" +@@ -784,12 +789,11 @@ + # Set CFLAGS _after_ all the above checks, since our warnings are stric= ter + # than autoconf's macros like. + if test "$GCC" =3D yes; then +- CFLAGS=3D"$CFLAGS -Wall -g -O2" ++ CFLAGS=3D"$CFLAGS -Wall" + # Disable GCC's strict aliasing checks. They are an hours-to-debug + # accident waiting to happen. + CFLAGS=3D"$CFLAGS -fno-strict-aliasing" + else +- CFLAGS=3D"$CFLAGS -g -O" + enable_gcc_warnings=3Dno + enable_gcc_warnings_advisory=3Dno + fi +@@ -865,6 +869,8 @@ +=20 +=20 + CPPFLAGS=3D"$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR= _CPPFLAGS_zlib" ++CFLAGS=3D"$CFLAGS $GENTOO_CFLAGS" ++LDFLAGS=3D"$LDFLAGS $GENTOO_LDFLAGS" +=20 + AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torc= tl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Make= file contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist cont= rib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDes= c.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/d= esign-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makef= ile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/s= use/tor.sh]) + AC_OUTPUT 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 new file mode 100644 index 0000000..86b797b --- /dev/null +++ b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch @@ -0,0 +1,24 @@ +diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/confi= gure.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 @@ +=20 + AC_CANONICAL_HOST +=20 ++GENTOO_CFLAGS=3D"$CFLAGS" ++GENTOO_LDFLAGS=3D"$LDFLAGS" ++CFLAGS=3D ++LDFLAGS=3D ++ + if test -f /etc/redhat-release ; then + if test -f /usr/kerberos/include ; then + CPPFLAGS=3D"$CPPFLAGS -I/usr/kerberos/include" +@@ -971,6 +976,8 @@ +=20 +=20 + CPPFLAGS=3D"$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR= _CPPFLAGS_zlib" ++CFLAGS=3D"$CFLAGS $GENTOO_CFLAGS" ++LDFLAGS=3D"$LDFLAGS $GENTOO_LDFLAGS" +=20 + AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torc= tl 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 new file mode 100644 index 0000000..4e4c639 --- /dev/null +++ b/net-misc/tor/files/tor.conf @@ -0,0 +1,3 @@ +tor hard nofile 30000 +tor soft nofile 30000 + diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.ini= td-r4 new file mode 100644 index 0000000..24d8a9a --- /dev/null +++ b/net-misc/tor/files/tor.initd-r4 @@ -0,0 +1,57 @@ +#!/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=3D"${opts} checkconfig reload" +PIDFILE=3D/var/run/tor/tor.pid +CONFFILE=3D/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=3D/var/lib/tor + start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bi= n/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 new file mode 100644 index 0000000..dc2dea3 --- /dev/null +++ b/net-misc/tor/files/torrc @@ -0,0 +1,8 @@ +# +# 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 new file mode 100644 index 0000000..7317552 --- /dev/null +++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch @@ -0,0 +1,30 @@ +--- 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 o= r + ## /Library/Tor/torrc +=20 ++## Default username and group the server will run as ++User tor ++Group tor ++ ++PIDFile /var/run/tor/tor.pid +=20 + ## 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 +=20 + ## 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 +=20 + ## The port on which Tor will listen for local connections from Tor + ## controller applications, as documented in control-spec.txt.