| 1 |
commit: 2d450f46f50d182ef373bf8b697520cb5960fb53 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 04:06:08 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 04:06:08 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=2d450f46 |
| 7 |
|
| 8 |
Remove obsolete configuration option 'Group' |
| 9 |
|
| 10 |
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0xD0455535) |
| 11 |
|
| 12 |
--- |
| 13 |
net-misc/tor/ChangeLog | 4 ++++ |
| 14 |
net-misc/tor/Manifest | 12 ++++++------ |
| 15 |
net-misc/tor/files/torrc-r1 | 1 - |
| 16 |
net-misc/tor/files/torrc.sample.patch | 7 +++---- |
| 17 |
4 files changed, 13 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog |
| 20 |
index e90d114..051ef02 100644 |
| 21 |
--- a/net-misc/tor/ChangeLog |
| 22 |
+++ b/net-misc/tor/ChangeLog |
| 23 |
@@ -2,6 +2,10 @@ |
| 24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.269 2011/08/28 11:15:42 blueness Exp $ |
| 26 |
|
| 27 |
+ 30 Aug 2011; Anthony G. Basile <blueness@g.o> files/torrc-r1, |
| 28 |
+ files/torrc.sample.patch: |
| 29 |
+ Remove obsolete configuration option 'Group' |
| 30 |
+ |
| 31 |
30 Aug 2011; Anthony G. Basile <blueness@g.o> tor-0.2.2.32-r1.ebuild, |
| 32 |
tor-0.2.3.2_alpha-r3.ebuild, +files/tor.initd-r5, -files/tor.initd-r4: |
| 33 |
Check for /var/run/tor on start/reload |
| 34 |
|
| 35 |
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest |
| 36 |
index 513c351..69aa021 100644 |
| 37 |
--- a/net-misc/tor/Manifest |
| 38 |
+++ b/net-misc/tor/Manifest |
| 39 |
@@ -5,18 +5,18 @@ AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6be |
| 40 |
AUX tor-0.2.3.2_alpha-fix-asneeded.patch 654 RMD160 faf9cc37942dfa7f52dbe849c1819b24c0ab7940 SHA1 4400ed72fa60d04a96c82f0aba7c6eb41e23f5c5 SHA256 4500436719cb96a17bfd4eb67b2ebf2b1db222904bf1b14b75cc17b8f1b41345 |
| 41 |
AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c |
| 42 |
AUX tor.initd-r5 1733 RMD160 f9c885c699884f5c7c7e0cbae48c4ea6eb6f83a2 SHA1 3db9cf78e8cde3cc0a6d9740ed12ce087acffc75 SHA256 ffd7ce8f5e88c08fa6c1c2e1db0674d5e8452bbc522aa37bad76a41bc332431d |
| 43 |
-AUX torrc-r1 150 RMD160 e44d8b4b371978f09c536c234abbe9d8779eda4c SHA1 36c64d7a1ab33931045e77c3738321ab73141d01 SHA256 0283d644362b9fd36d3d21bb1b0c47e9776de15769a445fcc86e1a8fa5abf139 |
| 44 |
-AUX torrc.sample.patch 1292 RMD160 7199aa35ede10a2cf76e8deea47a7e399c3188f9 SHA1 aec4b133f7472c0a011b0724dafae464c31f3661 SHA256 7c8dcf90eacc25745d26562dd8d6956def92880948e859b5e75c6bea5f35322e |
| 45 |
+AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 |
| 46 |
+AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14 |
| 47 |
DIST tor-0.2.2.32.tar.gz 2701371 RMD160 649c21f7ec89e34774c79db6544b612f0895bb61 SHA1 4baddc836931b3e915974c261e405e111636b716 SHA256 8744328c10b54950e08ee404a75a0e76865be0615cad6f7ffc8c75af7151ef4d |
| 48 |
DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd |
| 49 |
EBUILD tor-0.2.2.32-r1.ebuild 2381 RMD160 0bffd0fbcf2798bbd28d7d0f418ef1b7bfa1bcbe SHA1 67d33f2f8d37a4516b7935f925b697703fb6e735 SHA256 b7a4c3abeafa81c5645d1cbdd69d2200ea6d0d62d0b03ae852789ce296da2c3e |
| 50 |
EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 5283a8a27e751d3275c3a229c92087a58995a5a4 SHA1 71c8257888002c40913d7d34970a7784a78c4b19 SHA256 f752c1911199bf7379b0d3811f1c8e695443086bbe745d8f9c20019136fc37da |
| 51 |
-MISC ChangeLog 40541 RMD160 574b49be75e81d1d232868cceb53e0a8f15d8b3a SHA1 ccf5f459bc58b70c333bdb69a373dfd030e525cd SHA256 06dfe0f7d635c352824719ed5823f06439034d397602c8bd52263a4a4f19db38 |
| 52 |
+MISC ChangeLog 40688 RMD160 53704059532036b9cc35b3604f01ca66fcec12ed SHA1 3b8fb9b5fa47bba6aa7364909b4d273031cef84e SHA256 37bb1e58a3afc357838dae3f0238206be99f9eba480108e25bc8754c130a5f6b |
| 53 |
MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc |
| 54 |
-----BEGIN PGP SIGNATURE----- |
| 55 |
Version: GnuPG v2.0.17 (GNU/Linux) |
| 56 |
|
| 57 |
-iEYEAREIAAYFAk5cYJ0ACgkQl5yvQNBFVTVnxACfcf4aeZ/gKsbX54kt6fQezH7+ |
| 58 |
-sLkAn098TMHhE9IgDBBug+7VY7YbAGcV |
| 59 |
-=fQ2W |
| 60 |
+iEYEAREIAAYFAk5cYbAACgkQl5yvQNBFVTWDiQCdE5tJSvKaaJZEj5rk7I2yv4e8 |
| 61 |
+2u8An0AzKddh295DXXyFMfcfPKntCzFq |
| 62 |
+=cvgi |
| 63 |
-----END PGP SIGNATURE----- |
| 64 |
|
| 65 |
diff --git a/net-misc/tor/files/torrc-r1 b/net-misc/tor/files/torrc-r1 |
| 66 |
index fdbc2bd..322a794 100644 |
| 67 |
--- a/net-misc/tor/files/torrc-r1 |
| 68 |
+++ b/net-misc/tor/files/torrc-r1 |
| 69 |
@@ -2,7 +2,6 @@ |
| 70 |
# Minimal torrc so tor will work out of the box |
| 71 |
# |
| 72 |
User tor |
| 73 |
-Group tor |
| 74 |
PIDFile /var/run/tor/tor.pid |
| 75 |
Log notice syslog |
| 76 |
DataDirectory /var/lib/tor/data |
| 77 |
|
| 78 |
diff --git a/net-misc/tor/files/torrc.sample.patch b/net-misc/tor/files/torrc.sample.patch |
| 79 |
index 2ff13c6..4a1592a 100644 |
| 80 |
--- a/net-misc/tor/files/torrc.sample.patch |
| 81 |
+++ b/net-misc/tor/files/torrc.sample.patch |
| 82 |
@@ -1,19 +1,18 @@ |
| 83 |
diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src/config/torrc.sample.in |
| 84 |
--- tor-0.2.2.32.orig/src/config/torrc.sample.in 2011-08-29 23:13:09.000000000 -0400 |
| 85 |
+++ tor-0.2.2.32/src/config/torrc.sample.in 2011-08-29 23:14:19.000000000 -0400 |
| 86 |
-@@ -12,6 +12,11 @@ |
| 87 |
+@@ -12,6 +12,10 @@ |
| 88 |
## Tor will look for this file in various places based on your platform: |
| 89 |
## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc |
| 90 |
|
| 91 |
+## Default username and group the server will run as |
| 92 |
+User tor |
| 93 |
-+Group tor |
| 94 |
+ |
| 95 |
+PIDFile /var/run/tor/tor.pid |
| 96 |
|
| 97 |
## Replace this with "SocksPort 0" if you plan to run Tor only as a |
| 98 |
## relay, and not make any local application connections yourself. |
| 99 |
-@@ -40,6 +45,7 @@ |
| 100 |
+@@ -40,6 +44,7 @@ |
| 101 |
#Log notice syslog |
| 102 |
## To send all messages to stderr: |
| 103 |
#Log debug stderr |
| 104 |
@@ -21,7 +20,7 @@ diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src/config/ |
| 105 |
|
| 106 |
## Uncomment this to start the process in the background... or use |
| 107 |
## --runasdaemon 1 on the command line. This is ignored on Windows; |
| 108 |
-@@ -49,6 +55,7 @@ |
| 109 |
+@@ -49,6 +54,7 @@ |
| 110 |
## The directory for keeping all the keys/etc. By default, we store |
| 111 |
## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. |
| 112 |
#DataDirectory @LOCALSTATEDIR@/lib/tor |
Archives