| 1 |
commit: c594680e7830b36198e00f473a1832c97ef97dbf |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 26 01:29:24 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 26 01:29:24 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=c594680e |
| 7 |
|
| 8 |
Changed to toggle syslog on conf.d variable, bug #371357#c11 |
| 9 |
|
| 10 |
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0xD0455535) |
| 11 |
|
| 12 |
--- |
| 13 |
net-misc/tinc/ChangeLog | 4 ++ |
| 14 |
net-misc/tinc/Manifest | 20 ++++++++--- |
| 15 |
net-misc/tinc/files/tincd | 51 +++++++++++++++------------ |
| 16 |
net-misc/tinc/files/tincd.conf | 4 ++ |
| 17 |
net-misc/tinc/files/tincdnosyslog | 64 ----------------------------------- |
| 18 |
net-misc/tinc/files/tincdsyslog | 64 ----------------------------------- |
| 19 |
net-misc/tinc/tinc-1.0.16-r1.ebuild | 14 ++----- |
| 20 |
7 files changed, 54 insertions(+), 167 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog |
| 23 |
index 0fb34f3..1bfda10 100644 |
| 24 |
--- a/net-misc/tinc/ChangeLog |
| 25 |
+++ b/net-misc/tinc/ChangeLog |
| 26 |
@@ -1,5 +1,9 @@ |
| 27 |
|
| 28 |
|
| 29 |
+ 26 Sep 2011; Anthony G. Basile <blueness@g.o> tinc-1.0.16-r1.ebuild, |
| 30 |
+ -files/tincdnosyslog, -files/tincdsyslog, files/tincd, files/tincd.conf: |
| 31 |
+ Changed to toggle syslog on conf.d variable, bug #371357#c11 |
| 32 |
+ |
| 33 |
*tinc-1.0.16-r1 (26 Sep 2011) |
| 34 |
|
| 35 |
26 Sep 2011; Anthony G. Basile <blueness@g.o> +tinc-1.0.16-r1.ebuild, |
| 36 |
|
| 37 |
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest |
| 38 |
index fd38923..e74b70c 100644 |
| 39 |
--- a/net-misc/tinc/Manifest |
| 40 |
+++ b/net-misc/tinc/Manifest |
| 41 |
@@ -1,10 +1,18 @@ |
| 42 |
+-----BEGIN PGP SIGNED MESSAGE----- |
| 43 |
+Hash: SHA256 |
| 44 |
+ |
| 45 |
AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad |
| 46 |
-AUX tincd 1606 RMD160 973a1e44273daa50d1b40a14b277fcde47cf36c9 SHA1 65ffdd2b1b4576df54289feec630a5f25cb50826 SHA256 e9bc35b868ba2325f7c921e377ec55be96f3a4c61f1dde621f733cedb76920bf |
| 47 |
-AUX tincd.conf 19 RMD160 907e8fbeeeeda7fd5c0916ebea6bf90d14539723 SHA1 e41eb0392c8265a9f55bf8c4069f7b25085ced14 SHA256 cdbdbf4c8ca3dc805c645a404df7cc7d10908ef4e5b59f1c1d056ca6301f34cb |
| 48 |
+AUX tincd 1768 RMD160 63fe4752d38c5a6b4dd2e6d3183985fd159076e8 SHA1 4229d77ec8791ed5d4cd92b0a0088b5da4b61648 SHA256 0f841330fef6f27480bc71ddc950f372f447f986414f169e780b2f0c5ff889ed |
| 49 |
+AUX tincd.conf 140 RMD160 a8cb9f6c3076ec62c5d8b630e884ad84e77cfbec SHA1 2983aa5d70b693a00319b45d576d26519338ee53 SHA256 948aebf1d1f2b46cd4a8ac21f9983244504a291ad5b05d49583c37f8b529a43e |
| 50 |
AUX tincd.lo 1174 RMD160 f3173005b3020712b6e6eae1f5d34825d5d08726 SHA1 7daea8e502a2cf0abc80c510315ee53172f39a64 SHA256 ce3e150bc3822f19754705826365238401386de1f012f8665727111e11a8b175 |
| 51 |
-AUX tincdnosyslog 1606 RMD160 973a1e44273daa50d1b40a14b277fcde47cf36c9 SHA1 65ffdd2b1b4576df54289feec630a5f25cb50826 SHA256 e9bc35b868ba2325f7c921e377ec55be96f3a4c61f1dde621f733cedb76920bf |
| 52 |
-AUX tincdsyslog 1569 RMD160 f03114adcd85bc5db3b5721533d0d800b69a249a SHA1 a3a1448a8878a066e677b7d96fa1bf041c578b17 SHA256 64b992b4defa5e99b19616eae5a0af1308aa424e68e65ca3b8b39708eaa4532c |
| 53 |
DIST tinc-1.0.16.tar.gz 519460 RMD160 a4d44bd90d4c19f4cc8bc27c1f92a8fb437698d3 SHA1 6700e63c548228b1675f243f0075f98511f1e3a8 SHA256 f20863cb1155ba4e4dd4cf16c35a5d706cd326eb8fe62b8b0a31fd57241a5400 |
| 54 |
-EBUILD tinc-1.0.16-r1.ebuild 1227 RMD160 6945ba9bee76bf4eb8fad6dbbae3d8c0a106325e SHA1 09cce2dde77b221ba4f68ba8b579ff3ec3e35755 SHA256 ed3f65fc2d1651791bde00aa50e3453a32245ca7d6ea7d28bc8db5aca8cedd34 |
| 55 |
-MISC ChangeLog 268 RMD160 25a25b6f8dbf77c92e98de275e5b087c5937a97a SHA1 4782b436b83e14cd65a6af23d0a785935e486e11 SHA256 9506c2cbfe3323d992948d359da2c344b29a50c43637d3862f79112b287683ec |
| 56 |
+EBUILD tinc-1.0.16-r1.ebuild 1000 RMD160 0752f0f125e53b32c165d662d707f459428cd49a SHA1 29b5fa860889f94d3c6ae933b7a2752e4e5440e4 SHA256 3c333ae27d401bf726afdfb6e83ae27f2840d3b6fd722c838fe8362758bd9a6b |
| 57 |
+MISC ChangeLog 485 RMD160 884419631b449658ab20a654a557a35fa3e2fcc3 SHA1 74b33808d3a685e582e8144ab32a70c3a06959b7 SHA256 0c484bf5f1eb8ab88457a4550f6a632dab38709d2e84ce814c72b523d850b199 |
| 58 |
MISC metadata.xml 323 RMD160 4afa38944097d8968b63842a67ed19531f0d9ec4 SHA1 40e3e0444e37634e1c939a5dd5677cef74827778 SHA256 8a800ba6f409642a7327882575dab780d140d7692155b5644850421abb7bb4d5 |
| 59 |
+-----BEGIN PGP SIGNATURE----- |
| 60 |
+Version: GnuPG v2.0.17 (GNU/Linux) |
| 61 |
+ |
| 62 |
+iEYEAREIAAYFAk5/1XQACgkQl5yvQNBFVTWLOwCeMF47KzQACZAHyktRkOdR6kbg |
| 63 |
+6bYAn2BsygtCzGeFFRqunRnJ4pDtXpON |
| 64 |
+=pb4G |
| 65 |
+-----END PGP SIGNATURE----- |
| 66 |
|
| 67 |
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd |
| 68 |
index 00c1c37..dfddf26 100644 |
| 69 |
--- a/net-misc/tinc/files/tincd |
| 70 |
+++ b/net-misc/tinc/files/tincd |
| 71 |
@@ -3,7 +3,9 @@ |
| 72 |
# Distributed under the terms of the GNU General Public License v2 |
| 73 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $ |
| 74 |
|
| 75 |
-opts="reload" |
| 76 |
+extra_commands="reload" |
| 77 |
+ |
| 78 |
+TINC_NETS="/etc/conf.d/tinc.networks" |
| 79 |
|
| 80 |
depend() { |
| 81 |
use logger dns |
| 82 |
@@ -11,9 +13,8 @@ depend() { |
| 83 |
} |
| 84 |
|
| 85 |
checkconfig() { |
| 86 |
- if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks |
| 87 |
- then |
| 88 |
- eerror "No VPN networks configured in /etc/conf.d/tinc.networks" |
| 89 |
+ if ! grep -q '^ *NETWORK:' "${TINC_NETS}" ; then |
| 90 |
+ eerror "No VPN networks configured in ${TINC_NETS}" |
| 91 |
return 1 |
| 92 |
fi |
| 93 |
} |
| 94 |
@@ -21,15 +22,21 @@ checkconfig() { |
| 95 |
start() { |
| 96 |
checkconfig || return 1 |
| 97 |
ebegin "Starting tinc VPN networks" |
| 98 |
- eend 0 |
| 99 |
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET |
| 100 |
+ awk '/^ *NETWORK:/ { print $2 }' "${TINC_NETS}" | while read TINCNET |
| 101 |
do |
| 102 |
- if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ] |
| 103 |
- then |
| 104 |
- eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !" |
| 105 |
+ CONFIG="/etc/tinc/${TINCNET}/tinc.conf" |
| 106 |
+ PIDFILE="/var/run/tinc.${TINCNET}.pid" |
| 107 |
+ if [ ! -f "${CONFIG}" ]; then |
| 108 |
+ eerror "Cannot start network ${TINCNET}." |
| 109 |
+ eerror "Please set up ${CONFIG} !" |
| 110 |
else |
| 111 |
- ebegin "Starting tinc network $TINCNET" |
| 112 |
- /usr/sbin/tincd --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid |
| 113 |
+ ebegin "Starting tinc network ${TINCNET}" |
| 114 |
+ if [ "${TINC_SYSLOG}" == "yes" ]; then |
| 115 |
+ LOG=" --logfile=/var/log/tinc.${TINCNET}.log" |
| 116 |
+ else |
| 117 |
+ LOG="" |
| 118 |
+ fi |
| 119 |
+ start-stop-daemon --start --exec /usr/sbin/tincd -- --net="${TINCNET}" "${LOG}" --pidfile "${PIDFILE}" |
| 120 |
eend $? |
| 121 |
fi |
| 122 |
done |
| 123 |
@@ -37,13 +44,12 @@ start() { |
| 124 |
|
| 125 |
stop() { |
| 126 |
ebegin "Stopping tinc VPN networks" |
| 127 |
- eend 0 |
| 128 |
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET |
| 129 |
+ awk '/^ *NETWORK:/ { print $2 }' "${TINC_NETS}" | while read TINCNET |
| 130 |
do |
| 131 |
- if [ -f /var/run/tinc."$TINCNET".pid ] |
| 132 |
- then |
| 133 |
- ebegin "Stopping tinc network $TINCNET" |
| 134 |
- /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid |
| 135 |
+ PIDFILE="/var/run/tinc.${TINCNET}.pid" |
| 136 |
+ if [ -f "${PIDFILE}" ]; then |
| 137 |
+ ebegin "Stopping tinc network ${TINCNET}" |
| 138 |
+ start-stop-daemon --stop --pidfile "${PIDFILE}" |
| 139 |
eend $? |
| 140 |
fi |
| 141 |
done |
| 142 |
@@ -51,13 +57,12 @@ stop() { |
| 143 |
|
| 144 |
reload() { |
| 145 |
ebegin "Reloading configuration for tinc VPN networks" |
| 146 |
- eend 0 |
| 147 |
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET |
| 148 |
+ awk '/^ *NETWORK:/ { print $2 }' "${TINC_NETS}" | while read TINCNET |
| 149 |
do |
| 150 |
- if [ -f /var/run/tinc."$TINCNET".pid ] |
| 151 |
- then |
| 152 |
- ebegin "Reloading tinc network $TINCNET" |
| 153 |
- /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid |
| 154 |
+ PIDFILE="/var/run/tinc.${TINCNET}.pid" |
| 155 |
+ if [ -f "${PIDFILE}" ]; then |
| 156 |
+ ebegin "Reloading tinc network ${TINCNET}" |
| 157 |
+ start-stop-daemon --signal HUP --pidfile ${PIDFILE} |
| 158 |
eend $? |
| 159 |
fi |
| 160 |
done |
| 161 |
|
| 162 |
diff --git a/net-misc/tinc/files/tincd.conf b/net-misc/tinc/files/tincd.conf |
| 163 |
index c19b836..65d6907 100644 |
| 164 |
--- a/net-misc/tinc/files/tincd.conf |
| 165 |
+++ b/net-misc/tinc/files/tincd.conf |
| 166 |
@@ -1 +1,5 @@ |
| 167 |
#rc_need="net.net" |
| 168 |
+ |
| 169 |
+#If you want TINC to log to syslog, then set this to "yes" |
| 170 |
+#Anything else and tincd will log to FIXME |
| 171 |
+TINC_SYSLOG="yes" |
| 172 |
|
| 173 |
diff --git a/net-misc/tinc/files/tincdnosyslog b/net-misc/tinc/files/tincdnosyslog |
| 174 |
deleted file mode 100644 |
| 175 |
index 00c1c37..0000000 |
| 176 |
--- a/net-misc/tinc/files/tincdnosyslog |
| 177 |
+++ /dev/null |
| 178 |
@@ -1,64 +0,0 @@ |
| 179 |
-#!/sbin/runscript |
| 180 |
-# Copyright 1999-2011 Gentoo Foundation |
| 181 |
-# Distributed under the terms of the GNU General Public License v2 |
| 182 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $ |
| 183 |
- |
| 184 |
-opts="reload" |
| 185 |
- |
| 186 |
-depend() { |
| 187 |
- use logger dns |
| 188 |
- need net |
| 189 |
-} |
| 190 |
- |
| 191 |
-checkconfig() { |
| 192 |
- if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks |
| 193 |
- then |
| 194 |
- eerror "No VPN networks configured in /etc/conf.d/tinc.networks" |
| 195 |
- return 1 |
| 196 |
- fi |
| 197 |
-} |
| 198 |
- |
| 199 |
-start() { |
| 200 |
- checkconfig || return 1 |
| 201 |
- ebegin "Starting tinc VPN networks" |
| 202 |
- eend 0 |
| 203 |
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET |
| 204 |
- do |
| 205 |
- if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ] |
| 206 |
- then |
| 207 |
- eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !" |
| 208 |
- else |
| 209 |
- ebegin "Starting tinc network $TINCNET" |
| 210 |
- /usr/sbin/tincd --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid |
| 211 |
- eend $? |
| 212 |
- fi |
| 213 |
- done |
| 214 |
-} |
| 215 |
- |
| 216 |
-stop() { |
| 217 |
- ebegin "Stopping tinc VPN networks" |
| 218 |
- eend 0 |
| 219 |
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET |
| 220 |
- do |
| 221 |
- if [ -f /var/run/tinc."$TINCNET".pid ] |
| 222 |
- then |
| 223 |
- ebegin "Stopping tinc network $TINCNET" |
| 224 |
- /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid |
| 225 |
- eend $? |
| 226 |
- fi |
| 227 |
- done |
| 228 |
-} |
| 229 |
- |
| 230 |
-reload() { |
| 231 |
- ebegin "Reloading configuration for tinc VPN networks" |
| 232 |
- eend 0 |
| 233 |
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET |
| 234 |
- do |
| 235 |
- if [ -f /var/run/tinc."$TINCNET".pid ] |
| 236 |
- then |
| 237 |
- ebegin "Reloading tinc network $TINCNET" |
| 238 |
- /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid |
| 239 |
- eend $? |
| 240 |
- fi |
| 241 |
- done |
| 242 |
-} |
| 243 |
|
| 244 |
diff --git a/net-misc/tinc/files/tincdsyslog b/net-misc/tinc/files/tincdsyslog |
| 245 |
deleted file mode 100644 |
| 246 |
index e87b81c..0000000 |
| 247 |
--- a/net-misc/tinc/files/tincdsyslog |
| 248 |
+++ /dev/null |
| 249 |
@@ -1,64 +0,0 @@ |
| 250 |
-#!/sbin/runscript |
| 251 |
-# Copyright 1999-2011 Gentoo Foundation |
| 252 |
-# Distributed under the terms of the GNU General Public License v2 |
| 253 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $ |
| 254 |
- |
| 255 |
-opts="reload" |
| 256 |
- |
| 257 |
-depend() { |
| 258 |
- use logger dns |
| 259 |
- need net |
| 260 |
-} |
| 261 |
- |
| 262 |
-checkconfig() { |
| 263 |
- if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks |
| 264 |
- then |
| 265 |
- eerror "No VPN networks configured in /etc/conf.d/tinc.networks" |
| 266 |
- return 1 |
| 267 |
- fi |
| 268 |
-} |
| 269 |
- |
| 270 |
-start() { |
| 271 |
- checkconfig || return 1 |
| 272 |
- ebegin "Starting tinc VPN networks" |
| 273 |
- eend 0 |
| 274 |
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET |
| 275 |
- do |
| 276 |
- if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ] |
| 277 |
- then |
| 278 |
- eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !" |
| 279 |
- else |
| 280 |
- ebegin "Starting tinc network $TINCNET" |
| 281 |
- /usr/sbin/tincd --net="$TINCNET" --pidfile=/var/run/tinc.$TINCNET.pid |
| 282 |
- eend $? |
| 283 |
- fi |
| 284 |
- done |
| 285 |
-} |
| 286 |
- |
| 287 |
-stop() { |
| 288 |
- ebegin "Stopping tinc VPN networks" |
| 289 |
- eend 0 |
| 290 |
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET |
| 291 |
- do |
| 292 |
- if [ -f /var/run/tinc."$TINCNET".pid ] |
| 293 |
- then |
| 294 |
- ebegin "Stopping tinc network $TINCNET" |
| 295 |
- /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid |
| 296 |
- eend $? |
| 297 |
- fi |
| 298 |
- done |
| 299 |
-} |
| 300 |
- |
| 301 |
-reload() { |
| 302 |
- ebegin "Reloading configuration for tinc VPN networks" |
| 303 |
- eend 0 |
| 304 |
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET |
| 305 |
- do |
| 306 |
- if [ -f /var/run/tinc."$TINCNET".pid ] |
| 307 |
- then |
| 308 |
- ebegin "Reloading tinc network $TINCNET" |
| 309 |
- /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid |
| 310 |
- eend $? |
| 311 |
- fi |
| 312 |
- done |
| 313 |
-} |
| 314 |
|
| 315 |
diff --git a/net-misc/tinc/tinc-1.0.16-r1.ebuild b/net-misc/tinc/tinc-1.0.16-r1.ebuild |
| 316 |
index 7eb3b3f..39df86c 100644 |
| 317 |
--- a/net-misc/tinc/tinc-1.0.16-r1.ebuild |
| 318 |
+++ b/net-misc/tinc/tinc-1.0.16-r1.ebuild |
| 319 |
@@ -11,27 +11,21 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz" |
| 320 |
LICENSE="GPL-2" |
| 321 |
SLOT="0" |
| 322 |
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos" |
| 323 |
-IUSE="+lzo +zlib +syslog" |
| 324 |
+IUSE="+lzo +zlib" |
| 325 |
|
| 326 |
DEPEND=">=dev-libs/openssl-0.9.7c |
| 327 |
lzo? ( dev-libs/lzo:2 ) |
| 328 |
- zlib? ( >=sys-libs/zlib-1.1.4-r2 ) |
| 329 |
- syslog? ( app-admin/syslog-ng )" |
| 330 |
+ zlib? ( >=sys-libs/zlib-1.1.4-r2 )" |
| 331 |
|
| 332 |
src_configure() { |
| 333 |
- econf --enable-jumbograms $(use_enable lzo) $(use_enable zlib) || die |
| 334 |
+ econf --enable-jumbograms $(use_enable lzo) $(use_enable zlib) |
| 335 |
} |
| 336 |
|
| 337 |
src_install() { |
| 338 |
- emake DESTDIR="${D}" install || die |
| 339 |
+ emake DESTDIR="${D}" install |
| 340 |
dodir /etc/tinc |
| 341 |
dodoc AUTHORS NEWS README THANKS |
| 342 |
doinitd "${FILESDIR}"/tincd{,.lo} |
| 343 |
- if use syslog; then |
| 344 |
- newinitd "${FILESDIR}"/tincdsyslog tincd || die "newinitd failed!" |
| 345 |
- else |
| 346 |
- newinitd "${FILESDIR}"/tincdnosyslog tincd || die "newinitd failed!" |
| 347 |
- fi |
| 348 |
doconfd "${FILESDIR}"/tinc.networks |
| 349 |
newconfd "${FILESDIR}"/tincd.conf tincd |
| 350 |
} |
Archives