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 1QTda6-0002gc-GO for garchives@archives.gentoo.org; Mon, 06 Jun 2011 17:27:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 182A11C134; Mon, 6 Jun 2011 17:27:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C45FA1C134 for ; Mon, 6 Jun 2011 17:27:05 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4001C67980 for ; Mon, 6 Jun 2011 17:27:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5D2238003C for ; Mon, 6 Jun 2011 17:27:04 +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: <000ee0b635581d823e4f3030c45e76a5df8bc586.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.confd net-misc/tor/files/tor.initd-r5 net-misc/tor/files/tor.initd-r6 net-misc/tor/files/torrc net-misc/tor/files/torrc.1 net-misc/tor/files/torrc.sample-0.1.2.6.patch net-misc/tor/files/torrc.sample-0.2.1.30.patch net-misc/tor/tor-0.2.1.30-r2.ebuild X-VCS-Directories: net-misc/tor/files/ net-misc/tor/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 000ee0b635581d823e4f3030c45e76a5df8bc586 Date: Mon, 6 Jun 2011 17:27:04 +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: 23885fb816ad70987ec26c5397529766 commit: 000ee0b635581d823e4f3030c45e76a5df8bc586 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Jun 6 17:26:45 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Jun 6 17:26:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3D000ee0b6 net-misc/tor: net-misc/tor: testing bug #268396 - comment 16 --- net-misc/tor/Manifest | 10 +++++----- net-misc/tor/files/tor.confd | 3 +++ net-misc/tor/files/{tor.initd-r6 =3D> tor.initd-r5} | 13 +++++++-----= - net-misc/tor/files/{torrc.1 =3D> torrc} | 2 ++ ...e-0.2.1.30.patch =3D> torrc.sample-0.1.2.6.patch} | 6 +++++- net-misc/tor/tor-0.2.1.30-r2.ebuild | 13 ++++++------- 6 files changed, 28 insertions(+), 19 deletions(-) diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest index eee6875..664221d 100644 --- a/net-misc/tor/Manifest +++ b/net-misc/tor/Manifest @@ -1,10 +1,10 @@ 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.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2= a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a6= 45d67c660e2930a9dbadf010803b8fd095a0 -AUX tor.initd-r6 1616 RMD160 3dd1daee3e7038d04dcb168bda24c4d9c4c04f34 SH= A1 ee6de8777afc29ce3c71bde1f1499c58982a3380 SHA256 1f3d7c7ec5877eecf47dc7= 6734c6dc706dd2d1a69e57f9c231f9dcf544fa4bc6 -AUX torrc.1 150 RMD160 17a70e9790b415c51639a5f08e47a0cb54323f20 SHA1 a21= 7f018d1b2a15ca7ead718dc42f60109bb005d SHA256 e03ba21c23e9798075b2fcdafab1= 43eaf58ffdae9198bcf40de22424a64a90f6 -AUX torrc.sample-0.2.1.30.patch 1067 RMD160 77ac6827513cc1fc48a72bf35291= 5887e22c4284 SHA1 6194000ee38cbaf095954bd0f9adebb001ccaf05 SHA256 5e65720= 9f85b52d2c4c8434a1c65d652828be5f58f672f5829db6524a80e9998 +AUX tor.confd 37 RMD160 2d7fcd5a217d11e9798a0985e61970c117bc9734 SHA1 05= 7ea3b42e40bdca678b27dbb63ea1862da30c73 SHA256 6c1d04625f5f2e6e9494ab91aaa= 09e9af76b7b40f557960aaba3284102087c00 +AUX tor.initd-r5 1586 RMD160 ff3b6ae16ad40072d8ea2e1f9b2723155cc1d499 SH= A1 4f2d2e2e8cb4cc2d04e67513025905959fa3f600 SHA256 e5e776cfce6a1b30d0db00= 95b75c2410a3bee4abad3b2168e29d63939ebda1e6 +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.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da2= 6a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa= 469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109 -EBUILD tor-0.2.1.30-r2.ebuild 3043 RMD160 71f1535be018f503e0a254b1f1736d= eabad00e86 SHA1 3cc05596abb3f5322a9562857c405ff2bab6ebc4 SHA256 2ecc7978b= 6dbfd009611081f5d3f1024156f005f0c65bf14b19a85207a0db1f0 +EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 2bd1cd0cd9af566d9e919125b4a186= 13ca8b3004 SHA1 d83f170194a2b787949ae48da5f26ea198cfa48b SHA256 6dbac9b04= 1ab5f3ec9db200d95948fdd62cc6e3d6adb33d2e22b21f29bf26d62 MISC ChangeLog 37564 RMD160 15dea18a2fadc2182ac444ff2e492800f10aa75e SHA= 1 740a779c4f797b49bef43ffd42127a520b47b072 SHA256 a3131f4c083859c99cc32ff= b356d8763fd5fb6490c9c386dc524c64ad39ab230 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SH= A1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcd= b3d600d98eb58bae0d98c021dc6ff5ec774d77a142 diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd new file mode 100644 index 0000000..5f95bd2 --- /dev/null +++ b/net-misc/tor/files/tor.confd @@ -0,0 +1,3 @@ +# +# Set the file limit +ULIMITN=3D10000 diff --git a/net-misc/tor/files/tor.initd-r6 b/net-misc/tor/files/tor.ini= td-r5 similarity index 65% rename from net-misc/tor/files/tor.initd-r6 rename to net-misc/tor/files/tor.initd-r5 index 211a40d..79b0b6b 100644 --- a/net-misc/tor/files/tor.initd-r6 +++ b/net-misc/tor/files/tor.initd-r5 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-misc/tor/f= iles/tor.initd-r6,v 1.1 2009/06/03 13:02:24 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.5= 2009/09/07 11:23:31 fauli Exp $ =20 opts=3D"${opts} checkconfig reload" PIDFILE=3D/var/run/tor/tor.pid @@ -20,13 +20,13 @@ checkconfig() { fi =20 # now verify whether the configuration is valid - /usr/bin/tor --verify-config --User tor -f ${CONFFILE} > /dev/null 2>&1 + /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 --User tor -f ${CONFFILE} + /usr/bin/tor --verify-config -f ${CONFFILE} return 1 fi } @@ -35,13 +35,14 @@ start() { checkconfig || return 1 ebegin "Starting Tor" HOME=3D/var/lib/tor - start-stop-daemon --start --user tor --pidfile "${PIDFILE}" --quiet --e= xec /usr/bin/tor -- --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2= >&1 + ulimit -n $ULIMITN + start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bi= n/tor -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/= null 2>&1 eend $? } =20 stop() { ebegin "Stopping Tor" - start-stop-daemon --stop --user tor --pidfile "${PIDFILE}" --exec /usr/= bin/tor -- --PidFile "${PIDFILE}" + start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- = --PidFile "${PIDFILE}" eend $? } =20 diff --git a/net-misc/tor/files/torrc.1 b/net-misc/tor/files/torrc similarity index 88% rename from net-misc/tor/files/torrc.1 rename to net-misc/tor/files/torrc index eb1a856..dc2dea3 100644 --- a/net-misc/tor/files/torrc.1 +++ b/net-misc/tor/files/torrc @@ -1,6 +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.2.1.30.patch b/net-misc/to= r/files/torrc.sample-0.1.2.6.patch similarity index 91% rename from net-misc/tor/files/torrc.sample-0.2.1.30.patch rename to net-misc/tor/files/torrc.sample-0.1.2.6.patch index 99959f4..7317552 100644 --- a/net-misc/tor/files/torrc.sample-0.2.1.30.patch +++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch @@ -1,9 +1,13 @@ --- 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,7 @@ +@@ -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 diff --git a/net-misc/tor/tor-0.2.1.30-r2.ebuild b/net-misc/tor/tor-0.2.1= .30-r2.ebuild index 9bf572e..0a19c27 100644 --- a/net-misc/tor/tor-0.2.1.30-r2.ebuild +++ b/net-misc/tor/tor-0.2.1.30-r2.ebuild @@ -29,7 +29,7 @@ pkg_setup() { } =20 src_prepare() { - epatch "${FILESDIR}"/torrc.sample-0.2.1.30.patch + epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch =20 einfo "Regenerating autotools files ..." @@ -59,7 +59,10 @@ src_configure() { } =20 src_install() { - newinitd "${FILESDIR}"/tor.initd-r6 tor + # allow the tor user more open files to avoid errors, see bug 251171 + newconfd "${FILESDIR}"/tor.confd tor + + newinitd "${FILESDIR}"/tor.initd-r5 tor emake DESTDIR=3D"${D}" install || die keepdir /var/{lib,log,run}/tor =20 @@ -71,14 +74,10 @@ src_install() { fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor =20 insinto /etc/tor/ - newins "${FILESDIR}"/torrc.1 torrc + doins "${FILESDIR}"/torrc =20 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 } =20 pkg_postinst() {