diff options
| -rw-r--r-- | net-misc/tinc/ChangeLog | 12 | ||||
| -rw-r--r-- | net-misc/tinc/files/tinc.networks | 13 | ||||
| -rw-r--r-- | net-misc/tinc/files/tincd | 6 | ||||
| -rw-r--r-- | net-misc/tinc/tinc-1.0.7.ebuild | 5 | ||||
| -rw-r--r-- | net-misc/tinc/tinc-1.0.8.ebuild (renamed from net-misc/tinc/tinc-1.0.5.ebuild) | 10 |
5 files changed, 35 insertions, 11 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/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() { |