diff options
| -rw-r--r-- | sys-apps/wdd/Manifest | 8 | ||||
| -rw-r--r-- | sys-apps/wdd/files/wdd-syslog-errors.diff | 31 | ||||
| -rw-r--r-- | sys-apps/wdd/wdd-0-r1.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/wdd/wdd-0-r2.ebuild | 11 | ||||
| -rw-r--r-- | sys-apps/wdd/wdd-0.ebuild | 2 |
5 files changed, 25 insertions, 29 deletions
diff --git a/sys-apps/wdd/Manifest b/sys-apps/wdd/Manifest index d1418d33..eb62bcf3 100644 --- a/sys-apps/wdd/Manifest +++ b/sys-apps/wdd/Manifest @@ -1,9 +1,9 @@ AUX warning.patch 774 RMD160 4c7147c373d8872cf35ddd4eb4b67f50b52749ac SHA1 6c84a76542769c001bc8912558f87a63b983e42e SHA256 918e0fcd1acadbc574f5bdb4e90e1a62a4f607497ec2a689498d0d89254ae7d6 -AUX wdd-syslog-errors.diff 2138 RMD160 a35c58c4d04f666cda623de854fbd84444e467be SHA1 cea53e22e8627d125a48355ef57bbbe3e026b692 SHA256 301b5d8ba0b8220bd9d1a750e03175060889fe85d5cde583aad7265cbe114951 +AUX wdd-syslog-errors.diff 2075 RMD160 087518da419bb80c640d086ef6c0d53a17a424d5 SHA1 360846d93b4f155cff9f62348215a4f12aa7355a SHA256 a7d6dd2adbb6cba52b909f1063e24baee3017e4754e93454c84ad06624358218 AUX wdd.confd 63 RMD160 0c72c3dc55da3c82231ecd4fc479fe64a1b49a66 SHA1 fe35c35f956e38f1ff18277838cb8741998af56a SHA256 bd66a212cb55fdf74bf967917f5d5a68e08ab855d3b44a97d3a634da19da8d88 AUX wdd.initd 421 RMD160 f42dd9c91bbd1efe38253db237b7fee70f303c67 SHA1 36b4ef136e32ea9de5f837e4c08672128025dec6 SHA256 9d123e1ea41d90404520f33922d12cb2622cc4b913f62277d4b11bdfe0d3b684 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 901 RMD160 6a4527c5bf7db519efb189224de17189f205b575 SHA1 43937251fc905f7c10036598516378554eef1e48 SHA256 4a6ded30b7fc02c8ca5bca04ba7bd21859a36d5b36cdee01f2f0b15e8276380d -EBUILD wdd-0-r2.ebuild 846 RMD160 26f6e481d86141af7db4741fb8d86bddf272382b SHA1 8387a84a3e5309a52aa1f58518bc01685e709034 SHA256 398fb76057bc173748bb41d746f82ee8986397c14d49f8ff7273dbeb8a259bf3 -EBUILD wdd-0.ebuild 756 RMD160 d6b133180c7ad6e45e021ab5cccc022ff5d08e99 SHA1 07062968c759ec3eefaea0a08b935ca3e6616712 SHA256 dbaa31f81d629ff15c6615dbad4a088fd256cf0a9a977e6d2465f9ca160fb0d6 +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 diff --git a/sys-apps/wdd/files/wdd-syslog-errors.diff b/sys-apps/wdd/files/wdd-syslog-errors.diff index 93d61672..6d99f2c3 100644 --- a/sys-apps/wdd/files/wdd-syslog-errors.diff +++ b/sys-apps/wdd/files/wdd-syslog-errors.diff @@ -1,14 +1,9 @@ ---- wdd.c 2008-04-09 14:23:47.000000000 +0200 -+++ wdd.c 2008-04-09 14:40:45.000000000 +0200 -@@ -3,13 +3,27 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> +--- wdd.c 2009-04-24 10:48:29.753640442 +0200 ++++ wdd.c+warn+syslog 2009-04-24 10:47:52.505385951 +0200 +@@ -10,10 +10,22 @@ + #include <unistd.h> + #include <sys/wait.h> + #include <string.h> +#ifdef _USE_SYSLOG_ +#include <syslog.h> +#endif /* _USE_SYSLOG_ */ @@ -28,9 +23,9 @@ /* * This function checks if the system can allocate memory * In case of failure, we exit so that the watchdog device -@@ -20,10 +34,10 @@ +@@ -24,10 +36,10 @@ - heap = (void*)sbrk(NULL); + heap = (void*)sbrk(0); if (brk(heap + 4096)) - exit(1); + do_exit_log(1, "try_malloc: brk(heap + 4096) failed\n"); @@ -41,7 +36,7 @@ } /* -@@ -35,7 +49,7 @@ +@@ -39,7 +51,7 @@ int pid; pid = fork(); if (pid < 0) /* exit on error */ @@ -50,9 +45,9 @@ else if (pid == 0) /* child returns cleanly */ exit(0); if (waitpid(pid, NULL, 0) != pid) /* father checks child */ -@@ -54,15 +68,15 @@ +@@ -58,15 +70,15 @@ - heap = (void*)sbrk(NULL); + heap = (void*)sbrk(0); if (brk(heap + sizeof (struct stat))) - exit(1); + do_exit_log(1, "try_stat: brk(heap + sizeof (struct stat)\n"); @@ -69,7 +64,7 @@ else return 0; } -@@ -73,6 +87,11 @@ +@@ -77,6 +89,11 @@ int dev; int curr_file; @@ -81,7 +76,7 @@ if (argc > 1) { /* we'll do a quick check on all the arguments to * ensure that they are valid at load time, and avoid -@@ -124,6 +143,7 @@ +@@ -128,6 +145,7 @@ sleep(1); } /* we never get there theorically... */ diff --git a/sys-apps/wdd/wdd-0-r1.ebuild b/sys-apps/wdd/wdd-0-r1.ebuild index ada99d87..9fe53ed0 100644 --- a/sys-apps/wdd/wdd-0-r1.ebuild +++ b/sys-apps/wdd/wdd-0-r1.ebuild @@ -9,7 +9,7 @@ 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="Public-Domain" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~amd64" IUSE="syslog" diff --git a/sys-apps/wdd/wdd-0-r2.ebuild b/sys-apps/wdd/wdd-0-r2.ebuild index 08826d4d..9b717949 100644 --- a/sys-apps/wdd/wdd-0-r2.ebuild +++ b/sys-apps/wdd/wdd-0-r2.ebuild @@ -9,9 +9,9 @@ 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="Public-Domain" +LICENSE="GPL-2" SLOT="0" -KEYWORDS="-*" +KEYWORDS="~x86 ~amd64" IUSE="syslog" DEPEND="" @@ -22,14 +22,16 @@ src_unpack () { 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_" - echo "$(tc-getCC) -W -Wall ${CFLAGS} -o wdd wdd.c" - $(tc-getCC) -W -Wall ${CFLAGS} -o wdd wdd.c || die "compile failed" + cmd="$(tc-getCC) -W -Wall ${CFLAGS} -o wdd wdd.c" + echo "${cmd}" + ${cmd} || die "compile failed" } src_install () { @@ -39,4 +41,3 @@ src_install () { 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 ab18d1f8..333f6a92 100644 --- a/sys-apps/wdd/wdd-0.ebuild +++ b/sys-apps/wdd/wdd-0.ebuild @@ -9,7 +9,7 @@ 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="Public-Domain" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~amd64" IUSE="" |