| 1 |
commit: 00d7b8e4b4d7c7a786bb6c9a22eaaeb1b4ac75b4 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 13:47:35 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 13:47:35 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=00d7b8e4 |
| 7 |
|
| 8 |
net-misc/tor: fix logic of find in checkvarrun |
| 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 | 3 +++ |
| 14 |
net-misc/tor/Manifest | 14 ++++++++++++-- |
| 15 |
net-misc/tor/files/tor.initd-r5 | 16 ++++++++++------ |
| 16 |
3 files changed, 25 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog |
| 19 |
index 31c4316..c14346b 100644 |
| 20 |
--- a/net-misc/tor/ChangeLog |
| 21 |
+++ b/net-misc/tor/ChangeLog |
| 22 |
@@ -3,6 +3,9 @@ |
| 23 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.269 2011/08/28 11:15:42 blueness Exp $ |
| 24 |
|
| 25 |
30 Aug 2011; Anthony G. Basile <blueness@g.o> files/tor.initd-r5: |
| 26 |
+ Fix logic of find in checkvarrun |
| 27 |
+ |
| 28 |
+ 30 Aug 2011; Anthony G. Basile <blueness@g.o> files/tor.initd-r5: |
| 29 |
Make tor.initd-r5 checkvarrun fool proof |
| 30 |
|
| 31 |
30 Aug 2011; Anthony G. Basile <blueness@g.o> files/torrc-r1, |
| 32 |
|
| 33 |
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest |
| 34 |
index bd92412..1ce83c3 100644 |
| 35 |
--- a/net-misc/tor/Manifest |
| 36 |
+++ b/net-misc/tor/Manifest |
| 37 |
@@ -1,12 +1,22 @@ |
| 38 |
+-----BEGIN PGP SIGNED MESSAGE----- |
| 39 |
+Hash: SHA256 |
| 40 |
+ |
| 41 |
AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8 |
| 42 |
AUX tor-0.2.3.2_alpha-fix-asneeded.patch 654 RMD160 faf9cc37942dfa7f52dbe849c1819b24c0ab7940 SHA1 4400ed72fa60d04a96c82f0aba7c6eb41e23f5c5 SHA256 4500436719cb96a17bfd4eb67b2ebf2b1db222904bf1b14b75cc17b8f1b41345 |
| 43 |
AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c |
| 44 |
-AUX tor.initd-r5 2251 RMD160 cd0d92439d2b00b0cf24225279ee0bd3ee1be97b SHA1 8e45b1e043135236be3fa549edfcd68a9328c30b SHA256 caaed0d9ad061cb0e131c244e2b96e7c76cd4be356f2acea2fa773d6fca76010 |
| 45 |
+AUX tor.initd-r5 2299 RMD160 b0d0daf179dda2de496453fa406fcab8831180b4 SHA1 9d53d783a1fb9fa8d368b18fec8c560c7a5e764f SHA256 260ba8f87690b58f2cf08eace8c65ac2e149d4fe87e91f98134585e6a36b45ea |
| 46 |
AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 |
| 47 |
AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14 |
| 48 |
DIST tor-0.2.2.32.tar.gz 2701371 RMD160 649c21f7ec89e34774c79db6544b612f0895bb61 SHA1 4baddc836931b3e915974c261e405e111636b716 SHA256 8744328c10b54950e08ee404a75a0e76865be0615cad6f7ffc8c75af7151ef4d |
| 49 |
DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd |
| 50 |
EBUILD tor-0.2.2.32-r1.ebuild 2381 RMD160 0bffd0fbcf2798bbd28d7d0f418ef1b7bfa1bcbe SHA1 67d33f2f8d37a4516b7935f925b697703fb6e735 SHA256 b7a4c3abeafa81c5645d1cbdd69d2200ea6d0d62d0b03ae852789ce296da2c3e |
| 51 |
EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 5283a8a27e751d3275c3a229c92087a58995a5a4 SHA1 71c8257888002c40913d7d34970a7784a78c4b19 SHA256 f752c1911199bf7379b0d3811f1c8e695443086bbe745d8f9c20019136fc37da |
| 52 |
-MISC ChangeLog 40807 RMD160 ed5e6e91c774062b802da5e05fc4d23311a3d2a5 SHA1 f48cf35caebed892cdc03348c0e9240df3bea4c3 SHA256 ad8138accb19334434992f1dcad9a4bd51b627580370adeb59e683d3728c8cd3 |
| 53 |
+MISC ChangeLog 40918 RMD160 0a9d2ee9607f942b3ec973e468e88808c035f697 SHA1 ed70761da0e379bcc013d94db459638e5b30034c SHA256 dde05ef6d26ed673c47c6a76558424c6df5b67e9655a8047697c36b05cc3655c |
| 54 |
MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc |
| 55 |
+-----BEGIN PGP SIGNATURE----- |
| 56 |
+Version: GnuPG v2.0.17 (GNU/Linux) |
| 57 |
+ |
| 58 |
+iEYEAREIAAYFAk5c6fcACgkQl5yvQNBFVTVhuACeP/UhrvYPetzy/dM7//oTZB06 |
| 59 |
+yDYAnA9IY+i+P6KrLBbkHQgblspIowFy |
| 60 |
+=PcdQ |
| 61 |
+-----END PGP SIGNATURE----- |
| 62 |
|
| 63 |
diff --git a/net-misc/tor/files/tor.initd-r5 b/net-misc/tor/files/tor.initd-r5 |
| 64 |
index d27a411..11027e2 100644 |
| 65 |
--- a/net-misc/tor/files/tor.initd-r5 |
| 66 |
+++ b/net-misc/tor/files/tor.initd-r5 |
| 67 |
@@ -15,16 +15,20 @@ depend() { |
| 68 |
checkvarrun() |
| 69 |
{ |
| 70 |
# Check if /var/run/tor exists, create it if it doesn't |
| 71 |
- [ ! -d /var/run/tor ] && mkdir -p /var/run/tor |
| 72 |
+ [ ! -d /var/run/tor ] && mkdir -p ${PIDDIR} |
| 73 |
[ ! -d /var/run/tor ] && return 1 |
| 74 |
|
| 75 |
- # The directory definitly exists now, but does it belong to tor? |
| 76 |
- find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor >/dev/null && chown tor:tor ${PIDDIR} |
| 77 |
- find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor >/dev/null && return 1 |
| 78 |
+ # The directory definitly exists now, but does it belong to tor:tor? |
| 79 |
+ local dir=$(find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor) |
| 80 |
+ [ -z "$dir" ] && chown tor:tor ${PIDDIR} |
| 81 |
+ dir=$(find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor) |
| 82 |
+ [ -z "$dir" ] && return 1 |
| 83 |
|
| 84 |
# And does it have the right perms? |
| 85 |
- find ${PIDDIR} -maxdepth 0 -perm 0755 >/dev/null && chmod 0755 /var/run/tor |
| 86 |
- find ${PIDDIR} -maxdepth 0 -perm 0755 >/dev/null && return 1 |
| 87 |
+ dir=$(find ${PIDDIR} -maxdepth 0 -perm 0755) |
| 88 |
+ [ -z "$dir" ] && chmod 0755 ${PIDDIR} |
| 89 |
+ dir=$(find ${PIDDIR} -maxdepth 0 -perm 0755) |
| 90 |
+ [ -z "$dir" ] && return 1 |
| 91 |
|
| 92 |
# If any of the above failed, we would not be here |
| 93 |
return 0 |
Archives