Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
Date: Tue, 30 Aug 2011 04:01:48
Message-Id: 1292f642faf27960e3bff954e9dc482beabc17c4.blueness@gentoo
1 commit: 1292f642faf27960e3bff954e9dc482beabc17c4
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 30 04:01:33 2011 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 30 04:01:33 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=1292f642
7
8 net-misc/tor: check for /var/run/tor on start/reload
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 | 14 +++++++-------
15 net-misc/tor/files/{tor.initd-r4 => tor.initd-r5} | 7 +++++++
16 net-misc/tor/tor-0.2.2.32-r1.ebuild | 2 +-
17 net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild | 2 +-
18 5 files changed, 20 insertions(+), 9 deletions(-)
19
20 diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
21 index 8c04f9b..e90d114 100644
22 --- a/net-misc/tor/ChangeLog
23 +++ b/net-misc/tor/ChangeLog
24 @@ -2,6 +2,10 @@
25 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
26 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.269 2011/08/28 11:15:42 blueness Exp $
27
28 + 30 Aug 2011; Anthony G. Basile <blueness@g.o> tor-0.2.2.32-r1.ebuild,
29 + tor-0.2.3.2_alpha-r3.ebuild, +files/tor.initd-r5, -files/tor.initd-r4:
30 + Check for /var/run/tor on start/reload
31 +
32 30 Aug 2011; Anthony G. Basile <blueness@g.o>
33 +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.2.32-r1.ebuild,
34 +tor-0.2.3.2_alpha-r3.ebuild, +files/tor-0.2.3.2_alpha-fix-asneeded.patch,
35
36 diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
37 index ff56277..513c351 100644
38 --- a/net-misc/tor/Manifest
39 +++ b/net-misc/tor/Manifest
40 @@ -4,19 +4,19 @@ Hash: SHA256
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-r4 1553 RMD160 df0fc912c2e36797059de07d15a384d9ffe7d393 SHA1 82323d97b6d790b41027eec01e263d226c5b83e9 SHA256 4bf3c0906b0406564394eb51d47c1b5566904ed459e31ec1b1c1162c3b4aee92
45 +AUX tor.initd-r5 1733 RMD160 f9c885c699884f5c7c7e0cbae48c4ea6eb6f83a2 SHA1 3db9cf78e8cde3cc0a6d9740ed12ce087acffc75 SHA256 ffd7ce8f5e88c08fa6c1c2e1db0674d5e8452bbc522aa37bad76a41bc332431d
46 AUX torrc-r1 150 RMD160 e44d8b4b371978f09c536c234abbe9d8779eda4c SHA1 36c64d7a1ab33931045e77c3738321ab73141d01 SHA256 0283d644362b9fd36d3d21bb1b0c47e9776de15769a445fcc86e1a8fa5abf139
47 AUX torrc.sample.patch 1292 RMD160 7199aa35ede10a2cf76e8deea47a7e399c3188f9 SHA1 aec4b133f7472c0a011b0724dafae464c31f3661 SHA256 7c8dcf90eacc25745d26562dd8d6956def92880948e859b5e75c6bea5f35322e
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 3e8f2666e2f0829450937e1bd587cb48e0ff38fd SHA1 da6f1b7434b8e1f6d16ba8d8eed32f05bd7173d9 SHA256 a4bd4641ada9a06568ba4c48c2daddc49ad6b0db5639e726674454991d1f2cf9
51 -EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 82238d06d327a8ccabfeb65d3caeff7be5e5be95 SHA1 6e0db3eb3e65c24bb6ca6b249c2b00768bf0ca40 SHA256 a3d6855745bead98ecefec1a6a19b2cdeb35dff7ee03ce9a4b3b8768057b25bc
52 -MISC ChangeLog 40347 RMD160 5c24f105d438a017ab2269bf298f8afa9454b1d6 SHA1 50ce9dc3e5572191e5822d16fe3d36f3734113e2 SHA256 bf35487d48669fc4532c57738408c45aaee998f13518352b12377f231f146552
53 +EBUILD tor-0.2.2.32-r1.ebuild 2381 RMD160 0bffd0fbcf2798bbd28d7d0f418ef1b7bfa1bcbe SHA1 67d33f2f8d37a4516b7935f925b697703fb6e735 SHA256 b7a4c3abeafa81c5645d1cbdd69d2200ea6d0d62d0b03ae852789ce296da2c3e
54 +EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 5283a8a27e751d3275c3a229c92087a58995a5a4 SHA1 71c8257888002c40913d7d34970a7784a78c4b19 SHA256 f752c1911199bf7379b0d3811f1c8e695443086bbe745d8f9c20019136fc37da
55 +MISC ChangeLog 40541 RMD160 574b49be75e81d1d232868cceb53e0a8f15d8b3a SHA1 ccf5f459bc58b70c333bdb69a373dfd030e525cd SHA256 06dfe0f7d635c352824719ed5823f06439034d397602c8bd52263a4a4f19db38
56 MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
57 -----BEGIN PGP SIGNATURE-----
58 Version: GnuPG v2.0.17 (GNU/Linux)
59
60 -iEYEAREIAAYFAk5cWoIACgkQl5yvQNBFVTWbDACfUCNmWhsyRKMR2vT3d99Ut8D/
61 -eYkAmQE+LH1LrYwcAcL7zfmRMruwXhcm
62 -=y8Eg
63 +iEYEAREIAAYFAk5cYJ0ACgkQl5yvQNBFVTVnxACfcf4aeZ/gKsbX54kt6fQezH7+
64 +sLkAn098TMHhE9IgDBBug+7VY7YbAGcV
65 +=fQ2W
66 -----END PGP SIGNATURE-----
67
68 diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r5
69 similarity index 89%
70 rename from net-misc/tor/files/tor.initd-r4
71 rename to net-misc/tor/files/tor.initd-r5
72 index 597a955..f55fefb 100644
73 --- a/net-misc/tor/files/tor.initd-r4
74 +++ b/net-misc/tor/files/tor.initd-r5
75 @@ -29,6 +29,13 @@ checkconfig() {
76 /usr/bin/tor --verify-config -f ${CONFFILE}
77 return 1
78 fi
79 +
80 + # finally check if /var/run/tor exists and belongs to tor:tor
81 + if [ ! -d /var/run/tor ] ; then
82 + mkdir -p /var/run/tor
83 + chown tor:tor /var/run/tor
84 + chmod 0755 /var/run/tor
85 + fi
86 }
87
88 start() {
89
90 diff --git a/net-misc/tor/tor-0.2.2.32-r1.ebuild b/net-misc/tor/tor-0.2.2.32-r1.ebuild
91 index 724709f..5830049 100644
92 --- a/net-misc/tor/tor-0.2.2.32-r1.ebuild
93 +++ b/net-misc/tor/tor-0.2.2.32-r1.ebuild
94 @@ -52,7 +52,7 @@ src_configure() {
95
96 src_install() {
97 newconfd "${FILESDIR}"/tor.confd tor
98 - newinitd "${FILESDIR}"/tor.initd-r4 tor
99 + newinitd "${FILESDIR}"/tor.initd-r5 tor
100 emake DESTDIR="${D}" install || die
101 keepdir /var/{lib,run}/tor
102
103
104 diff --git a/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild b/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
105 index ba6e449..494280e 100644
106 --- a/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
107 +++ b/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
108 @@ -58,7 +58,7 @@ src_configure() {
109
110 src_install() {
111 newconfd "${FILESDIR}"/tor.confd tor
112 - newinitd "${FILESDIR}"/tor.initd-r4 tor
113 + newinitd "${FILESDIR}"/tor.initd-r5 tor
114 emake DESTDIR="${D}" install || die
115 keepdir /var/{lib,run}/tor