Fixed init script and added ~sparc keyword.

4 files changed, 62 insertions, 6 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 1973042a4a2e..07f5b8a2e3ca 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tinc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.1 2003/12/24 13:21:04 warpzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.2 2003/12/24 14:23:51 bazik Exp $
+
+  24 Dec 2003; Sven Blumenstein <bazik@gentoo.org> tinc-1.0.2.ebuild,
+  files/tincd:
+  Fixed init script and added ~sparc keyword.
 
 *tinc-1.0.2 (03 Aug 2003)
 
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index bd843f7a2727..1ce9c622cb28 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,4 +1,5 @@
-MD5 47ca317a44761afd3eb6387b941c8368 tinc-1.0.2.ebuild 937
-MD5 0f663c4ad685e690e9c8e7bc990540f5 ChangeLog 692
+MD5 1068bc74eb403a2bc76cce2707df5dbc tinc-1.0.2.ebuild 943
+MD5 5d021a145b4226c9d879d7efb2ca9413 ChangeLog 821
 MD5 5cd11fe8144c34041e8ab9baf4a5090d metadata.xml 427
+MD5 1b2cd98bbf9423155e40b26896cea70f files/tincd 1358
 MD5 8f70364e159d1ba3c7ed7bd5e517b5fc files/digest-tinc-1.0.2 62
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
new file mode 100644
index 000000000000..225a7caa83e7
--- /dev/null
+++ b/net-misc/tinc/files/tincd
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.1 2003/12/24 14:23:51 bazik Exp $
+
+
+depend() {
+	use logger dns
+	need net
+}
+
+checkconfig() {
+	if [ ! `grep -c '^ *NETWORK:' /etc/conf.d/tinc.networks` > 0 ]
+	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
+	cat /etc/conf.d/tinc.networks | grep '^ *NETWORK:' | awk '{ print $2 }' | 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
+	cat /etc/conf.d/tinc.networks | grep '^ *NETWORK:' | awk '{ print $2 }' | while read TINCNET
+	do
+		if [ -f /var/run/tinc.$TINCNET.pid ]
+		then
+			ebegin "Stopping tinc network $TINCNET"
+			/usr/sbin/tincd --kill=9 `cat /var/run/tinc.$TINCNET.pid` --pidfile=/var/run/tinc.$TINCNET.pid
+			eend $?
+			#rm -f /var/run/tinc.$TINCNET.pid
+		fi
+	done
+}
+
diff --git a/net-misc/tinc/tinc-1.0.2.ebuild b/net-misc/tinc/tinc-1.0.2.ebuild
index 62cfaeaf712b..5f83b2642fc9 100644
--- a/net-misc/tinc/tinc-1.0.2.ebuild
+++ b/net-misc/tinc/tinc-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.2.ebuild,v 1.1 2003/12/24 13:21:04 warpzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.2.ebuild,v 1.2 2003/12/24 14:23:51 bazik Exp $
 
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
@@ -8,7 +8,7 @@ HOMEPAGE="http://tinc.nl.linux.org/"
 SRC_URI="http://tinc.nl.linux.org/packages/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc"
 IUSE=""
 DEPEND=">=dev-libs/openssl-0.9.7c
 		virtual/linux-sources
@@ -23,7 +23,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc ABOUT-NLS AUTHORS COPYING COPYING.README INSTALL NEWS README THANKS TODO
-	exeinto /etc/init.d ; newexe ${FILESDIR}/tinc tinc
+	exeinto /etc/init.d ; newexe ${FILESDIR}/tincd tincd
 }
 
 pkg_postinst() {