net-misc/icmptx: Update init scripts, fix indent, use /run

Package-Manager: portage-2.1.12.3

4 files changed, 49 insertions, 63 deletions

diff --git a/net-misc/icmptx/ChangeLog b/net-misc/icmptx/ChangeLog
index 2f1a8f8a..b5a0b673 100644
--- a/net-misc/icmptx/ChangeLog
+++ b/net-misc/icmptx/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> files/icmptxcd.init,
+  files/icmptxd.init:
+  net-misc/icmptx: Update init scripts, fix indent, use /run
+
   09 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> icmptx-0.2.ebuild:
   net-misc/icmptx: Move to EAPI 5, define REQUIRED_USE so we need client or
   server or both, respect CFLAGS and LDFLAGS, remove doc info
diff --git a/net-misc/icmptx/Manifest b/net-misc/icmptx/Manifest
index fa4513d0..762a089f 100644
--- a/net-misc/icmptx/Manifest
+++ b/net-misc/icmptx/Manifest
@@ -1,8 +1,8 @@
 AUX icmptx-0.2-BJA-Makefile.diff 618 SHA256 47b71e74481a046a1e5ecd23c065c1c8890975daa72f0943795a1197bc37e1db WHIRLPOOL df6c9a81c0eb463cab3aeafff10c3a2e6c2eeb386dff5aa6922904ae2c1b0b9e0dc2d0fad87e824fc6b109e091a30be8ce3ed9ec42439bbd3640837a5df5405c
 AUX icmptxcd.conf 326 SHA256 faa34b1718fa242d924a198a6143a4325e3c0527cffe9fccff60ddc8631d32d6 WHIRLPOOL 4c286867affa1ae17a3e680842be185df4b6f8e158fb56175c319979284389eadba33b3dbc0e62242854a48bf876dec44b0373620536c378682b8b392bfbf540
-AUX icmptxcd.init 1341 SHA256 1acd601b5552bb547d16b4e01661b7ac96c0703130af4103db52eb27fd3d6b19 WHIRLPOOL 959c7a8233fda947cb81d8bd0ae9e3fb6afd034e57856deba52d5f01bdd6545a84310aa0c6274a5ac05068851b5a7fb10e4d270a6542bf40d9be3ccd1778776a
+AUX icmptxcd.init 1220 SHA256 778360c4524615cd11c261661adb892e1b573fbb132c6fcec523d1f0149fefcf WHIRLPOOL 2c55a26a422dc38c54205a65ca066f1ea1900b9649ffae99c767b5e5848c0c8e294c7c9bd0e2634123f3724745ae2195440695416fd1ab0a414f6465d35c8478
 AUX icmptxd.conf 327 SHA256 eafa579a4b39678609616197481afed2a0398edaca2ff291c2e002f3fb422a4e WHIRLPOOL 22ea7e53203d11716c90f5d6bf8ff812d42e52749b5e88bb83720dfbd12d1ddb8d991095bcf28c3d581b9701dfc8a3718d2946979a456572cf9287087fccd6df
-AUX icmptxd.init 1357 SHA256 d1061d597a0b6dbe764a2a1aed25c83b22f737638a913eec40b9960d92445c5d WHIRLPOOL 353812ded797db6a0cfaa7d7e8f2cf45bfd2864523e7bc4bc29171db69a26e382519d10bb35286a703e421951c4515bf0efaaf6cdaaae9ddeb1deda6368f302b
+AUX icmptxd.init 1236 SHA256 1283f0d0c855100218a6cbd7ffd14158a5d7c7d46e5963ecc4c5db08aeb011a8 WHIRLPOOL d3102a4dec53f41edf39599e21d3a4eefe47d474ef598ef87479ec4399ca353cab48d46c058db8e5c21c41f299f482deae05e87d77b94ad7165686df81242fde
 EBUILD icmptx-0.2.ebuild 971 SHA256 ab3d672b86204128da62d4f0ebcbcbac854171a5b2839892c3846dd0ec3442ef WHIRLPOOL 4565ff245b0d4031aa2641eddda40c3c22bf2749945c5d4be2af1c58736f18ea2f8865c00b0658d0a413c94d37cbff32aa66ecc7bbdafc9956ea8bdf31d4a874
-MISC ChangeLog 1547 SHA256 ff5af80d8be287338a385ddafbc31854bbd8730cd6e8d7ee86ebaf9058eb0a4d WHIRLPOOL 50fa9fe4275ed0f221c1a87e95db6db0e62585cfc6794dc09b945f6eb2f19fe91bd3ff81ac282ec73da43003603e8f4e5e169f7c3a954bd52ed7c264616f7d6b
+MISC ChangeLog 1705 SHA256 cee5ab92f93bc3a21e86d33d9daaa5db242660e4d800199d6d38156c83380a1d WHIRLPOOL d7bed83e6569a0492cdf95bc0f239f4ee7decd93d0aeb48680cb260514caeb9c217efe249ad228812c39e0b95ffcf2a6c9448963388976393ea9707a3a4f448e
 MISC metadata.xml 256 SHA256 556c3d16793383c1a759d6ee6bb971a0b1b6bd2075af119b34f7dc0b9c3c0e00 WHIRLPOOL 97ff0d5db52739ebe7340faca515d302a4cb9e8aea20b4f894eb82cad09b91083f9a99f51520d0dbf7496ccccbdfa75e9cd0279d2fabc0f9cb45b5137fcd8919
diff --git a/net-misc/icmptx/files/icmptxcd.init b/net-misc/icmptx/files/icmptxcd.init
index 51a1c49b..e84ddf32 100644
--- a/net-misc/icmptx/files/icmptxcd.init
+++ b/net-misc/icmptx/files/icmptxcd.init
@@ -1,29 +1,27 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 depend() {
-    # If the user set TUNTAP_INTERFACE, they probably have a net script
-    # configuring that interface. icmptx is responsible for actually creating
-    # the stupid thing, so we need to run before the config.
-    if [ ! -z "${TUNTAP_INTERFACE}" ] ; then
-        if [ -x /etc/init.d/net.${TUNTAP_INTERFACE} ] ; then
-            before net.${TUNTAP_INTERFACE}
-        fi
-    fi
+	# If the user set TUNTAP_INTERFACE, they probably have a net script
+	# configuring that interface. icmptx is responsible for actually creating
+	# the stupid thing, so we need to run before the config.
+	if [ ! -z "${TUNTAP_INTERFACE}" ] ; then
+		if [ -x "/etc/init.d/net.${TUNTAP_INTERFACE}" ] ; then
+			before net.${TUNTAP_INTERFACE}
+		fi
+	fi
 }
 
 loadtun() {
-	if [ ! -e /dev/net/tun ]
-	then
+	if [ ! -e /dev/net/tun ] ; then
 		ebegin "Loading TUN/TAP kernel module"
 		modprobe -q tun
 		eend $?
 	fi
 
-	if [ ! -e /dev/net/tun ]
-	then
+	if [ ! -e /dev/net/tun ] ; then
 		eend 1 "Failed to load TUN driver! (did you compile your kernel with TUN/TAP support?)"
 		return 1
 	fi
@@ -32,36 +30,29 @@ loadtun() {
 }
 
 checkconfig() {
-	if [ -z "${SERVER}" ] ; then
-		eerror "SERVER must be set"
-	fi
+	[ -z "${SERVER}" ] && eerror "SERVER must be set"
 }
 
 start() {
 	checkconfig || return 1
-
 	loadtun || return 1
 
 	ebegin "Starting icmptxcd"
-
 	start-stop-daemon \
- 	       --start \
-        	--background \
-	        --make-pidfile \
-        	--exec /usr/sbin/icmptx \
-	        --pidfile "/var/run/icmptx.pid" \
-        	-- -c ${SERVER}
-
+		--start \
+		--background \
+		--make-pidfile \
+		--exec /usr/sbin/icmptx \
+		--pidfile "/run/icmptx.pid" \
+		-- -c ${SERVER}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping icmptxcd"
-
 	start-stop-daemon \
-	        --stop \
-        	--exec /usr/sbin/icmptx \
-	        --pidfile "/var/run/icmptx.pid"
-
+		--stop \
+		--exec /usr/sbin/icmptx \
+		--pidfile "/run/icmptx.pid"
 	eend $?
 }
diff --git a/net-misc/icmptx/files/icmptxd.init b/net-misc/icmptx/files/icmptxd.init
index eae27b12..dcc1df70 100644
--- a/net-misc/icmptx/files/icmptxd.init
+++ b/net-misc/icmptx/files/icmptxd.init
@@ -1,29 +1,27 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 depend() {
-    # If the user set TUNTAP_INTERFACE, they probably have a net script
-    # configuring that interface. icmptx is responsible for actually creating
-    # the stupid thing, so we need to run before the config.
-    if [ ! -z "${TUNTAP_INTERFACE}" ] ; then
-        if [ -x /etc/init.d/net.${TUNTAP_INTERFACE} ] ; then
-            before net.${TUNTAP_INTERFACE}
-        fi
-    fi
+	# If the user set TUNTAP_INTERFACE, they probably have a net script
+	# configuring that interface. icmptx is responsible for actually creating
+	# the stupid thing, so we need to run before the config.
+	if [ ! -z "${TUNTAP_INTERFACE}" ] ; then
+		if [ -x "/etc/init.d/net.${TUNTAP_INTERFACE}" ] ; then
+			before net.${TUNTAP_INTERFACE}
+		fi
+	fi
 }
 
 loadtun() {
-	if [ ! -e /dev/net/tun ]
-	then
+	if [ ! -e /dev/net/tun ] ; then
 		ebegin "Loading TUN/TAP kernel module"
 		modprobe -q tun
 		eend $?
 	fi
 
-	if [ ! -e /dev/net/tun ]
-	then
+	if [ ! -e /dev/net/tun ] ; then
 		eend 1 "Failed to load TUN driver! (did you compile your kernel with TUN/TAP support?)"
 		return 1
 	fi
@@ -32,36 +30,29 @@ loadtun() {
 }
 
 checkconfig() {
-	if [ -z "${BIND_ADDRESS}" ] ; then
-		eerror "BIND_ADDRESS must be set"
-	fi
+	[ -z "${BIND_ADDRESS}" ] && eerror "BIND_ADDRESS must be set"
 }
 
 start() {
 	checkconfig || return 1
-
 	loadtun || return 1
 
 	ebegin "Starting icmptxd"
-
 	start-stop-daemon \
- 	       --start \
-        	--background \
-	        --make-pidfile \
-        	--exec /usr/sbin/icmptx \
-	        --pidfile "/var/run/icmptx.pid" \
-        	-- -s ${BIND_ADDRESS}
-
+		--start \
+		--background \
+		--make-pidfile \
+		--exec /usr/sbin/icmptx \
+		--pidfile "/run/icmptx.pid" \
+		-- -s ${BIND_ADDRESS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping icmptxd"
-
 	start-stop-daemon \
-        	--stop \
- 	       --exec /usr/sbin/icmptx \
-	        --pidfile "/var/run/icmptx.pid"
-
+		--stop \
+		--exec /usr/sbin/icmptx \
+		--pidfile "/run/icmptx.pid"
 	eend $?
 }