we license under gpl2, not gpl2 or later

18 files changed, 86 insertions, 104 deletions

diff --git a/net-misc/bopm/files/bopm.init.d b/net-misc/bopm/files/bopm.init.d
index 54a15c00b7e1..0a5339b5270d 100644
--- a/net-misc/bopm/files/bopm.init.d
+++ b/net-misc/bopm/files/bopm.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bopm/files/bopm.init.d,v 1.1 2004/02/18 00:43:59 zul Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bopm/files/bopm.init.d,v 1.2 2004/03/06 03:30:53 vapier Exp $
 
 opts="depend start stop"
 
diff --git a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
index bbf24e250115..a7eadef848c2 100644
--- a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
+++ b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
@@ -1,6 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/files/vpnclient.rc,v 1.4 2004/03/06 03:29:17 vapier Exp $
 
 opts="start stop status"
 
diff --git a/net-misc/dante/files/dante-sockd-conf-1.1.14-r2 b/net-misc/dante/files/dante-sockd-conf-1.1.14-r2
index cc86d49abe67..e35000774882 100644
--- a/net-misc/dante/files/dante-sockd-conf-1.1.14-r2
+++ b/net-misc/dante/files/dante-sockd-conf-1.1.14-r2
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-conf-1.1.14-r2,v 1.1 2003/12/23 10:48:10 robbat2 Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-conf-1.1.14-r2,v 1.2 2004/03/06 03:29:17 vapier Exp $
 
 # Number of processes to fork off
 # 1 is plenty for most users
diff --git a/net-misc/dante/files/dante-sockd-init b/net-misc/dante/files/dante-sockd-init
index 68325506fa21..cd3dd277d549 100644
--- a/net-misc/dante/files/dante-sockd-init
+++ b/net-misc/dante/files/dante-sockd-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-init,v 1.2 2003/02/14 23:05:09 vapier Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-init,v 1.3 2004/03/06 03:29:17 vapier Exp $
 
 depend() {
 	need net
diff --git a/net-misc/dante/files/dante-sockd-init-1.1.14-r2 b/net-misc/dante/files/dante-sockd-init-1.1.14-r2
index 161479a25c02..3c438f236084 100644
--- a/net-misc/dante/files/dante-sockd-init-1.1.14-r2
+++ b/net-misc/dante/files/dante-sockd-init-1.1.14-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-init-1.1.14-r2,v 1.1 2003/12/23 10:48:10 robbat2 Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-init-1.1.14-r2,v 1.2 2004/03/06 03:29:17 vapier Exp $
 
 SOCKD_OPT="-D"
 [ "${SOCKD_FORKDEPTH}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}"
@@ -13,19 +13,19 @@ depend() {
 }
 
 checkconfig() {
-	# firstly check that it exists
-    if [ ! -f /etc/socks/sockd.conf ] ; then
+	# first check that it exists
+	if [ ! -f /etc/socks/sockd.conf ] ; then
 		eerror "You need to setup /etc/socks/sockd.conf first"
 		eerror "Examples are in /usr/share/doc/dante[version]/example"
 		eerror "for info: info sockd.conf"
 		return 1
 	fi
-    /usr/sbin/sockd -V
-    ret=$?
-    if [ $ret -ne 0 ]; then
-        eerror "Something is wrong with your configuration file"
-        return 1
-    fi
+	/usr/sbin/sockd -V
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "Something is wrong with your configuration file"
+		return 1
+	fi
 }
 
 start() {
diff --git a/net-misc/dhcp/files/conf.dhcpd b/net-misc/dhcp/files/conf.dhcpd
index 4bba86c1e2c3..57c0e0c7c549 100644
--- a/net-misc/dhcp/files/conf.dhcpd
+++ b/net-misc/dhcp/files/conf.dhcpd
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/conf.dhcpd,v 1.4 2002/09/03 07:40:14 lostlogic Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/conf.dhcpd,v 1.5 2004/03/06 03:30:53 vapier Exp $
 
 #configure which interface or interfaces to for dhcp to listen on
 #list all interfaces space separated.
diff --git a/net-misc/dhcp/files/dhcp.conf b/net-misc/dhcp/files/dhcp.conf
index 9e294ba23172..07ecb36d03a1 100644
--- a/net-misc/dhcp/files/dhcp.conf
+++ b/net-misc/dhcp/files/dhcp.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.conf,v 1.3 2004/01/15 01:04:51 max Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.conf,v 1.4 2004/03/06 03:30:53 vapier Exp $
 
 # Configure which interface or interfaces to for dhcp to listen on
 # list all interfaces space separated.
diff --git a/net-misc/dhcp/files/dhcp.rc6 b/net-misc/dhcp/files/dhcp.rc6
index 0c1a75cfd499..4e3c1bc4c603 100644
--- a/net-misc/dhcp/files/dhcp.rc6
+++ b/net-misc/dhcp/files/dhcp.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc6,v 1.10 2004/01/15 01:15:07 max Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc6,v 1.11 2004/03/06 03:30:53 vapier Exp $
 
 depend() {
 	need net
@@ -32,13 +32,13 @@ start() {
 	start-stop-daemon --start --quiet --exec /usr/sbin/dhcpd \
 		-- -pf /var/run/dhcp/dhcpd.pid -q \
 		-user dhcp -group dhcp ${DHCPD_OPTS} \
-        	${CHROOT:+-chroot ${CHROOT}} ${IFACE}
+		${CHROOT:+-chroot ${CHROOT}} ${IFACE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping dhcpd"
 	start-stop-daemon --stop --quiet --pidfile \
-                "${CHROOT}/var/run/dhcp/dhcpd.pid"
+		"${CHROOT}/var/run/dhcp/dhcpd.pid"
 	eend $?
 }
diff --git a/net-misc/dhcp/files/dhcp.rc7 b/net-misc/dhcp/files/dhcp.rc7
index 9acb94d6d235..e92348a45b11 100644
--- a/net-misc/dhcp/files/dhcp.rc7
+++ b/net-misc/dhcp/files/dhcp.rc7
@@ -1,32 +1,32 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc7,v 1.4 2003/07/25 20:27:08 lanius Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc7,v 1.5 2004/03/06 03:30:53 vapier Exp $
 
 #configuration is done in /etc/conf.d/dhcp
 
 depend() {
-    need net
+	need net
 	use named
 }
 
 checkconfig() {
-    if [ ! -e /etc/dhcp/dhcpd.conf ] ; then
-	eerror "You need an /etc/dhcp/dhcpd.conf file to run dhcpd"
-	eerror "There is a sample conf file in /usr/share/doc/dhcp"
-	return 1
-    fi
+	if [ ! -e /etc/dhcp/dhcpd.conf ] ; then
+		eerror "You need an /etc/dhcp/dhcpd.conf file to run dhcpd"
+		eerror "There is a sample conf file in /usr/share/doc/dhcp"
+		return 1
+	fi
 }
 
 start() {
-    checkconfig || return 1
-    ebegin "Starting dhcpd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/dhcpd -- ${DHCPD_OPTS} ${IFACE}
-    eend $?
+	checkconfig || return 1
+	ebegin "Starting dhcpd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/dhcpd -- ${DHCPD_OPTS} ${IFACE}
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping dhcpd"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/dhcpd
-    eend $?
+	ebegin "Stopping dhcpd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/dhcpd
+	eend $?
 }
diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf
index 38c2d860d3cc..30b9a4eba318 100644
--- a/net-misc/dhcp/files/dhcrelay.conf
+++ b/net-misc/dhcp/files/dhcrelay.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.conf,v 1.1 2004/01/15 01:04:51 max Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.conf,v 1.2 2004/03/06 03:30:53 vapier Exp $
 
 # Configure which interface or interfaces to for dhcp to listen on
 # list all interfaces space separated.
diff --git a/net-misc/dhcp/files/dhcrelay.rc6 b/net-misc/dhcp/files/dhcrelay.rc6
index e4b9d75e46b6..969da15b5167 100644
--- a/net-misc/dhcp/files/dhcrelay.rc6
+++ b/net-misc/dhcp/files/dhcrelay.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.rc6,v 1.2 2004/01/15 01:15:07 max Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.rc6,v 1.3 2004/03/06 03:30:53 vapier Exp $
 
 depend() {
 	need net
@@ -12,7 +12,7 @@ start() {
 	ebegin "Starting dhcrelay"
 	start-stop-daemon --start --quiet --exec /usr/sbin/dhcrelay \
 		-- -q -i ${IFACE} ${DHCRELAY_OPTS} \
-        	${DHCRELAY_SERVERS}
+		${DHCRELAY_SERVERS}
 	eend $?
 }
 
diff --git a/net-misc/dhcpv6/files/dhcp6s.rc b/net-misc/dhcpv6/files/dhcp6s.rc
index fa97e4c0d736..8b9ec39c5f22 100644
--- a/net-misc/dhcpv6/files/dhcp6s.rc
+++ b/net-misc/dhcpv6/files/dhcp6s.rc
@@ -1,31 +1,31 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/files/dhcp6s.rc,v 1.1 2003/06/18 02:30:28 latexer Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/files/dhcp6s.rc,v 1.2 2004/03/06 03:33:06 vapier Exp $
 
 #configuration is done in /etc/dhcp6s.conf
 
 depend() {
-    need net
+	need net
 }
 
 checkconfig() {
-    if [ ! -e /etc/dhcp6s.conf ] ; then
-	eerror "You need an /etc/dhcp6s.conf file to run dhcp6s"
-	eerror "There is a sample conf file in /usr/share/doc/dhcpv6-0.7"
-	return 1
-    fi
+	if [ ! -e /etc/dhcp6s.conf ] ; then
+		eerror "You need an /etc/dhcp6s.conf file to run dhcp6s"
+		eerror "There is a sample conf file in /usr/share/doc/dhcpv6-0.7"
+		return 1
+	fi
 }
 
 start() {
-    checkconfig || return 1
-    ebegin "Starting dhcp6s"
-    start-stop-daemon --start --quiet --exec /usr/sbin/dhcp6s
-    eend $?
+	checkconfig || return 1
+	ebegin "Starting dhcp6s"
+	start-stop-daemon --start --quiet --exec /usr/sbin/dhcp6s
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping dhcp6s"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/dhcp6s
-    eend $?
+	ebegin "Stopping dhcp6s"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/dhcp6s
+	eend $?
 }
diff --git a/net-misc/gnugk/files/gnugk.confd b/net-misc/gnugk/files/gnugk.confd
index 32d3164ffab2..59719d72a475 100644
--- a/net-misc/gnugk/files/gnugk.confd
+++ b/net-misc/gnugk/files/gnugk.confd
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/files/gnugk.confd,v 1.1 2003/10/26 19:45:46 stkn Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/files/gnugk.confd,v 1.2 2004/03/06 03:33:06 vapier Exp $
 
 #
 # see gnugk --help for a complete list of options
diff --git a/net-misc/gnugk/files/gnugk.rc6 b/net-misc/gnugk/files/gnugk.rc6
index e5e127ed9988..e0fca22fd50d 100644
--- a/net-misc/gnugk/files/gnugk.rc6
+++ b/net-misc/gnugk/files/gnugk.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/files/gnugk.rc6,v 1.1 2003/10/26 19:45:46 stkn Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/files/gnugk.rc6,v 1.2 2004/03/06 03:33:06 vapier Exp $
 
 depend() {
 	need net
diff --git a/net-misc/ipx-utils/files/ipx.confd b/net-misc/ipx-utils/files/ipx.confd
index ebe98d6460ec..3475f0d40f9c 100644
--- a/net-misc/ipx-utils/files/ipx.confd
+++ b/net-misc/ipx-utils/files/ipx.confd
@@ -1,42 +1,27 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.confd,v 1.1 2002/07/22 00:24:51 azarah Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.confd,v 1.2 2004/03/06 03:33:06 vapier Exp $
 
 # Config file for /etc/init.d/ipx
 
-
 # Automatically selecting a primary interface.
-
 IPX_AUTO_PRIMARY=on
 
-
 # Automatically creating interfaces.
-
 IPX_AUTO_INTERFACE=on
 
-
 # Interface to which IPX sockets are bound.
-
 IPX_DEVICE=eth0
 
-
 # The IPX frame type to use
-
 IPX_FRAME=802.2
 
-
 # Create a special kind of IPX interface that does not
 # have a physical device or frame type.
-
 IPX_INTERNAL_NET=no
 
-
 # Network number
-
 IPX_NETNUM=1
 
-
 # Node number
-
 IPX_NODENUM=1
-
diff --git a/net-misc/ipx-utils/files/ipx.init b/net-misc/ipx-utils/files/ipx.init
index 3a84de253efa..2afaf59b9016 100644
--- a/net-misc/ipx-utils/files/ipx.init
+++ b/net-misc/ipx-utils/files/ipx.init
@@ -1,11 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init,v 1.2 2003/02/14 23:05:45 vapier Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init,v 1.3 2004/03/06 03:33:06 vapier Exp $
 
 #NB: Config is in /etc/conf.d/ipx
 
-
 depend() {
 	use net
 }
@@ -41,4 +40,3 @@ stop() {
 	retval=$(( $retval + $? ))
 	eend ${retval} "Failed to down IPX"
 }
-
diff --git a/net-misc/linesrv/files/linesrv.rc6 b/net-misc/linesrv/files/linesrv.rc6
index f86b8c46c488..9b7cad8d6911 100644
--- a/net-misc/linesrv/files/linesrv.rc6
+++ b/net-misc/linesrv/files/linesrv.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linesrv/files/linesrv.rc6,v 1.4 2003/02/14 23:05:51 vapier Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linesrv/files/linesrv.rc6,v 1.5 2004/03/06 03:33:06 vapier Exp $
 
 depend() {
 	need net
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
index 225a7caa83e7..41313074c2c7 100644
--- a/net-misc/tinc/files/tincd
+++ b/net-misc/tinc/files/tincd
@@ -1,8 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.1 2003/12/24 14:23:51 bazik Exp $
-
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.2 2004/03/06 03:33:06 vapier Exp $
 
 depend() {
 	use logger dns
@@ -48,4 +47,3 @@ stop() {
 		fi
 	done
 }
-