fix init script and add an example as per bug #211807 thanks to Sebastian Droppelmann. added /etc/tinc directory as per bug #207113 thanks to Jens. version bump as per bug #204016

Package-Manager: portage-2.1.4.4

6 files changed, 41 insertions, 16 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index ed66b016f951..e791c890e06f 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/tinc
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.14 2007/04/24 17:06:43 tove Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.15 2008/04/01 14:08:44 dragonheart Exp $
+
+*tinc-1.0.8 (01 Apr 2008)
+
+  01 Apr 2008; Daniel Black <dragonheart@gentoo.org> +files/tinc.networks,
+  files/tincd, -tinc-1.0.5.ebuild, tinc-1.0.7.ebuild, +tinc-1.0.8.ebuild:
+  fix init script and add an example as per bug #211807 thanks to Sebastian
+  Droppelmann. added /etc/tinc directory as per bug #207113 thanks to Jens.
+  version bump as per bug #204016
 
 *tinc-1.0.7 (19 Apr 2007)
 
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index c742d9773afd..01f962758ca2 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,7 +1,8 @@
-AUX tincd 1598 RMD160 5ddecbbaccbb28cdb595db5439fb63192ee1b61e SHA1 4fa03b0898736cdadccab946cf329bc422c75e19 SHA256 520acccd0bb7ab37d966d5dc453050829dedd35ff857558814443b22527f0be8
-DIST tinc-1.0.5.tar.gz 490292 RMD160 fd5965153b1a5c9c6d200c257bc885679c36b174 SHA1 32f85bc58ce2c45351d312e7baee40f382e44edd SHA256 6069e560ea114d62b300282a21a515bccc4fb85db6e5694dabb1642067ea051e
+AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
+AUX tincd 1606 RMD160 21ee723a9e5555e5354dc95cd5105fa9f5b7032a SHA1 3b72687d20f602fdc75fd2af1a291eca42a8e3a6 SHA256 bc3262370f67bf056f076bb6410394087984b00c45a28ba58738e03bfdfe3801
 DIST tinc-1.0.7.tar.gz 499135 RMD160 74ce43f65700b182dff879ac08c41859faee27c2 SHA1 79b18aa72d5c694c2a9ee7f59c8cf274407ed908 SHA256 5993b9d2c8a2836bb2527a3c07ceb0d933e55964a4790b08743f5f7aaec25952
-EBUILD tinc-1.0.5.ebuild 932 RMD160 386364538300126a28edde64902851b55fa5f7ac SHA1 8885969faab5888188f0a96ee47a7fdecb504d8e SHA256 12f74d37d2460f87b986859eb2c752ec14b5fb602287bd805b87461bb0c94b46
-EBUILD tinc-1.0.7.ebuild 928 RMD160 cd6e2967e2df08d7fd5583d98a450eb99d34c984 SHA1 6bf91b1c29c4cc1dcfa0577727a4be4d01ebf58e SHA256 74ae2c68a61e8527d210a5a9f566d2b1bd36da7fd908cfb961be2345f37f2d95
-MISC ChangeLog 2213 RMD160 e2441dfc136325d4edeb07a73872eff5b77bbfc3 SHA1 7becbd3f452f78fda862b229cb2aa75622842638 SHA256 4c5876dbf068e856c45bcada29abcadc4837b390e299ddc97ded61188cec3260
+DIST tinc-1.0.8.tar.gz 500158 RMD160 8eb0a5c7da85d9ba09802c1077cec0f4de706cd4 SHA1 aed86961fdc35505a636e987559db26369437978 SHA256 454818555920cfc15815b9bfb4cb6432d315da73b692aaad39e9575eeedbfcbd
+EBUILD tinc-1.0.7.ebuild 945 RMD160 4b777a763969fb1571cc3f07225b175e06c48633 SHA1 ef0f8d4ab933d617114af011728b5ce7a2be4cfe SHA256 8b1c6a55bffb766dd6dbe7a1cbce34270fea1d200acb3e289cbf0a42a032bfe6
+EBUILD tinc-1.0.8.ebuild 982 RMD160 a72e2b15a3ee4011bc2a62972b271f5b1f0e79af SHA1 14b62c75b9b5617182f706efdfacce165f44e025 SHA256 7988fb7bcd1a92e8fe282d09f7eaf862ca95481bf7da69402ea5ef137706a9a2
+MISC ChangeLog 2583 RMD160 f51551a12e05076f22e79b5ab3caae817c0912a6 SHA1 488e972a809c5d87f8cd86760b4ff1c3b91a5653 SHA256 4509e1ccfd8fdca059ddd9c96cb996230b5553b4718ec281bdcfb993a9e170fe
 MISC metadata.xml 348 RMD160 afd2573757a4b008cba32a623a56b57f4b0dd2e1 SHA1 d5be688b2f184743d8e63b551cc1a359ec8355be SHA256 9c51cd497b519a843d983279c7cd59bf739d1c3f4d55ae94600cfecdb2ffbb5a
diff --git a/net-misc/tinc/files/tinc.networks b/net-misc/tinc/files/tinc.networks
new file mode 100644
index 000000000000..e1844ce2ba24
--- /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
index 32c0cff904a2..452687dfb692 100644
--- a/net-misc/tinc/files/tincd
+++ b/net-misc/tinc/files/tincd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 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.4 2007/04/19 08:45:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $
 
 opts="reload"
 
@@ -38,7 +38,7 @@ 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 }' /etc/conf.d/tinc.networks | while read TINCNET
 	do
 		if [ -f /var/run/tinc."$TINCNET".pid ]
 		then
@@ -52,7 +52,7 @@ 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 }' /etc/conf.d/tinc.networks | while read TINCNET
 	do
 		if [ -f /var/run/tinc."$TINCNET".pid ]
 		then
diff --git a/net-misc/tinc/tinc-1.0.7.ebuild b/net-misc/tinc/tinc-1.0.7.ebuild
index 3cc1f009aa1c..68ce519949c0 100644
--- a/net-misc/tinc/tinc-1.0.7.ebuild
+++ b/net-misc/tinc/tinc-1.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.7.ebuild,v 1.1 2007/04/19 08:45:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.7.ebuild,v 1.2 2008/04/01 14:08:44 dragonheart Exp $
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/"
@@ -24,6 +24,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
+	dodir /etc/tinc
 	dodoc AUTHORS NEWS README THANKS
 	doinitd "${FILESDIR}"/tincd
 }
diff --git a/net-misc/tinc/tinc-1.0.5.ebuild b/net-misc/tinc/tinc-1.0.8.ebuild
index 880bd650f8b9..7e50e70ab262 100644
--- a/net-misc/tinc/tinc-1.0.5.ebuild
+++ b/net-misc/tinc/tinc-1.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.5.ebuild,v 1.3 2007/04/19 08:45:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.8.ebuild,v 1.1 2008/04/01 14:08:44 dragonheart Exp $
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/"
@@ -23,9 +23,11 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README THANKS TODO
+	emake DESTDIR="${D}" install || die
+	dodir /etc/tinc
+	dodoc AUTHORS NEWS README THANKS
 	doinitd "${FILESDIR}"/tincd
+	doconfd "${FILESDIR}"/tinc.networks
 }
 
 pkg_postinst() {