From 44d18f59a3011ce757353c1080cd0fa92b894d79 Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Wed, 24 Apr 2013 11:19:53 +0000
Subject: Remove older exploitables and name cleanup, bug #466904

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
---
 net-misc/tinc/ChangeLog          |  8 ++++-
 net-misc/tinc/files/tincd        | 70 ++++++++++++++++++++++++++++++++++++++++
 net-misc/tinc/files/tincd.1      | 70 ----------------------------------------
 net-misc/tinc/files/tincd.conf   |  5 +++
 net-misc/tinc/files/tincd.conf.1 |  5 ---
 net-misc/tinc/files/tincd.lo     | 54 +++++++++++++++++++++++++++++++
 net-misc/tinc/files/tincd.lo.1   | 54 -------------------------------
 net-misc/tinc/tinc-1.0.19.ebuild | 45 --------------------------
 net-misc/tinc/tinc-1.0.20.ebuild | 45 --------------------------
 net-misc/tinc/tinc-1.0.21.ebuild |  8 ++---
 10 files changed, 140 insertions(+), 224 deletions(-)
 create mode 100644 net-misc/tinc/files/tincd
 delete mode 100644 net-misc/tinc/files/tincd.1
 create mode 100644 net-misc/tinc/files/tincd.conf
 delete mode 100644 net-misc/tinc/files/tincd.conf.1
 create mode 100644 net-misc/tinc/files/tincd.lo
 delete mode 100644 net-misc/tinc/files/tincd.lo.1
 delete mode 100644 net-misc/tinc/tinc-1.0.19.ebuild
 delete mode 100644 net-misc/tinc/tinc-1.0.20.ebuild

(limited to 'net-misc/tinc')

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 34278ea39081..f5aad9618ed9 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tinc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.40 2013/04/23 02:40:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.41 2013/04/24 11:19:53 blueness Exp $
+
+  24 Apr 2013; Anthony G. Basile <blueness@gentoo.org> +files/tincd,
+  +files/tincd.conf, +files/tincd.lo, -files/tincd.1, -files/tincd.conf.1,
+  -files/tincd.lo.1, -tinc-1.0.19.ebuild, -tinc-1.0.20.ebuild,
+  tinc-1.0.21.ebuild:
+  Remove older exploitables and name cleanup, bug #466904
 
 *tinc-1.0.21 (23 Apr 2013)
 
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
new file mode 100644
index 000000000000..208f4526de88
--- /dev/null
+++ b/net-misc/tinc/files/tincd
@@ -0,0 +1,70 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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.8 2013/04/24 11:19:53 blueness Exp $
+
+extra_started_commands="reload"
+
+NETS="/etc/conf.d/tinc.networks"
+DAEMON="/usr/sbin/tincd"
+
+depend() {
+	use logger dns
+	need net
+}
+
+checkconfig() {
+	if ! grep -q '^ *NETWORK:' "${NETS}" ; then
+		eerror "No VPN networks configured in ${NETS}"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting tinc VPN networks"
+	awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
+	do
+		CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
+		PIDFILE="/var/run/tinc.${NETNAME}.pid"
+		if [ ! -f "${CONFIG}" ]; then
+			eerror "Cannot start network ${NETNAME}."
+			eerror "Please set up ${CONFIG} !"
+		else
+			ebegin "Starting tinc network ${NETNAME}"
+			if [ "${SYSLOG}" == "yes" ]; then
+				LOG=""
+			else
+				LOG="--logfile=/var/log/tinc.${NETNAME}.log"
+			fi
+			start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
+			eend $?
+		fi
+	done
+}
+
+stop() {
+	ebegin "Stopping tinc VPN networks"
+	awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
+	do
+		PIDFILE="/var/run/tinc.${NETNAME}.pid"
+		if [ -f "${PIDFILE}" ]; then
+			ebegin "Stopping tinc network ${NETNAME}"
+			start-stop-daemon --stop --pidfile "${PIDFILE}"
+			eend $?
+		fi
+	done
+}
+
+reload() {
+	ebegin "Reloading configuration for tinc VPN networks"
+	awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
+	do
+		PIDFILE="/var/run/tinc.${NETNAME}.pid"
+		if [ -f "${PIDFILE}" ]; then
+			ebegin "Reloading tinc network ${NETNAME}"
+			start-stop-daemon --signal HUP --pidfile ${PIDFILE}
+			eend $?
+		fi
+	done
+}
diff --git a/net-misc/tinc/files/tincd.1 b/net-misc/tinc/files/tincd.1
deleted file mode 100644
index 0e2db59737ef..000000000000
--- a/net-misc/tinc/files/tincd.1
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.1,v 1.4 2012/02/02 20:29:33 blueness Exp $
-
-extra_started_commands="reload"
-
-NETS="/etc/conf.d/tinc.networks"
-DAEMON="/usr/sbin/tincd"
-
-depend() {
-	use logger dns
-	need net
-}
-
-checkconfig() {
-	if ! grep -q '^ *NETWORK:' "${NETS}" ; then
-		eerror "No VPN networks configured in ${NETS}"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting tinc VPN networks"
-	awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
-	do
-		CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
-		PIDFILE="/var/run/tinc.${NETNAME}.pid"
-		if [ ! -f "${CONFIG}" ]; then
-			eerror "Cannot start network ${NETNAME}."
-			eerror "Please set up ${CONFIG} !"
-		else
-			ebegin "Starting tinc network ${NETNAME}"
-			if [ "${SYSLOG}" == "yes" ]; then
-				LOG=""
-			else
-				LOG="--logfile=/var/log/tinc.${NETNAME}.log"
-			fi
-			start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
-			eend $?
-		fi
-	done
-}
-
-stop() {
-	ebegin "Stopping tinc VPN networks"
-	awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
-	do
-		PIDFILE="/var/run/tinc.${NETNAME}.pid"
-		if [ -f "${PIDFILE}" ]; then
-			ebegin "Stopping tinc network ${NETNAME}"
-			start-stop-daemon --stop --pidfile "${PIDFILE}"
-			eend $?
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading configuration for tinc VPN networks"
-	awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
-	do
-		PIDFILE="/var/run/tinc.${NETNAME}.pid"
-		if [ -f "${PIDFILE}" ]; then
-			ebegin "Reloading tinc network ${NETNAME}"
-			start-stop-daemon --signal HUP --pidfile ${PIDFILE}
-			eend $?
-		fi
-	done
-}
diff --git a/net-misc/tinc/files/tincd.conf b/net-misc/tinc/files/tincd.conf
new file mode 100644
index 000000000000..0394702a2af5
--- /dev/null
+++ b/net-misc/tinc/files/tincd.conf
@@ -0,0 +1,5 @@
+#rc_need="net.net"
+
+#If you want tincd to log to syslog, then set this to "yes"
+#Anything else and tincd will log to /var/log/tinc.NETNAME.log.
+SYSLOG="yes"
diff --git a/net-misc/tinc/files/tincd.conf.1 b/net-misc/tinc/files/tincd.conf.1
deleted file mode 100644
index 0394702a2af5..000000000000
--- a/net-misc/tinc/files/tincd.conf.1
+++ /dev/null
@@ -1,5 +0,0 @@
-#rc_need="net.net"
-
-#If you want tincd to log to syslog, then set this to "yes"
-#Anything else and tincd will log to /var/log/tinc.NETNAME.log.
-SYSLOG="yes"
diff --git a/net-misc/tinc/files/tincd.lo b/net-misc/tinc/files/tincd.lo
new file mode 100644
index 000000000000..8f41d98887a7
--- /dev/null
+++ b/net-misc/tinc/files/tincd.lo
@@ -0,0 +1,54 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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.4 2013/04/24 11:19:53 blueness Exp $
+
+extra_started_commands="reload"
+
+DAEMON="/usr/sbin/tincd"
+
+depend() {
+	use logger dns
+	need net
+}
+
+start() {
+	NETNAME="${RC_SVCNAME#*.}"
+	CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
+	PIDFILE="/var/run/tinc.${NETNAME}.pid"
+	if [ ! -f "${CONFIG}" ]; then
+		eerror "Cannot start network ${NETNAME}."
+		eerror "Please set up ${CONFIG} !"
+	else
+		ebegin "Starting tinc network $NETNAME"
+		if [ "${SYSLOG}" == "yes" ]; then
+			LOG=""
+		else
+			LOG="--logfile=/var/log/tinc.${NETNAME}.log"
+		fi
+		start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
+		eend $?
+	fi
+}
+
+stop() {
+	NETNAME="${RC_SVCNAME#*.}"
+	CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
+	PIDFILE="/var/run/tinc.${NETNAME}.pid"
+	if [ -f "${PIDFILE}" ] ; then
+		ebegin "Stopping tinc network ${NETNAME}"
+		start-stop-daemon --stop --pidfile "${PIDFILE}"
+		eend $?
+	fi
+}
+
+reload() {
+	NETNAME=${RC_SVCNAME#*.}
+	CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
+	PIDFILE="/var/run/tinc.${NETNAME}.pid"
+	if [ -f "${PIDFILE}" ] ; then
+			ebegin "Reloading tinc network ${NETNAME}"
+			start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
+			eend $?
+	fi
+}
diff --git a/net-misc/tinc/files/tincd.lo.1 b/net-misc/tinc/files/tincd.lo.1
deleted file mode 100644
index dda464fc6808..000000000000
--- a/net-misc/tinc/files/tincd.lo.1
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo.1,v 1.5 2012/03/11 14:08:26 blueness Exp $
-
-extra_started_commands="reload"
-
-DAEMON="/usr/sbin/tincd"
-
-depend() {
-	use logger dns
-	need net
-}
-
-start() {
-	NETNAME="${RC_SVCNAME#*.}"
-	CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
-	PIDFILE="/var/run/tinc.${NETNAME}.pid"
-	if [ ! -f "${CONFIG}" ]; then
-		eerror "Cannot start network ${NETNAME}."
-		eerror "Please set up ${CONFIG} !"
-	else
-		ebegin "Starting tinc network $NETNAME"
-		if [ "${SYSLOG}" == "yes" ]; then
-			LOG=""
-		else
-			LOG="--logfile=/var/log/tinc.${NETNAME}.log"
-		fi
-		start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
-		eend $?
-	fi
-}
-
-stop() {
-	NETNAME="${RC_SVCNAME#*.}"
-	CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
-	PIDFILE="/var/run/tinc.${NETNAME}.pid"
-	if [ -f "${PIDFILE}" ] ; then
-		ebegin "Stopping tinc network ${NETNAME}"
-		start-stop-daemon --stop --pidfile "${PIDFILE}"
-		eend $?
-	fi
-}
-
-reload() {
-	NETNAME=${RC_SVCNAME#*.}
-	CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
-	PIDFILE="/var/run/tinc.${NETNAME}.pid"
-	if [ -f "${PIDFILE}" ] ; then
-			ebegin "Reloading tinc network ${NETNAME}"
-			start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
-			eend $?
-	fi
-}
diff --git a/net-misc/tinc/tinc-1.0.19.ebuild b/net-misc/tinc/tinc-1.0.19.ebuild
deleted file mode 100644
index f1b3507d530b..000000000000
--- a/net-misc/tinc/tinc-1.0.19.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.19.ebuild,v 1.1 2012/06/26 13:52:39 blueness Exp $
-
-EAPI="4"
-
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo uml vde +zlib"
-
-DEPEND=">=dev-libs/openssl-0.9.7
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-
-src_configure() {
-	econf \
-		--enable-jumbograms \
-		--disable-tunemu  \
-		$(use_enable lzo) \
-		$(use_enable uml) \
-		$(use_enable vde) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	newinitd "${FILESDIR}"/tincd.1 tincd
-	newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf.1 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"
-}
diff --git a/net-misc/tinc/tinc-1.0.20.ebuild b/net-misc/tinc/tinc-1.0.20.ebuild
deleted file mode 100644
index 786bac18876b..000000000000
--- a/net-misc/tinc/tinc-1.0.20.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.20.ebuild,v 1.1 2013/03/05 02:34:20 blueness Exp $
-
-EAPI="5"
-
-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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo uml vde +zlib"
-
-DEPEND=">=dev-libs/openssl-0.9.7
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-
-src_configure() {
-	econf \
-		--enable-jumbograms \
-		--disable-tunemu  \
-		$(use_enable lzo) \
-		$(use_enable uml) \
-		$(use_enable vde) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	newinitd "${FILESDIR}"/tincd.1 tincd
-	newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf.1 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"
-}
diff --git a/net-misc/tinc/tinc-1.0.21.ebuild b/net-misc/tinc/tinc-1.0.21.ebuild
index 058f79923353..3bfd0e8328a2 100644
--- a/net-misc/tinc/tinc-1.0.21.ebuild
+++ b/net-misc/tinc/tinc-1.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.21.ebuild,v 1.1 2013/04/23 02:40:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.21.ebuild,v 1.2 2013/04/24 11:19:53 blueness Exp $
 
 EAPI="5"
 
@@ -33,10 +33,10 @@ src_install() {
 	emake DESTDIR="${D}" install
 	dodir /etc/tinc
 	dodoc AUTHORS NEWS README THANKS
-	newinitd "${FILESDIR}"/tincd.1 tincd
-	newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
+	doinitd "${FILESDIR}"/tincd
+	doinitd "${FILESDIR}"/tincd.lo
 	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf.1 tincd
+	newconfd "${FILESDIR}"/tincd.conf tincd
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3-65-gdbad