version bump thanks to Jan in bugs #314739 and #307477

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 96 insertions, 12 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index aca365a860ed..a1f66269cf73 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tinc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.19 2010/01/16 05:59:07 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.20 2010/07/18 10:04:56 dragonheart Exp $
+
+*tinc-1.0.13 (18 Jul 2010)
+
+  18 Jul 2010; Daniel Black <dragonheart@gentoo.org> +tinc-1.0.13.ebuild,
+  +files/tincd.conf, +files/tincd.lo:
+  version bump thanks to Jan in bugs #314739 and #307477
 
   16 Jan 2010; Jonathan Callen <abcd@gentoo.org> tinc-1.0.11.ebuild:
   Add prefix keywords, only depend on linux-sources on linux
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index 875b6e126b89..43213a0a9657 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
 AUX tincd 1606 RMD160 21ee723a9e5555e5354dc95cd5105fa9f5b7032a SHA1 3b72687d20f602fdc75fd2af1a291eca42a8e3a6 SHA256 bc3262370f67bf056f076bb6410394087984b00c45a28ba58738e03bfdfe3801
+AUX tincd.conf 19 RMD160 907e8fbeeeeda7fd5c0916ebea6bf90d14539723 SHA1 e41eb0392c8265a9f55bf8c4069f7b25085ced14 SHA256 cdbdbf4c8ca3dc805c645a404df7cc7d10908ef4e5b59f1c1d056ca6301f34cb
+AUX tincd.lo 1174 RMD160 35c99f726d4ca8252a03c96fda5d5c4862400a50 SHA1 d92a40511b1389b455489f9c59155da7d1605c2b SHA256 c51d94776ec6a1dc2013cfaf40a9a8e1ce92bfa6b3229fbf342d3d1dd88a1c69
 DIST tinc-1.0.11.tar.gz 499963 RMD160 80c543dd4faad2355e33c7daa86c0f639447f044 SHA1 d67578e96cf6b734a3c5bd4b32cf3e628603328a SHA256 add18b68710a08dd1d209f177154f9d8c7614031050abf16139dd9c3fc56be84
+DIST tinc-1.0.13.tar.gz 508903 RMD160 72e3063887546fb82e5c740a71b52840bd04237d SHA1 d84070502d693cf46c93d324cdf1686d67617db4 SHA256 6d86518161e91d0d4f8f2697ea959c90e92a409e833cdce5c92d6f0c0cb01091
 DIST tinc-1.0.8.tar.gz 500158 RMD160 8eb0a5c7da85d9ba09802c1077cec0f4de706cd4 SHA1 aed86961fdc35505a636e987559db26369437978 SHA256 454818555920cfc15815b9bfb4cb6432d315da73b692aaad39e9575eeedbfcbd
 DIST tinc-1.0.9.tar.gz 519048 RMD160 43ad67040ed7aaad710c5137659f8f0f1d908101 SHA1 55de1bc3b47a48fb162b00ffbb3bac1e2058a7ed SHA256 3159fb656b902e3320123f02f7c8c7e82a0503f7e490424bb94f86d328844593
 EBUILD tinc-1.0.11.ebuild 967 RMD160 25c0701b6c3e59c178ad32ba0eacbcd654e57415 SHA1 1644a9be1e048c558d473069ba46524acb7096f3 SHA256 bcb8254bf393b9f7b4c4be2bd3305de65f16d3a562bfc7c61902eb5d71872bd9
+EBUILD tinc-1.0.13.ebuild 1094 RMD160 66440c8118aaf18e1eac9365b8e9124996496f0d SHA1 011375bbd62e4ff6736ef52ba86d0714a589a94f SHA256 dead77a3671738c4a335ef7091fcd2f98e2ec4191e0b768c88bba76e516fb7d7
 EBUILD tinc-1.0.8.ebuild 982 RMD160 a72e2b15a3ee4011bc2a62972b271f5b1f0e79af SHA1 14b62c75b9b5617182f706efdfacce165f44e025 SHA256 7988fb7bcd1a92e8fe282d09f7eaf862ca95481bf7da69402ea5ef137706a9a2
 EBUILD tinc-1.0.9.ebuild 975 RMD160 edf88b1703acc9741c750ab0ea85a1240b64726e SHA1 b4216b52fff3c4dddd7c5ed86ca797a7d196da8c SHA256 0fee6c203712ebb7be08ef0896f035ad3981a7d83abcc729d9e9f8b298cb3b8b
-MISC ChangeLog 3149 RMD160 96fe01df0f1789bd8d32712a8b8e7d77b8822d28 SHA1 614929ecbd1693f7b74075ffde764312602bdee7 SHA256 0ae89df4dd67ee047b0ac73d8ca639bdad244c7bb97c42bda63f755f86cb6caf
+MISC ChangeLog 3354 RMD160 d6dc964f96066e68cbefb988c0bd6c5bd58fd186 SHA1 55defde54aac88a5fd80a2b4f38a10134387b7bf SHA256 bceef96da27c6c56e309a97847a8ab27c8914a913ed20c137b0927fbe070dacc
 MISC metadata.xml 339 RMD160 023ef770ba450e87c2bf9c25e91a5546493ca714 SHA1 af8ed5186a6b68ca0a4e62238ca0f426b1ba5da4 SHA256 b94531e014430d955212e32c22fbe650842a350fef9a29eca703a5889bea5d55
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktRVbEACgkQOypDUo0oQOoOugCeLD4Owb0xG1IqAr3ScvUz/syh
-abAAnjD1A0ma6QNjVkGVksNCH5iSP/3r
-=xHm5
------END PGP SIGNATURE-----
diff --git a/net-misc/tinc/files/tincd.conf b/net-misc/tinc/files/tincd.conf
new file mode 100644
index 000000000000..c19b8365b6d3
--- /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 000000000000..79c185b3810f
--- /dev/null
+++ b/net-misc/tinc/files/tincd.lo
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2010 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/tinc-1.0.13.ebuild b/net-misc/tinc/tinc-1.0.13.ebuild
new file mode 100644
index 000000000000..5d5b652a5c72
--- /dev/null
+++ b/net-misc/tinc/tinc-1.0.13.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.13.ebuild,v 1.1 2010/07/18 10:04:56 dragonheart Exp $
+
+EAPI=2
+
+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 )
+	kernel_linux? ( virtual/linux-sources )"
+
+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}
+	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"
+}