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 1QU3Oh-0002BJ-5U for garchives@archives.gentoo.org; Tue, 07 Jun 2011 21:01:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A24951C0B3; Tue, 7 Jun 2011 21:01:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5F3691C0B3 for ; Tue, 7 Jun 2011 21:01:00 +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 B5D611B401C for ; Tue, 7 Jun 2011 21:00:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 263B78003C for ; Tue, 7 Jun 2011 21:00:59 +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: <9553d8eae45cb41b9dd7b08d2c2999bcb560f03c.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-r4 net-misc/tor/files/tor.initd-r5 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: 9553d8eae45cb41b9dd7b08d2c2999bcb560f03c Date: Tue, 7 Jun 2011 21:00:59 +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: 6807863374b520c6da751b08e8cba89a commit: 9553d8eae45cb41b9dd7b08d2c2999bcb560f03c Author: Anthony G. Basile gentoo org> AuthorDate: Tue Jun 7 20:59:39 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Jun 7 21:00:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3D9553d8ea net-misc/tor: use rc_ulimit to set -n 30000 --- net-misc/tor/Manifest | 6 +++--- net-misc/tor/files/tor.confd | 2 +- net-misc/tor/files/{tor.initd-r5 =3D> tor.initd-r4} | 1 - net-misc/tor/tor-0.2.1.30-r2.ebuild | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest index 664221d..2b3c0e5 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.confd 37 RMD160 2d7fcd5a217d11e9798a0985e61970c117bc9734 SHA1 05= 7ea3b42e40bdca678b27dbb63ea1862da30c73 SHA256 6c1d04625f5f2e6e9494ab91aaa= 09e9af76b7b40f557960aaba3284102087c00 -AUX tor.initd-r5 1586 RMD160 ff3b6ae16ad40072d8ea2e1f9b2723155cc1d499 SH= A1 4f2d2e2e8cb4cc2d04e67513025905959fa3f600 SHA256 e5e776cfce6a1b30d0db00= 95b75c2410a3bee4abad3b2168e29d63939ebda1e6 +AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9= a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf2= 7c3f289414afd237546d2974da1b75384c25c +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.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da2= 6a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa= 469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109 -EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 2bd1cd0cd9af566d9e919125b4a186= 13ca8b3004 SHA1 d83f170194a2b787949ae48da5f26ea198cfa48b SHA256 6dbac9b04= 1ab5f3ec9db200d95948fdd62cc6e3d6adb33d2e22b21f29bf26d62 +EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 b358d41321da83d5a27b3e31816201= 86b3619e58 SHA1 f29769c22765af3213a1c7ea77d381b800d5a10a SHA256 18fd05198= 917c8d511ed8c1221c28db855ee53be25e6b99adce357d14f90d3d0 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 index 5f95bd2..4195bf3 100644 --- a/net-misc/tor/files/tor.confd +++ b/net-misc/tor/files/tor.confd @@ -1,3 +1,3 @@ # # Set the file limit -ULIMITN=3D10000 +rc_ulimit=3D"-n 30000" diff --git a/net-misc/tor/files/tor.initd-r5 b/net-misc/tor/files/tor.ini= td-r4 similarity index 98% rename from net-misc/tor/files/tor.initd-r5 rename to net-misc/tor/files/tor.initd-r4 index 79b0b6b..24d8a9a 100644 --- a/net-misc/tor/files/tor.initd-r5 +++ b/net-misc/tor/files/tor.initd-r4 @@ -35,7 +35,6 @@ start() { checkconfig || return 1 ebegin "Starting Tor" HOME=3D/var/lib/tor - 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 $? } 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 0a19c27..13a7382 100644 --- a/net-misc/tor/tor-0.2.1.30-r2.ebuild +++ b/net-misc/tor/tor-0.2.1.30-r2.ebuild @@ -62,7 +62,7 @@ src_install() { # allow the tor user more open files to avoid errors, see bug 251171 newconfd "${FILESDIR}"/tor.confd tor =20 - newinitd "${FILESDIR}"/tor.initd-r5 tor + newinitd "${FILESDIR}"/tor.initd-r4 tor emake DESTDIR=3D"${D}" install || die keepdir /var/{lib,log,run}/tor =20