wdd: fix gcc 4 warnings, move to /sbin

6 files changed, 15 insertions, 99 deletions

diff --git a/sys-apps/wdd/Manifest b/sys-apps/wdd/Manifest
index eb62bcf3..b35737fb 100644
--- a/sys-apps/wdd/Manifest
+++ b/sys-apps/wdd/Manifest
@@ -1,9 +1,7 @@
 AUX warning.patch 774 RMD160 4c7147c373d8872cf35ddd4eb4b67f50b52749ac SHA1 6c84a76542769c001bc8912558f87a63b983e42e SHA256 918e0fcd1acadbc574f5bdb4e90e1a62a4f607497ec2a689498d0d89254ae7d6
-AUX wdd-syslog-errors.diff 2075 RMD160 087518da419bb80c640d086ef6c0d53a17a424d5 SHA1 360846d93b4f155cff9f62348215a4f12aa7355a SHA256 a7d6dd2adbb6cba52b909f1063e24baee3017e4754e93454c84ad06624358218
+AUX wdd-syslog-errors.diff 2081 RMD160 ec41a668847bc800fe1c12a69b3aef1d5d1274c5 SHA1 4fd5641cfb7ace59dec9415352dd516bd6934ae2 SHA256 d89862596264cdbdab4fc9a7a788bb45c2a60a6faa3ec67ce5b11e0ba5d9402e
 AUX wdd.confd 63 RMD160 0c72c3dc55da3c82231ecd4fc479fe64a1b49a66 SHA1 fe35c35f956e38f1ff18277838cb8741998af56a SHA256 bd66a212cb55fdf74bf967917f5d5a68e08ab855d3b44a97d3a634da19da8d88
-AUX wdd.initd 421 RMD160 f42dd9c91bbd1efe38253db237b7fee70f303c67 SHA1 36b4ef136e32ea9de5f837e4c08672128025dec6 SHA256 9d123e1ea41d90404520f33922d12cb2622cc4b913f62277d4b11bdfe0d3b684
+AUX wdd.initd 413 RMD160 037acbece81cd93cb54baf5752b55fb261645c08 SHA1 af4ca52be2e7e79ab332b321b1a19116e0a4823e SHA256 41b52446d2b513a945e84a12fc303d2b2c75e1f31c8ce33e1dde23d395947d17
 DIST wdd.8 3198 RMD160 34aa288bd79e0f15229ca75f8567bde8d45f76a1 SHA1 1f83bdc0fd2f8aaeb439ac60f1d79487a8e88f88 SHA256 7129d465b7fa4c96dd488f22a4dc265a0d2d343e1c40ac0aa6827e53dd8aec2b
 DIST wdd.c 2841 RMD160 f4555a2132545e371d7325bc71755c48f64a57b9 SHA1 b68d654ec1511bbce66a1a07d40bf9b7c3272243 SHA256 66be5e748b6199f7afbdbc7b6aaed6cbbfa2e0634aa90d3c0aefa743756ae6a7
-EBUILD wdd-0-r1.ebuild 893 RMD160 0d8a76d87fc4a26282c8a103ae5197d36148ddad SHA1 f963007ee13fd9202975774f31e986714fc27ca5 SHA256 aa3f862a1a2cb3cf12a0e9ae5f8061c27ae203443219980ebc09f4e16b929ccd
-EBUILD wdd-0-r2.ebuild 857 RMD160 a45609f431c95cde658f28eb039a4eaebd6a1c95 SHA1 f914a570431887c7392f6a473542c26cb2429393 SHA256 d682402e99f70df09b01a3408a6e426f6242ae2bf27121f4e4f505a72780aca1
-EBUILD wdd-0.ebuild 748 RMD160 dd95a9dcc9b885ca7d03e98e178737d581646efa SHA1 ad8a9a2dab2970af950a17576ea0834650aecf74 SHA256 047d1701d790f6b4a229d75b8fb4c7587bdf9e2b333fb60ac7aeaed359921251
+EBUILD wdd-0.ebuild 878 RMD160 7022b62096e5f49e946a87f1accca02b8c03a070 SHA1 3bbfa0c363788c690d216a7837e252072c0e503a SHA256 b9291813b609f2f8bc5bd83bf103c7e3c47fe3331dc57f231452c181ae1517fd
diff --git a/sys-apps/wdd/files/wdd-syslog-errors.diff b/sys-apps/wdd/files/wdd-syslog-errors.diff
index 6d99f2c3..28ef7727 100644
--- a/sys-apps/wdd/files/wdd-syslog-errors.diff
+++ b/sys-apps/wdd/files/wdd-syslog-errors.diff
@@ -14,7 +14,7 @@
 +void do_exit_log (int ret, char* string) {
 +
 +#ifdef _USE_SYSLOG_
-+	syslog(LOG_EMERG, string);
++	syslog(LOG_EMERG, "%s", string);
 +#endif /* _USE_SYSLOG_ */
 +
 +	exit (ret);
diff --git a/sys-apps/wdd/files/wdd.initd b/sys-apps/wdd/files/wdd.initd
index fd23e755..b7b531aa 100755
--- a/sys-apps/wdd/files/wdd.initd
+++ b/sys-apps/wdd/files/wdd.initd
@@ -10,12 +10,12 @@ depend() {
 start() {
 	ebegin "Starting wdd"
 	start-stop-daemon --start --quiet --nicelevel ${NICE:-10} \
-		--exec /usr/sbin/wdd -- ${WATCH_FILES}
+		--exec /sbin/wdd -- ${WATCH_FILES}
 	eend ${?}
 }
 
 stop() {
 	ebegin "Stopping wdd"
-	start-stop-daemon --stop --retry 5 --exec /usr/sbin/wdd
+	start-stop-daemon --stop --retry 5 --exec /sbin/wdd
 	eend ${?}
 }
diff --git a/sys-apps/wdd/wdd-0-r1.ebuild b/sys-apps/wdd/wdd-0-r1.ebuild
deleted file mode 100644
index 9fe53ed0..00000000
--- a/sys-apps/wdd/wdd-0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Simple Watchdog Daemon"
-HOMEPAGE="http://linux.exosec.fr/watchdog/"
-SRC_URI="http://linux.exosec.fr/watchdog/daemon/wdd.c
-		 http://linux.exosec.fr/watchdog/daemon/wdd.8"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="syslog"
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack () {
-	mkdir -p ${S}
-	mv ${DISTDIR}/wdd.{c,8} ${S}
-
-	cd ${S}
-	epatch ${FILESDIR}/warning.patch
-	use syslog && epatch ${FILESDIR}/wdd-syslog-errors.diff
-}
-
-src_compile () {
-	local flags=""
-	use syslog && flags="${flags} -D_USE_SYSLOG_"
-
-	echo "gcc -W -Wall $CFLAGS ${flags} -o wdd wdd.c"
-	gcc -W -Wall $CFLAGS ${flags} -o wdd wdd.c || die "compile failed"
-}
-
-src_install () {
-	dosbin wdd
-	doman wdd.8
-
-	newinitd ${FILESDIR}/wdd.initd wdd
-	newconfd ${FILESDIR}/wdd.confd wdd
-}
-
diff --git a/sys-apps/wdd/wdd-0-r2.ebuild b/sys-apps/wdd/wdd-0-r2.ebuild
deleted file mode 100644
index 9b717949..00000000
--- a/sys-apps/wdd/wdd-0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Simple Watchdog Daemon"
-HOMEPAGE="http://linux.exosec.fr/watchdog/"
-SRC_URI="http://linux.exosec.fr/watchdog/daemon/wdd.c
-		 http://linux.exosec.fr/watchdog/daemon/wdd.8"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="syslog"
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack () {
-	mkdir -p ${S}
-	mv ${DISTDIR}/wdd.{c,8} ${S}
-
-	cd ${S}
-	epatch ${FILESDIR}/warning.patch
-	use syslog && epatch ${FILESDIR}/wdd-syslog-errors.diff
-}
-
-src_compile () {
-	use syslog && CFLAGS="${CFLAGS} -D_USE_SYSLOG_"
-
-	cmd="$(tc-getCC) -W -Wall ${CFLAGS} -o wdd wdd.c"
-	echo "${cmd}"
-	${cmd} || die "compile failed"
-}
-
-src_install () {
-	dosbin wdd
-	doman wdd.8
-
-	newinitd ${FILESDIR}/wdd.initd wdd
-	newconfd ${FILESDIR}/wdd.confd wdd
-}
diff --git a/sys-apps/wdd/wdd-0.ebuild b/sys-apps/wdd/wdd-0.ebuild
index 333f6a92..3d5573a1 100644
--- a/sys-apps/wdd/wdd-0.ebuild
+++ b/sys-apps/wdd/wdd-0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://linux.exosec.fr/watchdog/daemon/wdd.c
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
+IUSE="syslog"
 
 DEPEND=""
 RDEPEND=""
@@ -23,18 +23,23 @@ src_unpack () {
 
 	cd ${S}
 	epatch ${FILESDIR}/warning.patch
+	use syslog && epatch ${FILESDIR}/wdd-syslog-errors.diff
 }
 
 src_compile () {
-	echo "gcc -W -Wall $CFLAGS -o wdd wdd.c"
-	gcc -W -Wall $CFLAGS -o wdd wdd.c || die "compile failed"
+	use syslog && CFLAGS="${CFLAGS} -D_USE_SYSLOG_"
+
+	export CFLAGS="${CFLAGS} -W -Wall -U_FORTIFY_SOURCE"
+	export CC=$(tc-getCC)
+
+	emake wdd || die "emake failed"
 }
 
 src_install () {
+	into /
 	dosbin wdd
 	doman wdd.8
 
 	newinitd ${FILESDIR}/wdd.initd wdd
 	newconfd ${FILESDIR}/wdd.confd wdd
 }
-