Really respect limits from /etc/limits.d/ by some tweaks: moving user context switch from torrc to init script, including verification of config file in the latter; fixes bug 268396 by W. Elschner <gentoobugzilla_reply AT elschner DOT net>

Package-Manager: portage-2.1.6.11/cvs/Linux i686
RepoMan-Options: --force

5 files changed, 33 insertions, 17 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 6b7a8c46e597..b96607057394 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.163 2009/02/19 18:58:37 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.164 2009/06/03 08:09:04 fauli Exp $
+
+*tor-0.2.0.34-r1 (03 Jun 2009)
+
+  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  files/torrc.sample-0.1.2.6.patch, -files/tor.initd-r4,
+  +files/tor.initd-r5, -tor-0.2.0.34.ebuild, +tor-0.2.0.34-r1.ebuild:
+  Really respect limits from /etc/limits.d/ by some tweaks: moving user
+  context switch from torrc to init script, including verification of config
+  file in the latter; fixes bug 268396 by W. Elschner <gentoobugzilla_reply AT
+  elschner DOT net>
 
   19 Feb 2009; nixnut <nixnut@gentoo.org> tor-0.2.0.34.ebuild:
   ppc stable
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 2fe98fb0ec51..914bebc90239 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
-AUX tor.initd-r4 1549 RMD160 2f36cbc9e14c0021139212634b8e0ac585058e44 SHA1 4593e7a1b482bc7b8e787b57d0160f57415b9817 SHA256 0b3c6fdb62b0ce1f4812b0e3ce19dcc7176d4b723cb24b46e4c8474d5b119222
-AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
+AUX tor.initd-r5 1601 RMD160 54ea139b5ade6f897cd9842de47184cc6b185212 SHA1 c561d844744e6348d673e2920e1010a598f05930 SHA256 214fe89d6e94250832367f98d2db2641a1a00de031697ad70549540b42ff33ee
+AUX torrc.sample-0.1.2.6.patch 1067 RMD160 77ac6827513cc1fc48a72bf352915887e22c4284 SHA1 6194000ee38cbaf095954bd0f9adebb001ccaf05 SHA256 5e657209f85b52d2c4c8434a1c65d652828be5f58f672f5829db6524a80e9998
 DIST tor-0.2.0.34.tar.gz 2170871 RMD160 a7a1a78b32072524472c6b2973117689aab4823b SHA1 6797b85cf4bd44a3a1c3ff1ccb9c46b55f9391f9 SHA256 1bb19bcc52d365b47dd0e7bc06e3208786447a1cf759d6595c516a0f0cde3cb2
-EBUILD tor-0.2.0.34.ebuild 2618 RMD160 019747653be169421260a43f7ad5897b24ff4f51 SHA1 cc29382f96f63a65b60d38f51da07d3ea2820a26 SHA256 1dbdf586a822dc8a52aee8d63deb600745be48308303d6e6fbf9fe87070a2be9
-MISC ChangeLog 23893 RMD160 08436f43404baf39c5ce9765ec596cc3a407f435 SHA1 76207fdb748609152cf81f690a7fb2bcfca85b0b SHA256 e432331e54070893c810d1231416300794b5d547cfafd1e469de8e7182267ee9
+EBUILD tor-0.2.0.34-r1.ebuild 2620 RMD160 e80f9cd161213becdaebfb62676bf22079d213cd SHA1 2941383c94d1988fed52932992b4f748026c9ef4 SHA256 faa772a25d364b07eb2657c1718db669c8626ede998ba0c2c97f2b9cd33e8875
+MISC ChangeLog 24355 RMD160 7c634ce64759fea687e88b70376410ea41b6d7f0 SHA1 94e5789ab3356861269412f2141ba60aa50ba197 SHA256 442ffcb385adacf78c237530be7b0f5c688dc4860efe15f97e3959ebcc013603
 MISC metadata.xml 482 RMD160 8dca0b35cd6e529c49031ba66a4c29fd3075a131 SHA1 909c1148521f411a17bcfd3ec97cc1ccadd4f580 SHA256 43850c54cf0ec6651bf3c4ef826b28d84e284e60891ca39c20284e2a3bbdcec9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkomL6wACgkQNQqtfCuFneMH0ACeIEyRfSRkzeRiEZXwDcbA5idx
+Mt4An21M9kjqU61J8m4uZerYFw8k+5aC
+=kE7x
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r5
index fb98a925debd..2d2926a9d00f 100644
--- a/net-misc/tor/files/tor.initd-r4
+++ b/net-misc/tor/files/tor.initd-r5
@@ -1,7 +1,7 @@
 #!/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.2 2008/09/06 19:34:09 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r5,v 1.1 2009/06/03 08:09:04 fauli Exp $
 
 opts="${opts} checkconfig reload"
 PIDFILE=/var/run/tor/tor.pid
@@ -20,13 +20,13 @@ checkconfig() {
 	fi
 
 	# now verify whether the configuration is valid
-	/usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1
+	/usr/bin/tor --verify-config --User tor -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}
+		/usr/bin/tor --verify-config --User tor -f ${CONFFILE}
 		return 1
 	fi
 }
@@ -35,13 +35,13 @@ start() {
 	checkconfig || return 1
         ebegin "Starting Tor"
         HOME=/var/lib/tor
-	start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
+	start-stop-daemon --start --user tor:tor --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- --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}"
+	start-stop-daemon --stop --user tor:tor --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
         eend $?
 }
 
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
index 7317552c237f..99959f47a211 100644
--- a/net-misc/tor/files/torrc.sample-0.1.2.6.patch
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -1,13 +1,9 @@
 --- 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 @@
+@@ -18,6 +18,7 @@
  ## 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
diff --git a/net-misc/tor/tor-0.2.0.34.ebuild b/net-misc/tor/tor-0.2.0.34-r1.ebuild
index 5954622a57b9..7d1f17959c25 100644
--- a/net-misc/tor/tor-0.2.0.34.ebuild
+++ b/net-misc/tor/tor-0.2.0.34-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.0.34.ebuild,v 1.5 2009/02/19 18:58:37 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.0.34-r1.ebuild,v 1.1 2009/06/03 08:09:04 fauli Exp $
 
 EAPI=1
 
@@ -49,7 +49,7 @@ src_compile() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	newinitd "${FILESDIR}"/tor.initd-r5 tor
 	emake DESTDIR="${D}" install || die
 	keepdir /var/{lib,log,run}/tor