fix logrotate support as provided by Martin von Gagern <Martin AT vGagern AT gmx DOT net> in bug 281439

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 120 insertions, 5 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index c91f26c58738..824b9c8621ba 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.178 2009/08/06 22:06:24 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.179 2009/08/17 19:42:11 fauli Exp $
+
+*tor-0.2.1.19-r1 (17 Aug 2009)
+
+  17 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
+  +tor-0.2.1.19-r1.ebuild, +files/tor-0.2.1.19-logrotate.patch:
+  fix logrotate support as provided by Martin von Gagern <Martin AT vGagern
+  AT gmx DOT net> in bug 281439
 
   06 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
   -tor-0.2.1.16_rc.ebuild:
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index a244b4627436..f7b1c74b4f16 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -3,19 +3,21 @@ Hash: SHA1
 
 AUX tor-0.2.0.30-logrotate.patch 291 RMD160 256507536cb7629a21c855816428885b3587f14c SHA1 e1592a63df6677c8e2537ae5363eda39c4a3aeb1 SHA256 8c8c4d33d758127eedb234cda6836be625188c09e9eadfea290f6cf575516c22
 AUX tor-0.2.0.33-no-internal-libevent.patch 5026 RMD160 c263d14eaf776ba1ba90bdc86308219dc802705c SHA1 7e9b1595380a518f849901dc7419a3cb4acf5bf3 SHA256 cc57416b5b5fb8562fcf69f5b096a168bf693cd08b4bd02105d84531192f7647
+AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
 AUX tor.initd-r4 1549 RMD160 6bf8d330624ed21719f2c9a436e0859429178853 SHA1 4ad7409c1309df6d247f876b3d3d4cf418909539 SHA256 842b358791b427afef503b29c4fefd87b042f114b6302eef1671b18910483866
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.0.35.tar.gz 2221852 RMD160 ecc98c602b5c153a8aa8f6e651166705bc05c972 SHA1 6216887e0575c4a18f46e53faea1ebdb04bf7905 SHA256 7180c56c11e13d1ca860e3773ddfb2c9f951900670224a0850766795ac94b62e
 DIST tor-0.2.1.19.tar.gz 2409484 RMD160 3606cc574ade12adfa8f3c7a180958865be077e8 SHA1 8a8af1354ab5b3fea58e2bbffeddc05e3dfedb17 SHA256 cb4f88ad30d6ba4c015734f3058a6e35151cff586f7708691d52d289ee78d183
 EBUILD tor-0.2.0.35.ebuild 2633 RMD160 5ee69ef44bbc2cd20d1a14b2d3874b62a3010b83 SHA1 811da83d54e661416e076fecbdf651ed365653ae SHA256 c5a94aebd9b27c3916b4e9b111685672b87d12a107a4b07ec98ca61703f793fd
+EBUILD tor-0.2.1.19-r1.ebuild 2400 RMD160 76baae922ad5d6c1e865c009ba2b3007789ea480 SHA1 4aae34035c3f4f05904191c81571129956c7835b SHA256 9091a849f234062176069c598a050f4e466c94fdd27bb654fb324314c15c5756
 EBUILD tor-0.2.1.19.ebuild 2561 RMD160 e0bec510c6f8b745989dc93578a5530e8737a083 SHA1 604ed9283c2db509c823a3b0117c4d6df7561fcd SHA256 bd2decda560222e652c2f6aec87d7f2bb7dc9abd5df6551f525992cac9adac7c
-MISC ChangeLog 26533 RMD160 c44a457b7ca0aa2fa3cd561448a84096706369cb SHA1 a828f08159f2223bc9bf2e8011f6ed7d3c85bdeb SHA256 eb4c94e9d583aab9c0c6fc8c787a12cd9492f2eece4cf0780fbecfb3d6bf9032
+MISC ChangeLog 26793 RMD160 dadf703080d20c3397f4d9c47ec063a8657439ad SHA1 ab026419b3854294dfa36d28a9870718b5ff90b2 SHA256 0369b7e144761d7923c7a7092dc7f9fc925ef959279203a5d254719c75d068a4
 MISC metadata.xml 482 RMD160 8dca0b35cd6e529c49031ba66a4c29fd3075a131 SHA1 909c1148521f411a17bcfd3ec97cc1ccadd4f580 SHA256 43850c54cf0ec6651bf3c4ef826b28d84e284e60891ca39c20284e2a3bbdcec9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkp7U+oACgkQNQqtfCuFneMT3ACgmK5ASlxptVPzr7STYu7VjP2I
-ImkAnj7k8S1GUeHVvemFZqCaaTAEW1Ln
-=OXMz
+iEYEARECAAYFAkqJspkACgkQNQqtfCuFneOHPgCfZMEyTmVR7FWyDs5SBSoZupII
+O7QAn0LKdFQfPaAA9BDtAmQ4b7W/i8uq
+=i9/K
 -----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
new file mode 100644
index 000000000000..3eadcaa8f167
--- /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 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/tor-0.2.1.19-r1.ebuild b/net-misc/tor/tor-0.2.1.19-r1.ebuild
new file mode 100644
index 000000000000..4ba56b60e3a2
--- /dev/null
+++ b/net-misc/tor/tor-0.2.1.19-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 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.19-r1.ebuild,v 1.1 2009/08/17 19:42:11 fauli Exp $
+
+EAPI=2
+
+inherit eutils
+
+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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+RDEPEND="${DEPEND}
+	net-proxy/tsocks"
+
+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}"/${P}-logrotate.patch
+	# 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() {
+	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} \
+		doc/spec/*.txt
+
+	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/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 "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	elog "To have privoxy and tor working together you must add:"
+	elog "forward-socks4a / localhost:9050 ."
+	elog "(notice the . at the end of the line)"
+	elog "to /etc/privoxy/config"
+}