diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2009-09-07 11:23:31 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2009-09-07 11:23:31 +0000 |
| commit | 0b37eaa99f3364e133fec3420d797549fe6dc868 (patch) | |
| tree | b6328a98369d05af8b61f8da2a22d101e14e7df7 /net-misc/tor | |
| parent | texmacs-1.0.7.2 now does not contain the USE flag qt4, and should be stabiliz... (diff) | |
| download | historical-0b37eaa99f3364e133fec3420d797549fe6dc868.tar.gz historical-0b37eaa99f3364e133fec3420d797549fe6dc868.tar.bz2 historical-0b37eaa99f3364e133fec3420d797549fe6dc868.zip | |
respect CONFFILE variable in start calls, reported by Iome <frodone AT gmail DOT com> in bug 283524
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'net-misc/tor')
| -rw-r--r-- | net-misc/tor/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/tor/Manifest | 10 | ||||
| -rw-r--r-- | net-misc/tor/files/tor.initd-r4 | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog index 824b9c8621ba..6a89a4661b44 100644 --- a/net-misc/tor/ChangeLog +++ b/net-misc/tor/ChangeLog @@ -1,6 +1,10 @@ # 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.179 2009/08/17 19:42:11 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.180 2009/09/07 11:23:31 fauli Exp $ + + 07 Sep 2009; Christian Faulhammer <fauli@gentoo.org> files/tor.initd-r4: + respect CONFFILE variable in start calls, reported by Iome <frodone AT + gmail DOT com> in bug 283524 *tor-0.2.1.19-r1 (17 Aug 2009) diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest index f7b1c74b4f16..908d5fe92ce0 100644 --- a/net-misc/tor/Manifest +++ b/net-misc/tor/Manifest @@ -5,19 +5,19 @@ AUX tor-0.2.0.30-logrotate.patch 291 RMD160 256507536cb7629a21c855816428885b3587 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 tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc 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 26793 RMD160 dadf703080d20c3397f4d9c47ec063a8657439ad SHA1 ab026419b3854294dfa36d28a9870718b5ff90b2 SHA256 0369b7e144761d7923c7a7092dc7f9fc925ef959279203a5d254719c75d068a4 +MISC ChangeLog 26973 RMD160 dae08279eb5adeda7b44642c9c8eccdaa69ff601 SHA1 7c823bad9efe958039cb35875d1f6a77d56db26d SHA256 250dddf46ffd1da287a82d456a004736565065790a74820bccd99fe2b19e74af MISC metadata.xml 482 RMD160 8dca0b35cd6e529c49031ba66a4c29fd3075a131 SHA1 909c1148521f411a17bcfd3ec97cc1ccadd4f580 SHA256 43850c54cf0ec6651bf3c4ef826b28d84e284e60891ca39c20284e2a3bbdcec9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkqJspkACgkQNQqtfCuFneOHPgCfZMEyTmVR7FWyDs5SBSoZupII -O7QAn0LKdFQfPaAA9BDtAmQ4b7W/i8uq -=i9/K +iEYEARECAAYFAkqk7T0ACgkQNQqtfCuFneO6/gCgnldIKNeyvF3IooNjB7M8/fzk +/CkAn0g/x/JYJLVbuxm5IhpIsb4IL+OX +=e/31 -----END PGP SIGNATURE----- diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4 index 1eed94b5318b..24d8a9a610c1 100644 --- a/net-misc/tor/files/tor.initd-r4 +++ b/net-misc/tor/files/tor.initd-r4 @@ -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.4 2009/06/12 01:02:47 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 $ opts="${opts} checkconfig reload" PIDFILE=/var/run/tor/tor.pid @@ -35,7 +35,7 @@ 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 --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1 eend $? } |