Rewrite of initd system, added syslog/logfile support, bug #371357

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

7 files changed, 190 insertions, 10 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 722b10e13860..5f046092abad 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tinc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.24 2011/09/23 18:51:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.25 2011/09/26 03:23:06 blueness Exp $
+
+*tinc-1.0.16-r1 (26 Sep 2011)
+
+  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:
+  Rewrite of initd system, added syslog/logfile support, bug #371357
 
 *tinc-1.0.16 (23 Sep 2011)
 
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index 19b3a4d93653..69dd9d5d5ed3 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -3,20 +3,22 @@ Hash: SHA256
 
 AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
 AUX tincd 1606 RMD160 21ee723a9e5555e5354dc95cd5105fa9f5b7032a SHA1 3b72687d20f602fdc75fd2af1a291eca42a8e3a6 SHA256 bc3262370f67bf056f076bb6410394087984b00c45a28ba58738e03bfdfe3801
+AUX tincd.1 1752 RMD160 dda6da5d2ef419e691e3b2077296de2bc555a119 SHA1 eb6299dd4e784fa937d57a805c568ed6374ef8c5 SHA256 b6a613f1971bc11832a59abb4f14f1ea23fd93901cf431555daae6999f62ead9
 AUX tincd.conf 19 RMD160 907e8fbeeeeda7fd5c0916ebea6bf90d14539723 SHA1 e41eb0392c8265a9f55bf8c4069f7b25085ced14 SHA256 cdbdbf4c8ca3dc805c645a404df7cc7d10908ef4e5b59f1c1d056ca6301f34cb
+AUX tincd.conf.1 157 RMD160 72e67087f4f88a4958a54eb8cf8270cdfebe4339 SHA1 82dda948f1982c9289d6732f20b7e0da33ca2f6a SHA256 eef883d3cf4ba8376f6b37518f39df103b0d999c5faa2a82653926ce50255060
 AUX tincd.lo 1174 RMD160 35c99f726d4ca8252a03c96fda5d5c4862400a50 SHA1 d92a40511b1389b455489f9c59155da7d1605c2b SHA256 c51d94776ec6a1dc2013cfaf40a9a8e1ce92bfa6b3229fbf342d3d1dd88a1c69
+AUX tincd.lo.1 1356 RMD160 495d0d84046671cbe69063fa4c9c37a81900f804 SHA1 54fff03fb66679e7f9ede42906965d01b5b34474 SHA256 c627d761139da5af3bfed315ec9f8856c40006d70f9bbef2a96103a7923556e2
 DIST tinc-1.0.13.tar.gz 508903 RMD160 72e3063887546fb82e5c740a71b52840bd04237d SHA1 d84070502d693cf46c93d324cdf1686d67617db4 SHA256 6d86518161e91d0d4f8f2697ea959c90e92a409e833cdce5c92d6f0c0cb01091
 DIST tinc-1.0.16.tar.gz 519460 RMD160 a4d44bd90d4c19f4cc8bc27c1f92a8fb437698d3 SHA1 6700e63c548228b1675f243f0075f98511f1e3a8 SHA256 f20863cb1155ba4e4dd4cf16c35a5d706cd326eb8fe62b8b0a31fd57241a5400
 EBUILD tinc-1.0.13.ebuild 1049 RMD160 5d7498f943b260e89662ef2aca40d93d9dc5b4cb SHA1 99586c0c96f382a8d7e3b488136ee1ed6f18a216 SHA256 f78730591f2e34e7b82ad476fe09df387881f72e0a32193d40a562c138cdbdb6
-EBUILD tinc-1.0.16.ebuild 1050 RMD160 32fd463f1725169a972319a6c8ac49bcf63cdcff SHA1 b21fa27c713870bc748e8133574c7d84a31a71ef SHA256 d94757cb9f6015ae1b1495ade816504d9566875052ebd4272339e6b42d4724dd
-MISC ChangeLog 3954 RMD160 4e4b6af6250091c5d0f1c7b235d4fac878e14261 SHA1 24848c16a224d8b4e5d3e94f7da6e953ba1dfc1d SHA256 7a85f81c555bb05c476a447f9632b3c43ba486e5b4b001c0465ad02c70c142f9
+EBUILD tinc-1.0.16-r1.ebuild 1069 RMD160 b57c3cec174383acab9a3bd4daa2ab06c39d12c2 SHA1 978fdb13534a38e3bb9ae096320f5e8449de828e SHA256 f88eaad106dc7be5ec36fb3ad4175b6a3ca4145ca0e681e1f4a87c8a9872a0fd
+EBUILD tinc-1.0.16.ebuild 1070 RMD160 c62b38596f6ad8fc0affb80fa7f0bdfe09775d6b SHA1 09a6d6b8af92be06eeb8e9a361022509f4495256 SHA256 6934f068171dcc6ca6105168e5dbfc9d6e1a9f9515c744a52d3ca80c58ce96d9
+MISC ChangeLog 4192 RMD160 0375906fc76e945fdf716189f12bc3f3f939463a SHA1 8bfefe9d5a3bd6db445cbb73528abbf1c2b3514d SHA256 e0ab0f07164230d783002caa9fb796d5ac697beb462459febe145e3336af66cc
 MISC metadata.xml 323 RMD160 4afa38944097d8968b63842a67ed19531f0d9ec4 SHA1 40e3e0444e37634e1c939a5dd5677cef74827778 SHA256 8a800ba6f409642a7327882575dab780d140d7692155b5644850421abb7bb4d5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rRYACgkQfXuS5UK5QB2ZywP/f+5aM3wX9/DQMkjDGIZDRNIX
-bl2631zrDfZYtedpSvDbgg5ErPBh/nmYIiJnKsEPKwO4ZfIpmgfPpOAU+T+fXKEd
-Ai5+vMlwpqWklACyhB8KKGQCWHZe+HQUcpPueWyYQrlK6E/LjN38JIwZkvAQ2yGl
-kzV7O/lZhSAEtsMPOP4=
-=+hnj
+iEYEAREIAAYFAk5/8CUACgkQl5yvQNBFVTXx/gCeNK6qZHI1AEOITfeow/sGQLAI
+xVsAniogF8OvgSK8i4j7/fUk6VTg8c3E
+=NpAD
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tinc/files/tincd.1 b/net-misc/tinc/files/tincd.1
new file mode 100644
index 000000000000..3dc1d61c63f7
--- /dev/null
+++ b/net-misc/tinc/files/tincd.1
@@ -0,0 +1,70 @@
+#!/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.1,v 1.1 2011/09/26 03:23:06 blueness 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
new file mode 100644
index 000000000000..0394702a2af5
--- /dev/null
+++ b/net-misc/tinc/files/tincd.conf.1
@@ -0,0 +1,5 @@
+#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
new file mode 100644
index 000000000000..41a2c517ad47
--- /dev/null
+++ b/net-misc/tinc/files/tincd.lo.1
@@ -0,0 +1,58 @@
+#!/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.1,v 1.1 2011/09/26 03:23:06 blueness 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/tinc-1.0.16-r1.ebuild b/net-misc/tinc/tinc-1.0.16-r1.ebuild
new file mode 100644
index 000000000000..973d5a4a1fa1
--- /dev/null
+++ b/net-misc/tinc/tinc-1.0.16-r1.ebuild
@@ -0,0 +1,38 @@
+# 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 )"
+RDEPEND="${DEPEND}"
+
+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"
+}
diff --git a/net-misc/tinc/tinc-1.0.16.ebuild b/net-misc/tinc/tinc-1.0.16.ebuild
index 9a6b4824610e..8009fd0da3c6 100644
--- a/net-misc/tinc/tinc-1.0.16.ebuild
+++ b/net-misc/tinc/tinc-1.0.16.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2011/09/23 18:51:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.16.ebuild,v 1.2 2011/09/26 03:23:06 blueness Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ IUSE="+lzo +zlib"
 DEPEND=">=dev-libs/openssl-0.9.7c
 	lzo? ( dev-libs/lzo:2 )
 	zlib? ( >=sys-libs/zlib-1.1.4-r2 )"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf  --enable-jumbograms $(use_enable lzo) $(use_enable zlib)  || die