busybox: add backported --oknodo support.

based on: http://busybox.net/cgi-bin/viewcvs.cgi?rev=15360&view=rev
via: http://www.handhelds.org/~bugzilla/show_bug.cgi?id=1700

Signed-off-by: Rene Wagner <rw@handhelds.org>

2 files changed, 75 insertions, 1 deletions

diff --git a/org.handhelds.familiar/packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch b/org.handhelds.familiar/packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch
new file mode 100644
index 0000000..1b8debb
--- /dev/null
+++ b/org.handhelds.familiar/packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch
@@ -0,0 +1,73 @@
+--- busybox-1.00/debianutils/start_stop_daemon.c.orig	2006-07-23 00:06:14.000000000 +0200
++++ busybox-1.00/debianutils/start_stop_daemon.c	2006-07-23 00:21:39.000000000 +0200
+@@ -160,7 +160,7 @@
+ }
+ 
+ 
+-static void
++static int 
+ do_stop(void)
+ {
+ 	char what[1024];
+@@ -183,7 +183,7 @@
+ 	if (!found) {
+ 		if (!quiet)
+ 			printf("no %s found; none killed.\n", what);
+-		return;
++		return -1;
+ 	}
+ 	for (p = found; p; p = p->next) {
+ 		if (kill(p->pid, signal_nr) == 0) {
+@@ -200,6 +200,7 @@
+ 				printf(" %d", -p->pid);
+ 		printf(").\n");
+ 	}
++	return killed;
+ }
+ 
+ 
+@@ -209,6 +210,7 @@
+ 	{ "background",			0,		NULL,		'b' },
+ 	{ "quiet",				0,		NULL,		'q' },
+ 	{ "make-pidfile",		0,		NULL,		'm' },
++	{ "oknodo",		0,		NULL,		'o' },
+ 	{ "startas",			1,		NULL,		'a' },
+ 	{ "name",				1,		NULL,		'n' },
+ 	{ "signal",				1,		NULL,		's' },
+@@ -223,6 +225,7 @@
+ #define SSD_OPT_BACKGROUND	4
+ #define SSD_OPT_QUIET		8
+ #define SSD_OPT_MAKEPID		16
++#define SSD_OPT_OKNODO		32
+ 
+ int
+ start_stop_daemon_main(int argc, char **argv)
+@@ -234,7 +237,7 @@
+ 	bb_applet_long_options = ssd_long_options;
+ 
+ 	bb_opt_complementaly = "K~S:S~K";
+-	opt = bb_getopt_ulflags(argc, argv, "KSbqma:n:s:u:x:p:",
++	opt = bb_getopt_ulflags(argc, argv, "KSbqmoa:n:s:u:x:p:",
+ 			&startas, &cmdname, &signame, &userspec, &execname, &pidfile);
+ 
+ 	/* Check one and only one context option was given */
+@@ -265,8 +268,8 @@
+ 		user_id = my_getpwnam(userspec);
+ 
+ 	if (opt & SSD_CTX_STOP) {
+-		do_stop();
+-		return EXIT_SUCCESS;
++		int i = do_stop();
++		return (opt & SSD_OPT_OKNODO) ? 0 : (i <= 0);
+ 	}
+ 
+ 	do_procinit();
+@@ -274,7 +277,7 @@
+ 	if (found) {
+ 		if (!quiet)
+ 			printf("%s already running.\n%d\n", execname ,found->pid);
+-		return EXIT_SUCCESS;
++		return (opt & SSD_OPT_OKNODO) ? EXIT_SUCCESS : EXIT_FAILURE;
+ 	}
+ 	*--argv = startas;
+ 	if (opt & SSD_OPT_BACKGROUND) {
diff --git a/org.handhelds.familiar/packages/busybox/busybox_1.00.bb b/org.handhelds.familiar/packages/busybox/busybox_1.00.bb
index 9f3c837..41c22bb 100644
--- a/org.handhelds.familiar/packages/busybox/busybox_1.00.bb
+++ b/org.handhelds.familiar/packages/busybox/busybox_1.00.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r35"
+PR = "r36"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
@@ -29,6 +29,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://dhcp-hostname.patch;patch=1 \
 	   file://gzip-spurious-const.patch;patch=1 \
 	   file://ifupdown-spurious-environ.patch;patch=1 \
+	   file://start-stop-daemon-oknodo-support.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
 	   file://busybox-httpd \