* [gentoo-commits] dev/blueness:master commit in: net-misc/tinc/, net-misc/tinc/files/
@ 2011-09-26 2:27 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2011-09-26 2:27 UTC (permalink / raw
To: gentoo-commits
commit: ebc9f18d8d44f468e1e34fcc273c8cfed1ea006a
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 02:27:51 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 02:27:51 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=ebc9f18d
net-misc/tinc: cleaned up the init scripts
---
net-misc/tinc/ChangeLog | 4 +++
net-misc/tinc/Manifest | 18 +++-----------
net-misc/tinc/files/tincd | 35 +++++++++++++++--------------
net-misc/tinc/files/tincd.conf | 6 ++--
net-misc/tinc/files/tincd.lo | 48 +++++++++++++++++++++++++---------------
5 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 1bfda10..3e06add 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,5 +1,9 @@
+ 26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> files/tincd,
+ files/tincd.conf, files/tincd.lo:
+ Cleaned up the init scripts
+
26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> tinc-1.0.16-r1.ebuild,
-files/tincdnosyslog, -files/tincdsyslog, files/tincd, files/tincd.conf:
Changed to toggle syslog on conf.d variable, bug #371357#c11
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index e74b70c..8e3d769 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
-AUX tincd 1768 RMD160 63fe4752d38c5a6b4dd2e6d3183985fd159076e8 SHA1 4229d77ec8791ed5d4cd92b0a0088b5da4b61648 SHA256 0f841330fef6f27480bc71ddc950f372f447f986414f169e780b2f0c5ff889ed
-AUX tincd.conf 140 RMD160 a8cb9f6c3076ec62c5d8b630e884ad84e77cfbec SHA1 2983aa5d70b693a00319b45d576d26519338ee53 SHA256 948aebf1d1f2b46cd4a8ac21f9983244504a291ad5b05d49583c37f8b529a43e
-AUX tincd.lo 1174 RMD160 f3173005b3020712b6e6eae1f5d34825d5d08726 SHA1 7daea8e502a2cf0abc80c510315ee53172f39a64 SHA256 ce3e150bc3822f19754705826365238401386de1f012f8665727111e11a8b175
+AUX tincd 1754 RMD160 689f1b30822a101a6f3e612fa56d8ea88f93ca65 SHA1 d012405de4eedc6c2ecb454ba2d3f1939a73f2eb SHA256 ff9b51f0aedb760d25acb2de1e1814603d4168ace8ee377e69eecbecaf365716
+AUX tincd.conf 157 RMD160 72e67087f4f88a4958a54eb8cf8270cdfebe4339 SHA1 82dda948f1982c9289d6732f20b7e0da33ca2f6a SHA256 eef883d3cf4ba8376f6b37518f39df103b0d999c5faa2a82653926ce50255060
+AUX tincd.lo 1358 RMD160 ea70799c678490f9bf5729d3d97f27c05b409c7c SHA1 ec77436c4d31f737967174c3057413f41aacfd4c SHA256 dfa94c22d415bbe71ff5df838232100dfb7cbe3e6fe9578c935574cf0627d61e
DIST tinc-1.0.16.tar.gz 519460 RMD160 a4d44bd90d4c19f4cc8bc27c1f92a8fb437698d3 SHA1 6700e63c548228b1675f243f0075f98511f1e3a8 SHA256 f20863cb1155ba4e4dd4cf16c35a5d706cd326eb8fe62b8b0a31fd57241a5400
EBUILD tinc-1.0.16-r1.ebuild 1000 RMD160 0752f0f125e53b32c165d662d707f459428cd49a SHA1 29b5fa860889f94d3c6ae933b7a2752e4e5440e4 SHA256 3c333ae27d401bf726afdfb6e83ae27f2840d3b6fd722c838fe8362758bd9a6b
-MISC ChangeLog 485 RMD160 884419631b449658ab20a654a557a35fa3e2fcc3 SHA1 74b33808d3a685e582e8144ab32a70c3a06959b7 SHA256 0c484bf5f1eb8ab88457a4550f6a632dab38709d2e84ce814c72b523d850b199
+MISC ChangeLog 620 RMD160 fe4be2e228f773ed17d5b3d5a9cf6b42d19ebced SHA1 80db5feda129494e29bd20b2433d16713de7e20c SHA256 1145d5ff03215e993c64b0844cdb1e30144b24165f4310ca8af70f5cea7a360e
MISC metadata.xml 323 RMD160 4afa38944097d8968b63842a67ed19531f0d9ec4 SHA1 40e3e0444e37634e1c939a5dd5677cef74827778 SHA256 8a800ba6f409642a7327882575dab780d140d7692155b5644850421abb7bb4d5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk5/1XQACgkQl5yvQNBFVTWLOwCeMF47KzQACZAHyktRkOdR6kbg
-6bYAn2BsygtCzGeFFRqunRnJ4pDtXpON
-=pb4G
------END PGP SIGNATURE-----
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
index dfddf26..09f7090 100644
--- a/net-misc/tinc/files/tincd
+++ b/net-misc/tinc/files/tincd
@@ -5,7 +5,8 @@
extra_commands="reload"
-TINC_NETS="/etc/conf.d/tinc.networks"
+NETS="/etc/conf.d/tinc.networks"
+DAEMON="/usr/sbin/tincd"
depend() {
use logger dns
@@ -13,8 +14,8 @@ depend() {
}
checkconfig() {
- if ! grep -q '^ *NETWORK:' "${TINC_NETS}" ; then
- eerror "No VPN networks configured in ${TINC_NETS}"
+ if ! grep -q '^ *NETWORK:' "${NETS}" ; then
+ eerror "No VPN networks configured in ${NETS}"
return 1
fi
}
@@ -22,21 +23,21 @@ checkconfig() {
start() {
checkconfig || return 1
ebegin "Starting tinc VPN networks"
- awk '/^ *NETWORK:/ { print $2 }' "${TINC_NETS}" | while read TINCNET
+ awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
do
- CONFIG="/etc/tinc/${TINCNET}/tinc.conf"
- PIDFILE="/var/run/tinc.${TINCNET}.pid"
+ CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
+ PIDFILE="/var/run/tinc.${NETNAME}.pid"
if [ ! -f "${CONFIG}" ]; then
- eerror "Cannot start network ${TINCNET}."
+ eerror "Cannot start network ${NETNAME}."
eerror "Please set up ${CONFIG} !"
else
- ebegin "Starting tinc network ${TINCNET}"
- if [ "${TINC_SYSLOG}" == "yes" ]; then
- LOG=" --logfile=/var/log/tinc.${TINCNET}.log"
+ ebegin "Starting tinc network ${NETNAME}"
+ if [ "${SYSLOG}" == "yes" ]; then
+ LOG=" --logfile=/var/log/tinc.${NETNAME}.log"
else
LOG=""
fi
- start-stop-daemon --start --exec /usr/sbin/tincd -- --net="${TINCNET}" "${LOG}" --pidfile "${PIDFILE}"
+ start-stop-daemon --start --exec "${DAEMON}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
eend $?
fi
done
@@ -44,11 +45,11 @@ start() {
stop() {
ebegin "Stopping tinc VPN networks"
- awk '/^ *NETWORK:/ { print $2 }' "${TINC_NETS}" | while read TINCNET
+ awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
do
- PIDFILE="/var/run/tinc.${TINCNET}.pid"
+ PIDFILE="/var/run/tinc.${NETNAME}.pid"
if [ -f "${PIDFILE}" ]; then
- ebegin "Stopping tinc network ${TINCNET}"
+ ebegin "Stopping tinc network ${NETNAME}"
start-stop-daemon --stop --pidfile "${PIDFILE}"
eend $?
fi
@@ -57,11 +58,11 @@ stop() {
reload() {
ebegin "Reloading configuration for tinc VPN networks"
- awk '/^ *NETWORK:/ { print $2 }' "${TINC_NETS}" | while read TINCNET
+ awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
do
- PIDFILE="/var/run/tinc.${TINCNET}.pid"
+ PIDFILE="/var/run/tinc.${NETNAME}.pid"
if [ -f "${PIDFILE}" ]; then
- ebegin "Reloading tinc network ${TINCNET}"
+ ebegin "Reloading tinc network ${NETNAME}"
start-stop-daemon --signal HUP --pidfile ${PIDFILE}
eend $?
fi
diff --git a/net-misc/tinc/files/tincd.conf b/net-misc/tinc/files/tincd.conf
index 65d6907..0394702 100644
--- a/net-misc/tinc/files/tincd.conf
+++ b/net-misc/tinc/files/tincd.conf
@@ -1,5 +1,5 @@
#rc_need="net.net"
-#If you want TINC to log to syslog, then set this to "yes"
-#Anything else and tincd will log to FIXME
-TINC_SYSLOG="yes"
+#If you want tincd to log to syslog, then set this to "yes"
+#Anything else and tincd will log to /var/log/tinc.NETNAME.log.
+SYSLOG="yes"
diff --git a/net-misc/tinc/files/tincd.lo b/net-misc/tinc/files/tincd.lo
index 4b5dde6..2a2e864 100644
--- a/net-misc/tinc/files/tincd.lo
+++ b/net-misc/tinc/files/tincd.lo
@@ -3,7 +3,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo,v 1.1 2010/07/18 10:04:56 dragonheart Exp $
-opts="reload"
+extra_commands="reload"
+
+DAEMON="/usr/sbin/tincd"
depend()
{
@@ -13,34 +15,44 @@ depend()
start()
{
- TINCNET=${RC_SVCNAME#*.}
- if [ -f /etc/tinc/"$TINCNET"/tinc.conf ] ; then
- ebegin "Starting tinc network $TINCNET"
- /usr/sbin/tincd --debug=1 --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
- eend $?
+ NETNAME="${RC_SVCNAME#*.}"
+ CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
+ PIDFILE="/var/run/tinc.${NETNAME}.pid"
+ if [ ! -f "${CONFIG}" ]; then
+ eerror "Cannot start network ${NETNAME}."
+ eerror "Please set up ${CONFIG} !"
else
- eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
+ ebegin "Starting tinc network $NETNAME"
+ if [ "${SYSLOG}" == "yes" ]; then
+ LOG=" --logfile=/var/log/tinc.${NETNAME}.log"
+ else
+ LOG=""
+ fi
+ start-stop-daemon --start --exec "${DAEMON}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
+ eend $?
fi
}
stop()
{
- TINCNET=${RC_SVCNAME#*.}
- if [ -f /var/run/tinc."$TINCNET".pid ] ; then
- ebegin "Stopping tinc network $TINCNET"
- /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
+ NETNAME="${RC_SVCNAME#*.}"
+ CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
+ PIDFILE="/var/run/tinc.${NETNAME}.pid"
+ if [ -f "${PIDFILE}" ] ; then
+ ebegin "Stopping tinc network ${NETNAME}"
+ start-stop-daemon --stop --pidfile "${PIDFILE}"
eend $?
- else
- eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
fi
}
reload()
{
- TINCNET=${RC_SVCNAME#*.}
- if [ -f /var/run/tinc."$TINCNET".pid ] ; then
- ebegin "Reloading configuration for tinc network $TINCNET"
- /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
- eend $?
+ NETNAME=${RC_SVCNAME#*.}
+ CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
+ PIDFILE="/var/run/tinc.${NETNAME}.pid"
+ if [ -f "${PIDFILE}" ] ; then
+ ebegin "Reloading tinc network ${NETNAME}"
+ start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
+ eend $?
fi
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] dev/blueness:master commit in: net-misc/tinc/, net-misc/tinc/files/
@ 2011-09-26 3:29 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2011-09-26 3:29 UTC (permalink / raw
To: gentoo-commits
commit: 20377561822a33d883da67b62404943f3edb94ac
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 03:29:35 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 03:29:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=20377561
net-misc/tinc: moved to tree
---
net-misc/tinc/ChangeLog | 26 -------------
net-misc/tinc/Manifest | 18 ---------
net-misc/tinc/files/tinc.networks | 13 ------
net-misc/tinc/files/tincd.1 | 70 -----------------------------------
net-misc/tinc/files/tincd.conf.1 | 5 --
net-misc/tinc/files/tincd.lo.1 | 58 -----------------------------
net-misc/tinc/metadata.xml | 9 ----
net-misc/tinc/tinc-1.0.16-r1.ebuild | 37 ------------------
8 files changed, 0 insertions(+), 236 deletions(-)
diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
deleted file mode 100644
index ffbd286..0000000
--- a/net-misc/tinc/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- 26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> tinc-1.0.16-r1.ebuild,
- +files/tincd.1, +files/tincd.conf.1, +files/tincd.lo.1, -files/tincd,
- -files/tincd.conf, -files/tincd.lo:
- Rename tincd, tincd.conf and tincd.lo to avoid collision
-
- 26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> files/tincd,
- files/tincd.lo:
- Fixed logic with --logfile in init.d scripts
-
- 26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> files/tincd,
- files/tincd.conf, files/tincd.lo:
- Cleaned up the init scripts
-
- 26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> tinc-1.0.16-r1.ebuild,
- -files/tincdnosyslog, -files/tincdsyslog, files/tincd, files/tincd.conf:
- Changed to toggle syslog on conf.d variable, bug #371357#c11
-
-*tinc-1.0.16-r1 (26 Sep 2011)
-
- 26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> +tinc-1.0.16-r1.ebuild,
- +files/tinc.networks, +files/tincd, +files/tincd.conf, +files/tincd.lo,
- +files/tincdnosyslog, +files/tincdsyslog, +metadata.xml:
- Work on bug #371357
-
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
deleted file mode 100644
index 1b9454e..0000000
--- a/net-misc/tinc/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
-AUX tincd.1 1753 RMD160 00630b4f43fff9e00516c2952dc463b3375ea6a5 SHA1 badcf16780eb0fa2446d30419c6652675944f753 SHA256 bfc641e976f21652b62a42461c6b227695c1d36e1ca20def9dfb4ebfb6fa5b20
-AUX tincd.conf.1 157 RMD160 72e67087f4f88a4958a54eb8cf8270cdfebe4339 SHA1 82dda948f1982c9289d6732f20b7e0da33ca2f6a SHA256 eef883d3cf4ba8376f6b37518f39df103b0d999c5faa2a82653926ce50255060
-AUX tincd.lo.1 1357 RMD160 4adfac136270557063ef3cb22be03ef0dc580d1c SHA1 d6887f62c92afb348dbbb36a22737e417cddf1bb SHA256 c01093edb573e6f2f8f12cb7f43274345d058a251db3a798fccb17fc1fa02a22
-DIST tinc-1.0.16.tar.gz 519460 RMD160 a4d44bd90d4c19f4cc8bc27c1f92a8fb437698d3 SHA1 6700e63c548228b1675f243f0075f98511f1e3a8 SHA256 f20863cb1155ba4e4dd4cf16c35a5d706cd326eb8fe62b8b0a31fd57241a5400
-EBUILD tinc-1.0.16-r1.ebuild 1049 RMD160 e141117d9eb378493a52881c47f112a6ae23c828 SHA1 12dee3e10bf7043c3766e39c23985fadbf96717c SHA256 02a35aa29622d9f06a4df084616188a45312f600fe3a33b8fdc9072ded8014ef
-MISC ChangeLog 1002 RMD160 9c3ed25b446f232f3d53de63853eaf2187ab5674 SHA1 21f61aa6c9eb331abe45eaf0e2b3eea599bfcead SHA256 614f33d25c5300a5f1a10ae63a3a200042befff6fd85e51a22d7bc3507572840
-MISC metadata.xml 323 RMD160 4afa38944097d8968b63842a67ed19531f0d9ec4 SHA1 40e3e0444e37634e1c939a5dd5677cef74827778 SHA256 8a800ba6f409642a7327882575dab780d140d7692155b5644850421abb7bb4d5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk5/5vwACgkQl5yvQNBFVTXxIACdFuUoLcGMN8VNw2mOclWTormk
-Q/EAn3R21bf2tMN4IDBXpqxc7EmcxyP5
-=VExt
------END PGP SIGNATURE-----
diff --git a/net-misc/tinc/files/tinc.networks b/net-misc/tinc/files/tinc.networks
deleted file mode 100644
index e1844ce..0000000
--- a/net-misc/tinc/files/tinc.networks
+++ /dev/null
@@ -1,13 +0,0 @@
-# file: /etc/conf.d/tinc.networks for /etc/init.d/tincd
-
-# In this file you define the tinc networks you want to connect to
-
-# USAGE:
-# you add a network to the init script by defining:
-# NETWORK: your_network_name
-#
-# if you want to connect to multiple VPN's just set them behind each other. e.g.
-# NETWORK: foo
-# NETWORK: bar
-#
-# this would join the network foo and the network bar.
diff --git a/net-misc/tinc/files/tincd.1 b/net-misc/tinc/files/tincd.1
deleted file mode 100644
index 6ecbb50..0000000
--- a/net-misc/tinc/files/tincd.1
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $
-
-extra_commands="reload"
-
-NETS="/etc/conf.d/tinc.networks"
-DAEMON="/usr/sbin/tincd"
-
-depend() {
- use logger dns
- need net
-}
-
-checkconfig() {
- if ! grep -q '^ *NETWORK:' "${NETS}" ; then
- eerror "No VPN networks configured in ${NETS}"
- return 1
- fi
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting tinc VPN networks"
- awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
- do
- CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
- PIDFILE="/var/run/tinc.${NETNAME}.pid"
- if [ ! -f "${CONFIG}" ]; then
- eerror "Cannot start network ${NETNAME}."
- eerror "Please set up ${CONFIG} !"
- else
- ebegin "Starting tinc network ${NETNAME}"
- if [ "${SYSLOG}" == "yes" ]; then
- LOG=""
- else
- LOG="--logfile=/var/log/tinc.${NETNAME}.log"
- fi
- start-stop-daemon --start --exec "${DAEMON}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
- eend $?
- fi
- done
-}
-
-stop() {
- ebegin "Stopping tinc VPN networks"
- awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
- do
- PIDFILE="/var/run/tinc.${NETNAME}.pid"
- if [ -f "${PIDFILE}" ]; then
- ebegin "Stopping tinc network ${NETNAME}"
- start-stop-daemon --stop --pidfile "${PIDFILE}"
- eend $?
- fi
- done
-}
-
-reload() {
- ebegin "Reloading configuration for tinc VPN networks"
- awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
- do
- PIDFILE="/var/run/tinc.${NETNAME}.pid"
- if [ -f "${PIDFILE}" ]; then
- ebegin "Reloading tinc network ${NETNAME}"
- start-stop-daemon --signal HUP --pidfile ${PIDFILE}
- eend $?
- fi
- done
-}
diff --git a/net-misc/tinc/files/tincd.conf.1 b/net-misc/tinc/files/tincd.conf.1
deleted file mode 100644
index 0394702..0000000
--- a/net-misc/tinc/files/tincd.conf.1
+++ /dev/null
@@ -1,5 +0,0 @@
-#rc_need="net.net"
-
-#If you want tincd to log to syslog, then set this to "yes"
-#Anything else and tincd will log to /var/log/tinc.NETNAME.log.
-SYSLOG="yes"
diff --git a/net-misc/tinc/files/tincd.lo.1 b/net-misc/tinc/files/tincd.lo.1
deleted file mode 100644
index 97c4ad4..0000000
--- a/net-misc/tinc/files/tincd.lo.1
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo,v 1.1 2010/07/18 10:04:56 dragonheart Exp $
-
-extra_commands="reload"
-
-DAEMON="/usr/sbin/tincd"
-
-depend()
-{
- use logger dns
- need net
-}
-
-start()
-{
- NETNAME="${RC_SVCNAME#*.}"
- CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
- PIDFILE="/var/run/tinc.${NETNAME}.pid"
- if [ ! -f "${CONFIG}" ]; then
- eerror "Cannot start network ${NETNAME}."
- eerror "Please set up ${CONFIG} !"
- else
- ebegin "Starting tinc network $NETNAME"
- if [ "${SYSLOG}" == "yes" ]; then
- LOG=""
- else
- LOG="--logfile=/var/log/tinc.${NETNAME}.log"
- fi
- start-stop-daemon --start --exec "${DAEMON}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
- eend $?
- fi
-}
-
-stop()
-{
- NETNAME="${RC_SVCNAME#*.}"
- CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
- PIDFILE="/var/run/tinc.${NETNAME}.pid"
- if [ -f "${PIDFILE}" ] ; then
- ebegin "Stopping tinc network ${NETNAME}"
- start-stop-daemon --stop --pidfile "${PIDFILE}"
- eend $?
- fi
-}
-
-reload()
-{
- NETNAME=${RC_SVCNAME#*.}
- CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
- PIDFILE="/var/run/tinc.${NETNAME}.pid"
- if [ -f "${PIDFILE}" ] ; then
- ebegin "Reloading tinc network ${NETNAME}"
- start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
- eend $?
- fi
-}
diff --git a/net-misc/tinc/metadata.xml b/net-misc/tinc/metadata.xml
deleted file mode 100644
index ce4aedb..0000000
--- a/net-misc/tinc/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
- <longdescription>tinc is an easy to configure VPN implementation.</longdescription>
-</pkgmetadata>
diff --git a/net-misc/tinc/tinc-1.0.16-r1.ebuild b/net-misc/tinc/tinc-1.0.16-r1.ebuild
deleted file mode 100644
index 7524656..0000000
--- a/net-misc/tinc/tinc-1.0.16-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.16.ebuild,v 1.2
-
-EAPI=4
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +zlib"
-
-DEPEND=">=dev-libs/openssl-0.9.7c
- lzo? ( dev-libs/lzo:2 )
- zlib? ( >=sys-libs/zlib-1.1.4-r2 )"
-
-src_configure() {
- econf --enable-jumbograms $(use_enable lzo) $(use_enable zlib)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodir /etc/tinc
- dodoc AUTHORS NEWS README THANKS
- newinitd "${FILESDIR}"/tincd.1 tincd
- newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
- doconfd "${FILESDIR}"/tinc.networks
- newconfd "${FILESDIR}"/tincd.conf.1 tincd
-}
-
-pkg_postinst() {
- elog "This package requires the tun/tap kernel device."
- elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] dev/blueness:master commit in: net-misc/tinc/, net-misc/tinc/files/
@ 2011-09-26 2:44 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2011-09-26 2:44 UTC (permalink / raw
To: gentoo-commits
commit: a425d22ed8db0ef71e6543e1dd33f8f6d91e2118
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 02:44:12 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 02:44:12 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=a425d22e
net-misc/tinc: Rename tincd, tincd.conf and tincd.lo to avoid collision
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
net-misc/tinc/ChangeLog | 5 +++++
net-misc/tinc/Manifest | 20 +++++++++++++++-----
net-misc/tinc/files/{tincd => tincd.1} | 0
net-misc/tinc/files/{tincd.conf => tincd.conf.1} | 0
net-misc/tinc/files/{tincd.lo => tincd.lo.1} | 0
net-misc/tinc/tinc-1.0.16-r1.ebuild | 5 +++--
6 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 1cca707..ffbd286 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,5 +1,10 @@
+ 26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> tinc-1.0.16-r1.ebuild,
+ +files/tincd.1, +files/tincd.conf.1, +files/tincd.lo.1, -files/tincd,
+ -files/tincd.conf, -files/tincd.lo:
+ Rename tincd, tincd.conf and tincd.lo to avoid collision
+
26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> files/tincd,
files/tincd.lo:
Fixed logic with --logfile in init.d scripts
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index 39bfed8..1b9454e 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
-AUX tincd 1753 RMD160 00630b4f43fff9e00516c2952dc463b3375ea6a5 SHA1 badcf16780eb0fa2446d30419c6652675944f753 SHA256 bfc641e976f21652b62a42461c6b227695c1d36e1ca20def9dfb4ebfb6fa5b20
-AUX tincd.conf 157 RMD160 72e67087f4f88a4958a54eb8cf8270cdfebe4339 SHA1 82dda948f1982c9289d6732f20b7e0da33ca2f6a SHA256 eef883d3cf4ba8376f6b37518f39df103b0d999c5faa2a82653926ce50255060
-AUX tincd.lo 1357 RMD160 4adfac136270557063ef3cb22be03ef0dc580d1c SHA1 d6887f62c92afb348dbbb36a22737e417cddf1bb SHA256 c01093edb573e6f2f8f12cb7f43274345d058a251db3a798fccb17fc1fa02a22
+AUX tincd.1 1753 RMD160 00630b4f43fff9e00516c2952dc463b3375ea6a5 SHA1 badcf16780eb0fa2446d30419c6652675944f753 SHA256 bfc641e976f21652b62a42461c6b227695c1d36e1ca20def9dfb4ebfb6fa5b20
+AUX tincd.conf.1 157 RMD160 72e67087f4f88a4958a54eb8cf8270cdfebe4339 SHA1 82dda948f1982c9289d6732f20b7e0da33ca2f6a SHA256 eef883d3cf4ba8376f6b37518f39df103b0d999c5faa2a82653926ce50255060
+AUX tincd.lo.1 1357 RMD160 4adfac136270557063ef3cb22be03ef0dc580d1c SHA1 d6887f62c92afb348dbbb36a22737e417cddf1bb SHA256 c01093edb573e6f2f8f12cb7f43274345d058a251db3a798fccb17fc1fa02a22
DIST tinc-1.0.16.tar.gz 519460 RMD160 a4d44bd90d4c19f4cc8bc27c1f92a8fb437698d3 SHA1 6700e63c548228b1675f243f0075f98511f1e3a8 SHA256 f20863cb1155ba4e4dd4cf16c35a5d706cd326eb8fe62b8b0a31fd57241a5400
-EBUILD tinc-1.0.16-r1.ebuild 1000 RMD160 0752f0f125e53b32c165d662d707f459428cd49a SHA1 29b5fa860889f94d3c6ae933b7a2752e4e5440e4 SHA256 3c333ae27d401bf726afdfb6e83ae27f2840d3b6fd722c838fe8362758bd9a6b
-MISC ChangeLog 754 RMD160 168df6d8323889634749c39286cd9f6a5d504466 SHA1 89cbcdafdc5dd8fe7885318dac47af336bbb0225 SHA256 064d25e1451479f427ee248a757f85665be7e0ec9d0e544331f33e2ec5a027c3
+EBUILD tinc-1.0.16-r1.ebuild 1049 RMD160 e141117d9eb378493a52881c47f112a6ae23c828 SHA1 12dee3e10bf7043c3766e39c23985fadbf96717c SHA256 02a35aa29622d9f06a4df084616188a45312f600fe3a33b8fdc9072ded8014ef
+MISC ChangeLog 1002 RMD160 9c3ed25b446f232f3d53de63853eaf2187ab5674 SHA1 21f61aa6c9eb331abe45eaf0e2b3eea599bfcead SHA256 614f33d25c5300a5f1a10ae63a3a200042befff6fd85e51a22d7bc3507572840
MISC metadata.xml 323 RMD160 4afa38944097d8968b63842a67ed19531f0d9ec4 SHA1 40e3e0444e37634e1c939a5dd5677cef74827778 SHA256 8a800ba6f409642a7327882575dab780d140d7692155b5644850421abb7bb4d5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk5/5vwACgkQl5yvQNBFVTXxIACdFuUoLcGMN8VNw2mOclWTormk
+Q/EAn3R21bf2tMN4IDBXpqxc7EmcxyP5
+=VExt
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd.1
similarity index 100%
rename from net-misc/tinc/files/tincd
rename to net-misc/tinc/files/tincd.1
diff --git a/net-misc/tinc/files/tincd.conf b/net-misc/tinc/files/tincd.conf.1
similarity index 100%
rename from net-misc/tinc/files/tincd.conf
rename to net-misc/tinc/files/tincd.conf.1
diff --git a/net-misc/tinc/files/tincd.lo b/net-misc/tinc/files/tincd.lo.1
similarity index 100%
rename from net-misc/tinc/files/tincd.lo
rename to net-misc/tinc/files/tincd.lo.1
diff --git a/net-misc/tinc/tinc-1.0.16-r1.ebuild b/net-misc/tinc/tinc-1.0.16-r1.ebuild
index 39df86c..7524656 100644
--- a/net-misc/tinc/tinc-1.0.16-r1.ebuild
+++ b/net-misc/tinc/tinc-1.0.16-r1.ebuild
@@ -25,9 +25,10 @@ src_install() {
emake DESTDIR="${D}" install
dodir /etc/tinc
dodoc AUTHORS NEWS README THANKS
- doinitd "${FILESDIR}"/tincd{,.lo}
+ newinitd "${FILESDIR}"/tincd.1 tincd
+ newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
doconfd "${FILESDIR}"/tinc.networks
- newconfd "${FILESDIR}"/tincd.conf tincd
+ newconfd "${FILESDIR}"/tincd.conf.1 tincd
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] dev/blueness:master commit in: net-misc/tinc/, net-misc/tinc/files/
@ 2011-09-26 2:37 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2011-09-26 2:37 UTC (permalink / raw
To: gentoo-commits
commit: 3cc0c329ba5d300a3946df1ac526157a8d920401
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 02:37:28 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 02:37:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=3cc0c329
net-misc/tinc: fixed logic with --logfile in init.d scripts
---
net-misc/tinc/ChangeLog | 4 ++++
net-misc/tinc/Manifest | 6 +++---
net-misc/tinc/files/tincd | 4 ++--
net-misc/tinc/files/tincd.lo | 4 ++--
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 3e06add..1cca707 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,10 @@
26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> files/tincd,
+ files/tincd.lo:
+ Fixed logic with --logfile in init.d scripts
+
+ 26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> files/tincd,
files/tincd.conf, files/tincd.lo:
Cleaned up the init scripts
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index 8e3d769..39bfed8 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,8 +1,8 @@
AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
-AUX tincd 1754 RMD160 689f1b30822a101a6f3e612fa56d8ea88f93ca65 SHA1 d012405de4eedc6c2ecb454ba2d3f1939a73f2eb SHA256 ff9b51f0aedb760d25acb2de1e1814603d4168ace8ee377e69eecbecaf365716
+AUX tincd 1753 RMD160 00630b4f43fff9e00516c2952dc463b3375ea6a5 SHA1 badcf16780eb0fa2446d30419c6652675944f753 SHA256 bfc641e976f21652b62a42461c6b227695c1d36e1ca20def9dfb4ebfb6fa5b20
AUX tincd.conf 157 RMD160 72e67087f4f88a4958a54eb8cf8270cdfebe4339 SHA1 82dda948f1982c9289d6732f20b7e0da33ca2f6a SHA256 eef883d3cf4ba8376f6b37518f39df103b0d999c5faa2a82653926ce50255060
-AUX tincd.lo 1358 RMD160 ea70799c678490f9bf5729d3d97f27c05b409c7c SHA1 ec77436c4d31f737967174c3057413f41aacfd4c SHA256 dfa94c22d415bbe71ff5df838232100dfb7cbe3e6fe9578c935574cf0627d61e
+AUX tincd.lo 1357 RMD160 4adfac136270557063ef3cb22be03ef0dc580d1c SHA1 d6887f62c92afb348dbbb36a22737e417cddf1bb SHA256 c01093edb573e6f2f8f12cb7f43274345d058a251db3a798fccb17fc1fa02a22
DIST tinc-1.0.16.tar.gz 519460 RMD160 a4d44bd90d4c19f4cc8bc27c1f92a8fb437698d3 SHA1 6700e63c548228b1675f243f0075f98511f1e3a8 SHA256 f20863cb1155ba4e4dd4cf16c35a5d706cd326eb8fe62b8b0a31fd57241a5400
EBUILD tinc-1.0.16-r1.ebuild 1000 RMD160 0752f0f125e53b32c165d662d707f459428cd49a SHA1 29b5fa860889f94d3c6ae933b7a2752e4e5440e4 SHA256 3c333ae27d401bf726afdfb6e83ae27f2840d3b6fd722c838fe8362758bd9a6b
-MISC ChangeLog 620 RMD160 fe4be2e228f773ed17d5b3d5a9cf6b42d19ebced SHA1 80db5feda129494e29bd20b2433d16713de7e20c SHA256 1145d5ff03215e993c64b0844cdb1e30144b24165f4310ca8af70f5cea7a360e
+MISC ChangeLog 754 RMD160 168df6d8323889634749c39286cd9f6a5d504466 SHA1 89cbcdafdc5dd8fe7885318dac47af336bbb0225 SHA256 064d25e1451479f427ee248a757f85665be7e0ec9d0e544331f33e2ec5a027c3
MISC metadata.xml 323 RMD160 4afa38944097d8968b63842a67ed19531f0d9ec4 SHA1 40e3e0444e37634e1c939a5dd5677cef74827778 SHA256 8a800ba6f409642a7327882575dab780d140d7692155b5644850421abb7bb4d5
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
index 09f7090..6ecbb50 100644
--- a/net-misc/tinc/files/tincd
+++ b/net-misc/tinc/files/tincd
@@ -33,9 +33,9 @@ start() {
else
ebegin "Starting tinc network ${NETNAME}"
if [ "${SYSLOG}" == "yes" ]; then
- LOG=" --logfile=/var/log/tinc.${NETNAME}.log"
- else
LOG=""
+ else
+ LOG="--logfile=/var/log/tinc.${NETNAME}.log"
fi
start-stop-daemon --start --exec "${DAEMON}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
eend $?
diff --git a/net-misc/tinc/files/tincd.lo b/net-misc/tinc/files/tincd.lo
index 2a2e864..97c4ad4 100644
--- a/net-misc/tinc/files/tincd.lo
+++ b/net-misc/tinc/files/tincd.lo
@@ -24,9 +24,9 @@ start()
else
ebegin "Starting tinc network $NETNAME"
if [ "${SYSLOG}" == "yes" ]; then
- LOG=" --logfile=/var/log/tinc.${NETNAME}.log"
- else
LOG=""
+ else
+ LOG="--logfile=/var/log/tinc.${NETNAME}.log"
fi
start-stop-daemon --start --exec "${DAEMON}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
eend $?
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] dev/blueness:master commit in: net-misc/tinc/, net-misc/tinc/files/
@ 2011-09-26 1:29 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2011-09-26 1:29 UTC (permalink / raw
To: gentoo-commits
commit: c594680e7830b36198e00f473a1832c97ef97dbf
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 01:29:24 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 01:29:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=c594680e
Changed to toggle syslog on conf.d variable, bug #371357#c11
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
net-misc/tinc/ChangeLog | 4 ++
net-misc/tinc/Manifest | 20 ++++++++---
net-misc/tinc/files/tincd | 51 +++++++++++++++------------
net-misc/tinc/files/tincd.conf | 4 ++
net-misc/tinc/files/tincdnosyslog | 64 -----------------------------------
net-misc/tinc/files/tincdsyslog | 64 -----------------------------------
net-misc/tinc/tinc-1.0.16-r1.ebuild | 14 ++-----
7 files changed, 54 insertions(+), 167 deletions(-)
diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 0fb34f3..1bfda10 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,5 +1,9 @@
+ 26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> tinc-1.0.16-r1.ebuild,
+ -files/tincdnosyslog, -files/tincdsyslog, files/tincd, files/tincd.conf:
+ Changed to toggle syslog on conf.d variable, bug #371357#c11
+
*tinc-1.0.16-r1 (26 Sep 2011)
26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> +tinc-1.0.16-r1.ebuild,
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index fd38923..e74b70c 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
-AUX tincd 1606 RMD160 973a1e44273daa50d1b40a14b277fcde47cf36c9 SHA1 65ffdd2b1b4576df54289feec630a5f25cb50826 SHA256 e9bc35b868ba2325f7c921e377ec55be96f3a4c61f1dde621f733cedb76920bf
-AUX tincd.conf 19 RMD160 907e8fbeeeeda7fd5c0916ebea6bf90d14539723 SHA1 e41eb0392c8265a9f55bf8c4069f7b25085ced14 SHA256 cdbdbf4c8ca3dc805c645a404df7cc7d10908ef4e5b59f1c1d056ca6301f34cb
+AUX tincd 1768 RMD160 63fe4752d38c5a6b4dd2e6d3183985fd159076e8 SHA1 4229d77ec8791ed5d4cd92b0a0088b5da4b61648 SHA256 0f841330fef6f27480bc71ddc950f372f447f986414f169e780b2f0c5ff889ed
+AUX tincd.conf 140 RMD160 a8cb9f6c3076ec62c5d8b630e884ad84e77cfbec SHA1 2983aa5d70b693a00319b45d576d26519338ee53 SHA256 948aebf1d1f2b46cd4a8ac21f9983244504a291ad5b05d49583c37f8b529a43e
AUX tincd.lo 1174 RMD160 f3173005b3020712b6e6eae1f5d34825d5d08726 SHA1 7daea8e502a2cf0abc80c510315ee53172f39a64 SHA256 ce3e150bc3822f19754705826365238401386de1f012f8665727111e11a8b175
-AUX tincdnosyslog 1606 RMD160 973a1e44273daa50d1b40a14b277fcde47cf36c9 SHA1 65ffdd2b1b4576df54289feec630a5f25cb50826 SHA256 e9bc35b868ba2325f7c921e377ec55be96f3a4c61f1dde621f733cedb76920bf
-AUX tincdsyslog 1569 RMD160 f03114adcd85bc5db3b5721533d0d800b69a249a SHA1 a3a1448a8878a066e677b7d96fa1bf041c578b17 SHA256 64b992b4defa5e99b19616eae5a0af1308aa424e68e65ca3b8b39708eaa4532c
DIST tinc-1.0.16.tar.gz 519460 RMD160 a4d44bd90d4c19f4cc8bc27c1f92a8fb437698d3 SHA1 6700e63c548228b1675f243f0075f98511f1e3a8 SHA256 f20863cb1155ba4e4dd4cf16c35a5d706cd326eb8fe62b8b0a31fd57241a5400
-EBUILD tinc-1.0.16-r1.ebuild 1227 RMD160 6945ba9bee76bf4eb8fad6dbbae3d8c0a106325e SHA1 09cce2dde77b221ba4f68ba8b579ff3ec3e35755 SHA256 ed3f65fc2d1651791bde00aa50e3453a32245ca7d6ea7d28bc8db5aca8cedd34
-MISC ChangeLog 268 RMD160 25a25b6f8dbf77c92e98de275e5b087c5937a97a SHA1 4782b436b83e14cd65a6af23d0a785935e486e11 SHA256 9506c2cbfe3323d992948d359da2c344b29a50c43637d3862f79112b287683ec
+EBUILD tinc-1.0.16-r1.ebuild 1000 RMD160 0752f0f125e53b32c165d662d707f459428cd49a SHA1 29b5fa860889f94d3c6ae933b7a2752e4e5440e4 SHA256 3c333ae27d401bf726afdfb6e83ae27f2840d3b6fd722c838fe8362758bd9a6b
+MISC ChangeLog 485 RMD160 884419631b449658ab20a654a557a35fa3e2fcc3 SHA1 74b33808d3a685e582e8144ab32a70c3a06959b7 SHA256 0c484bf5f1eb8ab88457a4550f6a632dab38709d2e84ce814c72b523d850b199
MISC metadata.xml 323 RMD160 4afa38944097d8968b63842a67ed19531f0d9ec4 SHA1 40e3e0444e37634e1c939a5dd5677cef74827778 SHA256 8a800ba6f409642a7327882575dab780d140d7692155b5644850421abb7bb4d5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk5/1XQACgkQl5yvQNBFVTWLOwCeMF47KzQACZAHyktRkOdR6kbg
+6bYAn2BsygtCzGeFFRqunRnJ4pDtXpON
+=pb4G
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
index 00c1c37..dfddf26 100644
--- a/net-misc/tinc/files/tincd
+++ b/net-misc/tinc/files/tincd
@@ -3,7 +3,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $
-opts="reload"
+extra_commands="reload"
+
+TINC_NETS="/etc/conf.d/tinc.networks"
depend() {
use logger dns
@@ -11,9 +13,8 @@ depend() {
}
checkconfig() {
- if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks
- then
- eerror "No VPN networks configured in /etc/conf.d/tinc.networks"
+ if ! grep -q '^ *NETWORK:' "${TINC_NETS}" ; then
+ eerror "No VPN networks configured in ${TINC_NETS}"
return 1
fi
}
@@ -21,15 +22,21 @@ checkconfig() {
start() {
checkconfig || return 1
ebegin "Starting tinc VPN networks"
- eend 0
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ awk '/^ *NETWORK:/ { print $2 }' "${TINC_NETS}" | while read TINCNET
do
- if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ]
- then
- eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
+ CONFIG="/etc/tinc/${TINCNET}/tinc.conf"
+ PIDFILE="/var/run/tinc.${TINCNET}.pid"
+ if [ ! -f "${CONFIG}" ]; then
+ eerror "Cannot start network ${TINCNET}."
+ eerror "Please set up ${CONFIG} !"
else
- ebegin "Starting tinc network $TINCNET"
- /usr/sbin/tincd --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
+ ebegin "Starting tinc network ${TINCNET}"
+ if [ "${TINC_SYSLOG}" == "yes" ]; then
+ LOG=" --logfile=/var/log/tinc.${TINCNET}.log"
+ else
+ LOG=""
+ fi
+ start-stop-daemon --start --exec /usr/sbin/tincd -- --net="${TINCNET}" "${LOG}" --pidfile "${PIDFILE}"
eend $?
fi
done
@@ -37,13 +44,12 @@ start() {
stop() {
ebegin "Stopping tinc VPN networks"
- eend 0
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ awk '/^ *NETWORK:/ { print $2 }' "${TINC_NETS}" | while read TINCNET
do
- if [ -f /var/run/tinc."$TINCNET".pid ]
- then
- ebegin "Stopping tinc network $TINCNET"
- /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
+ PIDFILE="/var/run/tinc.${TINCNET}.pid"
+ if [ -f "${PIDFILE}" ]; then
+ ebegin "Stopping tinc network ${TINCNET}"
+ start-stop-daemon --stop --pidfile "${PIDFILE}"
eend $?
fi
done
@@ -51,13 +57,12 @@ stop() {
reload() {
ebegin "Reloading configuration for tinc VPN networks"
- eend 0
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ awk '/^ *NETWORK:/ { print $2 }' "${TINC_NETS}" | while read TINCNET
do
- if [ -f /var/run/tinc."$TINCNET".pid ]
- then
- ebegin "Reloading tinc network $TINCNET"
- /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
+ PIDFILE="/var/run/tinc.${TINCNET}.pid"
+ if [ -f "${PIDFILE}" ]; then
+ ebegin "Reloading tinc network ${TINCNET}"
+ start-stop-daemon --signal HUP --pidfile ${PIDFILE}
eend $?
fi
done
diff --git a/net-misc/tinc/files/tincd.conf b/net-misc/tinc/files/tincd.conf
index c19b836..65d6907 100644
--- a/net-misc/tinc/files/tincd.conf
+++ b/net-misc/tinc/files/tincd.conf
@@ -1 +1,5 @@
#rc_need="net.net"
+
+#If you want TINC to log to syslog, then set this to "yes"
+#Anything else and tincd will log to FIXME
+TINC_SYSLOG="yes"
diff --git a/net-misc/tinc/files/tincdnosyslog b/net-misc/tinc/files/tincdnosyslog
deleted file mode 100644
index 00c1c37..0000000
--- a/net-misc/tinc/files/tincdnosyslog
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $
-
-opts="reload"
-
-depend() {
- use logger dns
- need net
-}
-
-checkconfig() {
- if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks
- then
- eerror "No VPN networks configured in /etc/conf.d/tinc.networks"
- return 1
- fi
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting tinc VPN networks"
- eend 0
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
- do
- if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ]
- then
- eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
- else
- ebegin "Starting tinc network $TINCNET"
- /usr/sbin/tincd --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
- eend $?
- fi
- done
-}
-
-stop() {
- ebegin "Stopping tinc VPN networks"
- eend 0
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
- do
- if [ -f /var/run/tinc."$TINCNET".pid ]
- then
- ebegin "Stopping tinc network $TINCNET"
- /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
- eend $?
- fi
- done
-}
-
-reload() {
- ebegin "Reloading configuration for tinc VPN networks"
- eend 0
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
- do
- if [ -f /var/run/tinc."$TINCNET".pid ]
- then
- ebegin "Reloading tinc network $TINCNET"
- /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
- eend $?
- fi
- done
-}
diff --git a/net-misc/tinc/files/tincdsyslog b/net-misc/tinc/files/tincdsyslog
deleted file mode 100644
index e87b81c..0000000
--- a/net-misc/tinc/files/tincdsyslog
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $
-
-opts="reload"
-
-depend() {
- use logger dns
- need net
-}
-
-checkconfig() {
- if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks
- then
- eerror "No VPN networks configured in /etc/conf.d/tinc.networks"
- return 1
- fi
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting tinc VPN networks"
- eend 0
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
- do
- if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ]
- then
- eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
- else
- ebegin "Starting tinc network $TINCNET"
- /usr/sbin/tincd --net="$TINCNET" --pidfile=/var/run/tinc.$TINCNET.pid
- eend $?
- fi
- done
-}
-
-stop() {
- ebegin "Stopping tinc VPN networks"
- eend 0
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
- do
- if [ -f /var/run/tinc."$TINCNET".pid ]
- then
- ebegin "Stopping tinc network $TINCNET"
- /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
- eend $?
- fi
- done
-}
-
-reload() {
- ebegin "Reloading configuration for tinc VPN networks"
- eend 0
- awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
- do
- if [ -f /var/run/tinc."$TINCNET".pid ]
- then
- ebegin "Reloading tinc network $TINCNET"
- /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
- eend $?
- fi
- done
-}
diff --git a/net-misc/tinc/tinc-1.0.16-r1.ebuild b/net-misc/tinc/tinc-1.0.16-r1.ebuild
index 7eb3b3f..39df86c 100644
--- a/net-misc/tinc/tinc-1.0.16-r1.ebuild
+++ b/net-misc/tinc/tinc-1.0.16-r1.ebuild
@@ -11,27 +11,21 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +zlib +syslog"
+IUSE="+lzo +zlib"
DEPEND=">=dev-libs/openssl-0.9.7c
lzo? ( dev-libs/lzo:2 )
- zlib? ( >=sys-libs/zlib-1.1.4-r2 )
- syslog? ( app-admin/syslog-ng )"
+ zlib? ( >=sys-libs/zlib-1.1.4-r2 )"
src_configure() {
- econf --enable-jumbograms $(use_enable lzo) $(use_enable zlib) || die
+ econf --enable-jumbograms $(use_enable lzo) $(use_enable zlib)
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
dodir /etc/tinc
dodoc AUTHORS NEWS README THANKS
doinitd "${FILESDIR}"/tincd{,.lo}
- if use syslog; then
- newinitd "${FILESDIR}"/tincdsyslog tincd || die "newinitd failed!"
- else
- newinitd "${FILESDIR}"/tincdnosyslog tincd || die "newinitd failed!"
- fi
doconfd "${FILESDIR}"/tinc.networks
newconfd "${FILESDIR}"/tincd.conf tincd
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] dev/blueness:master commit in: net-misc/tinc/, net-misc/tinc/files/
@ 2011-09-26 0:11 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2011-09-26 0:11 UTC (permalink / raw
To: gentoo-commits
commit: bbf2b8035f6cd7ae11233353d749a85c1068e26c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 00:11:28 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 00:11:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=bbf2b803
net-misc/tinc: work on bug #371357
---
net-misc/tinc/ChangeLog | 9 +++++
net-misc/tinc/Manifest | 10 +++++
net-misc/tinc/files/tinc.networks | 13 +++++++
net-misc/tinc/files/tincd | 64 +++++++++++++++++++++++++++++++++++
net-misc/tinc/files/tincd.conf | 1 +
net-misc/tinc/files/tincd.lo | 46 +++++++++++++++++++++++++
net-misc/tinc/files/tincdnosyslog | 64 +++++++++++++++++++++++++++++++++++
net-misc/tinc/files/tincdsyslog | 64 +++++++++++++++++++++++++++++++++++
net-misc/tinc/metadata.xml | 9 +++++
net-misc/tinc/tinc-1.0.16-r1.ebuild | 42 +++++++++++++++++++++++
10 files changed, 322 insertions(+), 0 deletions(-)
diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
new file mode 100644
index 0000000..0fb34f3
--- /dev/null
+++ b/net-misc/tinc/ChangeLog
@@ -0,0 +1,9 @@
+
+
+*tinc-1.0.16-r1 (26 Sep 2011)
+
+ 26 Sep 2011; Anthony G. Basile <blueness@gentoo.org> +tinc-1.0.16-r1.ebuild,
+ +files/tinc.networks, +files/tincd, +files/tincd.conf, +files/tincd.lo,
+ +files/tincdnosyslog, +files/tincdsyslog, +metadata.xml:
+ Work on bug #371357
+
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
new file mode 100644
index 0000000..fd38923
--- /dev/null
+++ b/net-misc/tinc/Manifest
@@ -0,0 +1,10 @@
+AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
+AUX tincd 1606 RMD160 973a1e44273daa50d1b40a14b277fcde47cf36c9 SHA1 65ffdd2b1b4576df54289feec630a5f25cb50826 SHA256 e9bc35b868ba2325f7c921e377ec55be96f3a4c61f1dde621f733cedb76920bf
+AUX tincd.conf 19 RMD160 907e8fbeeeeda7fd5c0916ebea6bf90d14539723 SHA1 e41eb0392c8265a9f55bf8c4069f7b25085ced14 SHA256 cdbdbf4c8ca3dc805c645a404df7cc7d10908ef4e5b59f1c1d056ca6301f34cb
+AUX tincd.lo 1174 RMD160 f3173005b3020712b6e6eae1f5d34825d5d08726 SHA1 7daea8e502a2cf0abc80c510315ee53172f39a64 SHA256 ce3e150bc3822f19754705826365238401386de1f012f8665727111e11a8b175
+AUX tincdnosyslog 1606 RMD160 973a1e44273daa50d1b40a14b277fcde47cf36c9 SHA1 65ffdd2b1b4576df54289feec630a5f25cb50826 SHA256 e9bc35b868ba2325f7c921e377ec55be96f3a4c61f1dde621f733cedb76920bf
+AUX tincdsyslog 1569 RMD160 f03114adcd85bc5db3b5721533d0d800b69a249a SHA1 a3a1448a8878a066e677b7d96fa1bf041c578b17 SHA256 64b992b4defa5e99b19616eae5a0af1308aa424e68e65ca3b8b39708eaa4532c
+DIST tinc-1.0.16.tar.gz 519460 RMD160 a4d44bd90d4c19f4cc8bc27c1f92a8fb437698d3 SHA1 6700e63c548228b1675f243f0075f98511f1e3a8 SHA256 f20863cb1155ba4e4dd4cf16c35a5d706cd326eb8fe62b8b0a31fd57241a5400
+EBUILD tinc-1.0.16-r1.ebuild 1227 RMD160 6945ba9bee76bf4eb8fad6dbbae3d8c0a106325e SHA1 09cce2dde77b221ba4f68ba8b579ff3ec3e35755 SHA256 ed3f65fc2d1651791bde00aa50e3453a32245ca7d6ea7d28bc8db5aca8cedd34
+MISC ChangeLog 268 RMD160 25a25b6f8dbf77c92e98de275e5b087c5937a97a SHA1 4782b436b83e14cd65a6af23d0a785935e486e11 SHA256 9506c2cbfe3323d992948d359da2c344b29a50c43637d3862f79112b287683ec
+MISC metadata.xml 323 RMD160 4afa38944097d8968b63842a67ed19531f0d9ec4 SHA1 40e3e0444e37634e1c939a5dd5677cef74827778 SHA256 8a800ba6f409642a7327882575dab780d140d7692155b5644850421abb7bb4d5
diff --git a/net-misc/tinc/files/tinc.networks b/net-misc/tinc/files/tinc.networks
new file mode 100644
index 0000000..e1844ce
--- /dev/null
+++ b/net-misc/tinc/files/tinc.networks
@@ -0,0 +1,13 @@
+# file: /etc/conf.d/tinc.networks for /etc/init.d/tincd
+
+# In this file you define the tinc networks you want to connect to
+
+# USAGE:
+# you add a network to the init script by defining:
+# NETWORK: your_network_name
+#
+# if you want to connect to multiple VPN's just set them behind each other. e.g.
+# NETWORK: foo
+# NETWORK: bar
+#
+# this would join the network foo and the network bar.
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
new file mode 100644
index 0000000..00c1c37
--- /dev/null
+++ b/net-misc/tinc/files/tincd
@@ -0,0 +1,64 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $
+
+opts="reload"
+
+depend() {
+ use logger dns
+ need net
+}
+
+checkconfig() {
+ if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks
+ then
+ eerror "No VPN networks configured in /etc/conf.d/tinc.networks"
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ]
+ then
+ eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
+ else
+ ebegin "Starting tinc network $TINCNET"
+ /usr/sbin/tincd --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
+ eend $?
+ fi
+ done
+}
+
+stop() {
+ ebegin "Stopping tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ -f /var/run/tinc."$TINCNET".pid ]
+ then
+ ebegin "Stopping tinc network $TINCNET"
+ /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ fi
+ done
+}
+
+reload() {
+ ebegin "Reloading configuration for tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ -f /var/run/tinc."$TINCNET".pid ]
+ then
+ ebegin "Reloading tinc network $TINCNET"
+ /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ fi
+ done
+}
diff --git a/net-misc/tinc/files/tincd.conf b/net-misc/tinc/files/tincd.conf
new file mode 100644
index 0000000..c19b836
--- /dev/null
+++ b/net-misc/tinc/files/tincd.conf
@@ -0,0 +1 @@
+#rc_need="net.net"
diff --git a/net-misc/tinc/files/tincd.lo b/net-misc/tinc/files/tincd.lo
new file mode 100644
index 0000000..4b5dde6
--- /dev/null
+++ b/net-misc/tinc/files/tincd.lo
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo,v 1.1 2010/07/18 10:04:56 dragonheart Exp $
+
+opts="reload"
+
+depend()
+{
+ use logger dns
+ need net
+}
+
+start()
+{
+ TINCNET=${RC_SVCNAME#*.}
+ if [ -f /etc/tinc/"$TINCNET"/tinc.conf ] ; then
+ ebegin "Starting tinc network $TINCNET"
+ /usr/sbin/tincd --debug=1 --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
+ eend $?
+ else
+ eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
+ fi
+}
+
+stop()
+{
+ TINCNET=${RC_SVCNAME#*.}
+ if [ -f /var/run/tinc."$TINCNET".pid ] ; then
+ ebegin "Stopping tinc network $TINCNET"
+ /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ else
+ eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
+ fi
+}
+
+reload()
+{
+ TINCNET=${RC_SVCNAME#*.}
+ if [ -f /var/run/tinc."$TINCNET".pid ] ; then
+ ebegin "Reloading configuration for tinc network $TINCNET"
+ /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ fi
+}
diff --git a/net-misc/tinc/files/tincdnosyslog b/net-misc/tinc/files/tincdnosyslog
new file mode 100644
index 0000000..00c1c37
--- /dev/null
+++ b/net-misc/tinc/files/tincdnosyslog
@@ -0,0 +1,64 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $
+
+opts="reload"
+
+depend() {
+ use logger dns
+ need net
+}
+
+checkconfig() {
+ if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks
+ then
+ eerror "No VPN networks configured in /etc/conf.d/tinc.networks"
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ]
+ then
+ eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
+ else
+ ebegin "Starting tinc network $TINCNET"
+ /usr/sbin/tincd --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
+ eend $?
+ fi
+ done
+}
+
+stop() {
+ ebegin "Stopping tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ -f /var/run/tinc."$TINCNET".pid ]
+ then
+ ebegin "Stopping tinc network $TINCNET"
+ /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ fi
+ done
+}
+
+reload() {
+ ebegin "Reloading configuration for tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ -f /var/run/tinc."$TINCNET".pid ]
+ then
+ ebegin "Reloading tinc network $TINCNET"
+ /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ fi
+ done
+}
diff --git a/net-misc/tinc/files/tincdsyslog b/net-misc/tinc/files/tincdsyslog
new file mode 100644
index 0000000..e87b81c
--- /dev/null
+++ b/net-misc/tinc/files/tincdsyslog
@@ -0,0 +1,64 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $
+
+opts="reload"
+
+depend() {
+ use logger dns
+ need net
+}
+
+checkconfig() {
+ if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks
+ then
+ eerror "No VPN networks configured in /etc/conf.d/tinc.networks"
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ]
+ then
+ eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
+ else
+ ebegin "Starting tinc network $TINCNET"
+ /usr/sbin/tincd --net="$TINCNET" --pidfile=/var/run/tinc.$TINCNET.pid
+ eend $?
+ fi
+ done
+}
+
+stop() {
+ ebegin "Stopping tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ -f /var/run/tinc."$TINCNET".pid ]
+ then
+ ebegin "Stopping tinc network $TINCNET"
+ /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ fi
+ done
+}
+
+reload() {
+ ebegin "Reloading configuration for tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ -f /var/run/tinc."$TINCNET".pid ]
+ then
+ ebegin "Reloading tinc network $TINCNET"
+ /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ fi
+ done
+}
diff --git a/net-misc/tinc/metadata.xml b/net-misc/tinc/metadata.xml
new file mode 100644
index 0000000..ce4aedb
--- /dev/null
+++ b/net-misc/tinc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <longdescription>tinc is an easy to configure VPN implementation.</longdescription>
+</pkgmetadata>
diff --git a/net-misc/tinc/tinc-1.0.16-r1.ebuild b/net-misc/tinc/tinc-1.0.16-r1.ebuild
new file mode 100644
index 0000000..7eb3b3f
--- /dev/null
+++ b/net-misc/tinc/tinc-1.0.16-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.16.ebuild,v 1.2
+
+EAPI=4
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/"
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+lzo +zlib +syslog"
+
+DEPEND=">=dev-libs/openssl-0.9.7c
+ lzo? ( dev-libs/lzo:2 )
+ zlib? ( >=sys-libs/zlib-1.1.4-r2 )
+ syslog? ( app-admin/syslog-ng )"
+
+src_configure() {
+ econf --enable-jumbograms $(use_enable lzo) $(use_enable zlib) || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodir /etc/tinc
+ dodoc AUTHORS NEWS README THANKS
+ doinitd "${FILESDIR}"/tincd{,.lo}
+ if use syslog; then
+ newinitd "${FILESDIR}"/tincdsyslog tincd || die "newinitd failed!"
+ else
+ newinitd "${FILESDIR}"/tincdnosyslog tincd || die "newinitd failed!"
+ fi
+ doconfd "${FILESDIR}"/tinc.networks
+ newconfd "${FILESDIR}"/tincd.conf tincd
+}
+
+pkg_postinst() {
+ elog "This package requires the tun/tap kernel device."
+ elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-26 3:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-26 2:27 [gentoo-commits] dev/blueness:master commit in: net-misc/tinc/, net-misc/tinc/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2011-09-26 3:29 Anthony G. Basile
2011-09-26 2:44 Anthony G. Basile
2011-09-26 2:37 Anthony G. Basile
2011-09-26 1:29 Anthony G. Basile
2011-09-26 0:11 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox