version bump. Improved initscript thanks to inspiration by Natanael Copa in bug #175024

(Portage version: 2.1.2.2)

10 files changed, 76 insertions, 169 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index b4083727ed14..cd9cb8015730 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,11 +1,19 @@
 # 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.12 2007/04/07 13:38:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.13 2007/04/19 08:45:08 dragonheart Exp $
+
+*tinc-1.0.7 (19 Apr 2007)
+
+  19 Apr 2007; Daniel Black <dragonheart@gentoo.org> files/tincd,
+  -tinc-1.0.3.ebuild, -tinc-1.0.4.ebuild, -files/tinc-1.0.4-lzo2.patch,
+  tinc-1.0.5.ebuild, +tinc-1.0.7.ebuild:
+  version bump. Improved initscript thanks to inspiration by Natanael Copa in
+  bug #175024
 
   07 Apr 2007; Christian Faulhammer <opfer@gentoo.org> tinc-1.0.5.ebuild:
   keyworded ~amd64, bug 171550
 
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
 
 *tinc-1.0.5 (16 Dec 2006)
@@ -13,7 +21,7 @@
   16 Dec 2006; Daniel Black <dragonheart@gentoo.org> +tinc-1.0.5.ebuild:
   version bump.
 
-  24 May 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  24 May 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove warpzero from metadata.xml, bug 133117.
 
 *tinc-1.0.4 (25 Apr 2006)
diff --git a/net-misc/tinc/files/digest-tinc-1.0.3 b/net-misc/tinc/files/digest-tinc-1.0.3
deleted file mode 100644
index c12347f68df8..000000000000
--- a/net-misc/tinc/files/digest-tinc-1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5dd1acf7d784e29aae78c31a2630fccd tinc-1.0.3.tar.gz 476701
-RMD160 82168516eb1db8b42f54980c3cae79ed53f037b0 tinc-1.0.3.tar.gz 476701
-SHA256 f3c9e51dfd9a57f5923eb9ab24fbe7dd7c97a5c9c23028a3985383a84942d15d tinc-1.0.3.tar.gz 476701
diff --git a/net-misc/tinc/files/digest-tinc-1.0.4 b/net-misc/tinc/files/digest-tinc-1.0.4
deleted file mode 100644
index e57405c59373..000000000000
--- a/net-misc/tinc/files/digest-tinc-1.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63887373dd763f8d90cecc5a3616c363 tinc-1.0.4.tar.gz 480305
-RMD160 f4ec33a10f5039c625ec124376216cc03aa5f318 tinc-1.0.4.tar.gz 480305
-SHA256 74373997b37a9e189e557ecf0d4e8b5aaa57f39be04ba5361448e31b73574b33 tinc-1.0.4.tar.gz 480305
diff --git a/net-misc/tinc/files/digest-tinc-1.0.7 b/net-misc/tinc/files/digest-tinc-1.0.7
new file mode 100644
index 000000000000..07a647a56335
--- /dev/null
+++ b/net-misc/tinc/files/digest-tinc-1.0.7
@@ -0,0 +1,3 @@
+MD5 572255e6cbb9efffd9e40adb73ab7861 tinc-1.0.7.tar.gz 499135
+RMD160 74ce43f65700b182dff879ac08c41859faee27c2 tinc-1.0.7.tar.gz 499135
+SHA256 5993b9d2c8a2836bb2527a3c07ceb0d933e55964a4790b08743f5f7aaec25952 tinc-1.0.7.tar.gz 499135
diff --git a/net-misc/tinc/files/tinc-1.0.4-lzo2.patch b/net-misc/tinc/files/tinc-1.0.4-lzo2.patch
deleted file mode 100644
index a08374aa1808..000000000000
--- a/net-misc/tinc/files/tinc-1.0.4-lzo2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ru tinc-1.0.4.orig/configure tinc-1.0.4/configure
---- tinc-1.0.4.orig/configure	2005-05-05 04:24:06.000000000 +1000
-+++ tinc-1.0.4/configure	2005-11-13 18:34:21.000000000 +1100
-@@ -11074,13 +11144,13 @@
- done
- 
- 
--  echo "$as_me:$LINENO: checking for lzo1x_1_compress in -llzo" >&5
--echo $ECHO_N "checking for lzo1x_1_compress in -llzo... $ECHO_C" >&6
--if test "${ac_cv_lib_lzo_lzo1x_1_compress+set}" = set; then
-+  echo "$as_me:$LINENO: checking for lzo1x_1_compress in -llzo2" >&5
-+echo $ECHO_N "checking for lzo1x_1_compress in -llzo2... $ECHO_C" >&6
-+if test "${ac_cv_lib_lzo2_lzo1x_1_compress+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-llzo  $LIBS"
-+LIBS="-llzo2  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11112,7 +11182,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -11124,21 +11195,21 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_lzo_lzo1x_1_compress=yes
-+  ac_cv_lib_lzo2_lzo1x_1_compress=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_lzo_lzo1x_1_compress=no
-+ac_cv_lib_lzo2_lzo1x_1_compress=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_lzo_lzo1x_1_compress" >&5
--echo "${ECHO_T}$ac_cv_lib_lzo_lzo1x_1_compress" >&6
--if test $ac_cv_lib_lzo_lzo1x_1_compress = yes; then
--  LIBS="$LIBS -llzo"
-+echo "$as_me:$LINENO: result: $ac_cv_lib_lzo2_lzo1x_1_compress" >&5
-+echo "${ECHO_T}$ac_cv_lib_lzo2_lzo1x_1_compress" >&6
-+if test $ac_cv_lib_lzo2_lzo1x_1_compress = yes; then
-+  LIBS="$LIBS -llzo2"
- else
-   { { echo "$as_me:$LINENO: error: \"lzo libraries not found.\"" >&5
- echo "$as_me: error: \"lzo libraries not found.\"" >&2;}
-diff -ru tinc-1.0.4.orig/m4/lzo.m4 tinc-1.0.4/m4/lzo.m4
---- tinc-1.0.4.orig/m4/lzo.m4	2004-03-25 08:04:27.000000000 +1100
-+++ tinc-1.0.4/m4/lzo.m4	2005-11-13 18:38:39.000000000 +1100
-@@ -26,8 +26,8 @@
-     [AC_MSG_ERROR("lzo header files not found."); break]
-   )
- 
--  AC_CHECK_LIB(lzo, lzo1x_1_compress,
--    [LIBS="$LIBS -llzo"],
-+  AC_CHECK_LIB(lzo2, lzo1x_1_compress,
-+    [LIBS="$LIBS -llzo2"],
-     [AC_MSG_ERROR("lzo libraries not found.")]
-   )
- ])
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
index e5265632ec66..32c0cff904a2 100644
--- a/net-misc/tinc/files/tincd
+++ b/net-misc/tinc/files/tincd
@@ -1,7 +1,9 @@
 #!/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.3 2004/07/15 00:13:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.4 2007/04/19 08:45:08 dragonheart Exp $
+
+opts="reload"
 
 depend() {
 	use logger dns
@@ -9,7 +11,7 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! `grep -c '^ *NETWORK:' /etc/conf.d/tinc.networks` > 0 ]
+	if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks 
 	then
 		eerror "No VPN networks configured in /etc/conf.d/tinc.networks"
 		return 1
@@ -20,14 +22,14 @@ 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
+	awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
 	do
-		if [ ! -f /etc/tinc/$TINCNET/tinc.conf ] 
+		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
+			/usr/sbin/tincd --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
 			eend $?
 		fi
 	done
@@ -36,14 +38,27 @@ start() {
 stop() {
 	ebegin "Stopping tinc VPN networks"
 	eend 0
-	cat /etc/conf.d/tinc.networks | grep '^ *NETWORK:' | awk '{ print $2 }' | while read TINCNET
+	awk '^ *NETWORK:/{print $2}' /etc/conf.d/tinc.networks | while read TINCNET
 	do
-		if [ -f /var/run/tinc.$TINCNET.pid ]
+		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
+			/usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
+			eend $?
+		fi
+	done
+}
+
+reload() {
+	ebegin "Reloading configuration for tinc VPN networks"
+	eend 0
+	awk '^ *NETWORK:/{print $2}' /etc/conf.d/tinc.networks | while read TINCNET
+	do
+		if [ -f /var/run/tinc."$TINCNET".pid ]
+		then
+			ebegin "Reloading tinc network $TINCNET"
+			/usr/sbin/tincd --kill HUP  --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.3.ebuild b/net-misc/tinc/tinc-1.0.3.ebuild
deleted file mode 100644
index d0e177e0b011..000000000000
--- a/net-misc/tinc/tinc-1.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.3.ebuild,v 1.2 2006/01/03 10:52:00 dragonheart Exp $
-
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://tinc.nl.linux.org/"
-SRC_URI="http://tinc.nl.linux.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~sparc ~x86 ~ppc"
-IUSE=""
-
-DEPEND=">=dev-libs/openssl-0.9.7c
-	virtual/linux-sources
-	=dev-libs/lzo-1*
-	>=sys-libs/zlib-1.1.4-r2"
-
-src_compile() {
-	econf --enable-jumbograms || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS INSTALL NEWS README THANKS TODO
-	exeinto /etc/init.d ; newexe ${FILESDIR}/tincd tincd
-}
-
-pkg_postinst() {
-	einfo "This package requires the tun/tap kernel device."
-	einfo "Look at http://tinc.nl.linux.org/ for how to configure tinc"
-}
diff --git a/net-misc/tinc/tinc-1.0.4.ebuild b/net-misc/tinc/tinc-1.0.4.ebuild
deleted file mode 100644
index b37767650afd..000000000000
--- a/net-misc/tinc/tinc-1.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.4.ebuild,v 1.1 2006/04/25 14:03:29 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://tinc.nl.linux.org/"
-SRC_URI="http://tinc.nl.linux.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~sparc ~x86 ~ppc"
-IUSE=""
-
-DEPEND=">=dev-libs/openssl-0.9.7c
-	virtual/linux-sources
-	>=dev-libs/lzo-2
-	>=sys-libs/zlib-1.1.4-r2"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-lzo2.patch
-}
-
-src_compile() {
-	econf --enable-jumbograms --with-lzo-include=/usr/include/lzo || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS NEWS README THANKS TODO
-	exeinto /etc/init.d ; newexe ${FILESDIR}/tincd tincd
-}
-
-pkg_postinst() {
-	einfo "This package requires the tun/tap kernel device."
-	einfo "Look at http://tinc.nl.linux.org/ for how to configure tinc"
-}
diff --git a/net-misc/tinc/tinc-1.0.5.ebuild b/net-misc/tinc/tinc-1.0.5.ebuild
index d91a8c474fe9..880bd650f8b9 100644
--- a/net-misc/tinc/tinc-1.0.5.ebuild
+++ b/net-misc/tinc/tinc-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.2 2007/04/07 13:38:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.5.ebuild,v 1.3 2007/04/19 08:45:08 dragonheart Exp $
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/"
@@ -25,10 +25,10 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc AUTHORS NEWS README THANKS TODO
-	exeinto /etc/init.d ; newexe ${FILESDIR}/tincd tincd
+	doinitd "${FILESDIR}"/tincd
 }
 
 pkg_postinst() {
-	einfo "This package requires the tun/tap kernel device."
-	einfo "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+	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.7.ebuild b/net-misc/tinc/tinc-1.0.7.ebuild
new file mode 100644
index 000000000000..3cc1f009aa1c
--- /dev/null
+++ b/net-misc/tinc/tinc-1.0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 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 $
+
+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"
+IUSE="nls"
+
+DEPEND=">=dev-libs/openssl-0.9.7c
+	virtual/linux-sources
+	>=dev-libs/lzo-2
+	>=sys-libs/zlib-1.1.4-r2
+	nls? ( sys-devel/gettext )"
+
+src_compile() {
+	econf --enable-jumbograms $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README THANKS
+	doinitd "${FILESDIR}"/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"
+}