fix bugs #240350, #240437. Fix printf warnings. Remove dead patch.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

6 files changed, 534 insertions, 25 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 30f9f7c34445..4210a77919fe 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.42 2008/10/06 18:53:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.43 2008/10/08 16:19:11 cardoe Exp $
+
+*openrc-0.3.0-r1 (08 Oct 2008)
+
+  08 Oct 2008; Doug Goldstein <cardoe@gentoo.org>
+  -files/openrc-0.2.4-start-nodep.patch,
+  +files/0.3.0/0006-Fix-tests-Gentoo-240350.patch,
+  +files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch,
+  +files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch,
+  -openrc-0.3.0.ebuild, +openrc-0.3.0-r1.ebuild:
+  fix bugs #240350, #240437. Fix printf warnings. Remove dead patch.
 
   06 Oct 2008; Doug Goldstein <cardoe@gentoo.org>
   +files/0.2.5/0002-useful-functions.patch, +files/0.2.5/0003-KV.patch,
diff --git a/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch b/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch
new file mode 100644
index 000000000000..dfb022ee9fcd
--- /dev/null
+++ b/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch
@@ -0,0 +1,49 @@
+From 86a3baa490d1d84f764b2f4b081d5abfc437b496 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Tue, 7 Oct 2008 13:14:53 +0100
+Subject: [PATCH] Fix tests, #Gentoo 240350.
+
+---
+ src/test/librc.funcs.hidden.list |    2 ++
+ src/test/rc.funcs.list           |    4 ++++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/test/librc.funcs.hidden.list b/src/test/librc.funcs.hidden.list
+index 15249ad..2416a0c 100644
+--- a/src/test/librc.funcs.hidden.list
++++ b/src/test/librc.funcs.hidden.list
+@@ -41,8 +41,10 @@ rc_services_scheduled_by
+ rc_stringlist_add
+ rc_stringlist_addu
+ rc_stringlist_delete
++rc_stringlist_find
+ rc_stringlist_free
+ rc_stringlist_new
+ rc_stringlist_sort
++rc_stringlist_split
+ rc_sys
+ rc_yesno
+diff --git a/src/test/rc.funcs.list b/src/test/rc.funcs.list
+index 85cf936..f632474 100644
+--- a/src/test/rc.funcs.list
++++ b/src/test/rc.funcs.list
+@@ -82,12 +82,16 @@ rc_stringlist_addu
+ rc_stringlist_addu@@RC_1.0
+ rc_stringlist_delete
+ rc_stringlist_delete@@RC_1.0
++rc_stringlist_find
++rc_stringlist_find@@RC_1.0
+ rc_stringlist_free
+ rc_stringlist_free@@RC_1.0
+ rc_stringlist_new
+ rc_stringlist_new@@RC_1.0
+ rc_stringlist_sort
+ rc_stringlist_sort@@RC_1.0
++rc_stringlist_split
++rc_stringlist_split@@RC_1.0
+ rc_sys
+ rc_sys@@RC_1.0
+ rc_yesno
+-- 
+1.6.0.2
+
diff --git a/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch b/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch
new file mode 100644
index 000000000000..1ef89f21a8b8
--- /dev/null
+++ b/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch
@@ -0,0 +1,31 @@
+From a327a7d1e795fb6d6c49a459f5863d9d1fdc0b9c Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Wed, 8 Oct 2008 14:58:17 +0100
+Subject: [PATCH] Fix utmp permissions, Gentoo #240437.
+
+---
+ init.d/bootmisc.in |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
+index 50e83a0..529097e 100644
+--- a/init.d/bootmisc.in
++++ b/init.d/bootmisc.in
+@@ -77,10 +77,13 @@ start()
+ 	if dir_writeable /var/run; then
+ 		ebegin "Creating user login records"
+ 		cp /dev/null /var/run/utmp
++		chgrp utmp /var/run/utmp
++		chmod 0664 /var/run/utmp
+ 		if dir_writeable /var/log; then
+ 			logw=true
+ 			[ -e /var/log/wtmp ] || cp /dev/null /var/log/wtmp
+-			chmod 0644 /var/run/utmp /var/log/wtmp
++			chgrp utmp /var/log/wtmp
++			chmod 0664 /var/log/wtmp
+ 		fi
+ 		eend 0
+ 
+-- 
+1.6.0.2
+
diff --git a/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch b/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch
new file mode 100644
index 000000000000..f645f074d2d4
--- /dev/null
+++ b/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch
@@ -0,0 +1,442 @@
+From ca7651e9ee42b222ec4fd1b30f4e9ba8eb0ffc37 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Wed, 8 Oct 2008 16:56:47 +0100
+Subject: [PATCH] Clean up warnings regarding printf.
+
+---
+ src/libeinfo/einfo.h    |   66 ++++++++++++++++++++++------------------------
+ src/libeinfo/libeinfo.c |   63 ++++++++++++++++++++++----------------------
+ src/rc/rc-applets.c     |   11 ++++---
+ src/rc/runscript.c      |    2 +-
+ 4 files changed, 70 insertions(+), 72 deletions(-)
+
+diff --git a/src/libeinfo/einfo.h b/src/libeinfo/einfo.h
+index 3934b58..9c54e68 100644
+--- a/src/libeinfo/einfo.h
++++ b/src/libeinfo/einfo.h
+@@ -28,13 +28,11 @@
+ #define __EINFO_H__
+ 
+ #if defined(__GNUC__)
+-# define __EINFO_PRINTF  __attribute__ ((__format__ (__printf__, 1, 2)))
+-# define __EINFO_XPRINTF __attribute__ ((__noreturn__, __format__ (__printf__, 1, 2)))
+-# define __EEND_PRINTF   __attribute__ ((__format__ (__printf__, 2, 3)))
++# define EINFO_PRINTF(a, b)  __attribute__((__format__(__printf__, a, b)))
++# define EINFO_XPRINTF(a, b) __attribute__((__noreturn__,__format__(__printf__, a, b)))
+ #else
+-# define __EINFO_PRINTF
+-# define __EINFO_XPRINTF
+-# define __EEND_PRINTF
++# define EINFO_PRINTF(a, b)
++# define EINFO_XPRINTF(a, b)
+ #endif
+ 
+ #include <sys/types.h>
+@@ -42,12 +40,12 @@
+ 
+ /* Although OpenRC requires C99, linking to us should not. */
+ #ifdef restrict
+-# define __EINFO_RESTRICT restrict
++# define EINFO_RESTRICT restrict
+ #else
+ # ifdef __restrict
+-#  define __EINFO_RESTRICT __restrict
++#  define EINFO_RESTRICT __restrict
+ # else
+-#  define __EINFO_RESTRICT
++#  define EINFO_RESTRICT
+ # endif
+ #endif
+ 
+@@ -68,7 +66,7 @@ typedef enum
+ const char *ecolor(ECOLOR);
+ 
+ /*! @brief Writes to syslog. */
+-void elog(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
++void elog(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
+ 
+ /*!
+  * @brief Display informational messages.
+@@ -86,22 +84,22 @@ void elog(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
+  * The v suffix means only print if EINFO_VERBOSE is yes.
+  */
+ /*@{*/
+-int einfon(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-int ewarnn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-int eerrorn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-int einfo(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-int ewarn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-void ewarnx(const char * __EINFO_RESTRICT, ...) __EINFO_XPRINTF;
+-int eerror(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-void eerrorx(const char * __EINFO_RESTRICT, ...) __EINFO_XPRINTF;
+-
+-int einfovn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-int ewarnvn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-int ebeginvn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-int eendvn(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
+-int ewendvn(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
+-int einfov(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-int ewarnv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
++int einfon(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++int ewarnn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++int eerrorn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++int einfo(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++int ewarn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++void ewarnx(const char * __EINFO_RESTRICT, ...) EINFO_XPRINTF(1, 2);
++int eerror(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++void eerrorx(const char * __EINFO_RESTRICT, ...) EINFO_XPRINTF(1, 2);
++
++int einfovn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++int ewarnvn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++int ebeginvn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++int eendvn(int, const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
++int ewendvn(int, const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
++int einfov(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++int ewarnv(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
+ /*@}*/
+ 
+ /*! @ingroup ebegin
+@@ -109,8 +107,8 @@ int ewarnv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+  *
+  * Similar to einfo, but we add ... to the end of the message */
+ /*@{*/
+-int ebeginv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+-int ebegin(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
++int ebeginv(const char * EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
++int ebegin(const char * EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
+ /*@}*/
+ 
+ /*! @ingroup eend
+@@ -122,12 +120,12 @@ int ebegin(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
+  *
+  * ebracket allows you to specifiy the position, color and message */
+ /*@{*/
+-int eend(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
+-int ewend(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
+-void ebracket(int, ECOLOR, const char * __EINFO_RESTRICT);
++int eend(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
++int ewend(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
++void ebracket(int, ECOLOR, const char * EINFO_RESTRICT);
+ 
+-int eendv(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
+-int ewendv(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
++int eendv(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
++int ewendv(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
+ /*@}*/
+ 
+ /*! @ingroup eindent
+@@ -141,7 +139,7 @@ void eindentv(void);
+ void eoutdentv(void);
+ 
+ /*! @brief Prefix each einfo line with something */
+-void eprefix(const char * __EINFO_RESTRICT);
++void eprefix(const char * EINFO_RESTRICT);
+ 
+ __END_DECLS
+ #endif
+diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
+index a5977b7..7dd2ef6 100644
+--- a/src/libeinfo/libeinfo.c
++++ b/src/libeinfo/libeinfo.c
+@@ -316,7 +316,7 @@ tgoto(const char *cap, int a, int b)
+ #endif
+ 
+ static bool
+-colour_terminal(FILE * __EINFO_RESTRICT f)
++colour_terminal(FILE * EINFO_RESTRICT f)
+ {
+ 	static int in_colour = -1;
+ 	char *e, *ee, *end, *d, *p;
+@@ -460,7 +460,7 @@ colour_terminal(FILE * __EINFO_RESTRICT f)
+ }
+ 
+ static int
+-get_term_columns(FILE * __EINFO_RESTRICT stream)
++get_term_columns(FILE * EINFO_RESTRICT stream)
+ {
+ 	struct winsize ws;
+ 	char *env = getenv("COLUMNS");
+@@ -480,14 +480,14 @@ get_term_columns(FILE * __EINFO_RESTRICT stream)
+ }
+ 
+ void
+-eprefix(const char *__EINFO_RESTRICT prefix)
++eprefix(const char *EINFO_RESTRICT prefix)
+ {
+ 	_eprefix = prefix;
+ }
+ hidden_def(eprefix)
+ 
+-static void
+-elogv(int level, const char *__EINFO_RESTRICT fmt, va_list ap)
++static void EINFO_PRINTF(2, 0)
++elogv(int level, const char *EINFO_RESTRICT fmt, va_list ap)
+ {
+ 	char *e = getenv("EINFO_LOG");
+ 	va_list apc;
+@@ -503,7 +503,7 @@ elogv(int level, const char *__EINFO_RESTRICT fmt, va_list ap)
+ }
+ 
+ void
+-elog(int level, const char *__EINFO_RESTRICT fmt, ...)
++elog(int level, const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	va_list ap;
+ 
+@@ -514,7 +514,7 @@ elog(int level, const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(elog)
+ 
+ static int
+-_eindent(FILE * __EINFO_RESTRICT stream)
++_eindent(FILE * EINFO_RESTRICT stream)
+ {
+ 	char *env = getenv("EINFO_INDENT");
+ 	int amount = 0;
+@@ -538,7 +538,7 @@ _eindent(FILE * __EINFO_RESTRICT stream)
+ }
+ 
+ static const char *
+-_ecolor(FILE * __EINFO_RESTRICT f, ECOLOR color)
++_ecolor(FILE * EINFO_RESTRICT f, ECOLOR color)
+ {
+ 	unsigned int i;
+ 
+@@ -575,9 +575,8 @@ ecolor(ECOLOR color)
+ 	setenv("EINFO_LASTCMD", _cmd, 1); \
+ }
+ 
+-static int
+-_einfo(FILE *f, ECOLOR color, const char *__EINFO_RESTRICT fmt, va_list va)
+-
++static int EINFO_PRINTF(3, 0)
++_einfo(FILE *f, ECOLOR color, const char *EINFO_RESTRICT fmt, va_list va)
+ {
+ 	int retval = 0;
+ 	char *last = getenv("EINFO_LASTCMD");
+@@ -605,7 +604,7 @@ _einfo(FILE *f, ECOLOR color, const char *__EINFO_RESTRICT fmt, va_list va)
+ #define _eerrorvn(fmt, ap) _einfo(stderr, ECOLOR_BAD, fmt, ap)
+ 
+ int
+-einfon(const char *__EINFO_RESTRICT fmt, ...)
++einfon(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -621,7 +620,7 @@ einfon(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(einfon)
+ 
+ int
+-ewarnn(const char *__EINFO_RESTRICT fmt, ...)
++ewarnn(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -637,7 +636,7 @@ ewarnn(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(ewarnn)
+ 
+ int
+-eerrorn(const char *__EINFO_RESTRICT fmt, ...)
++eerrorn(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -651,7 +650,7 @@ eerrorn(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(eerrorn)
+ 
+ int
+-einfo(const char *__EINFO_RESTRICT fmt, ...)
++einfo(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -668,7 +667,7 @@ einfo(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(einfo)
+ 
+ int
+-ewarn(const char *__EINFO_RESTRICT fmt, ...)
++ewarn(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -686,7 +685,7 @@ ewarn(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(ewarn)
+ 
+ void
+-ewarnx(const char *__EINFO_RESTRICT fmt, ...)
++ewarnx(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -703,7 +702,7 @@ ewarnx(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(ewarnx)
+ 
+ int
+-eerror(const char *__EINFO_RESTRICT fmt, ...)
++eerror(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -721,7 +720,7 @@ eerror(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(eerror)
+ 
+ void
+-eerrorx(const char *__EINFO_RESTRICT fmt, ...)
++eerrorx(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	va_list ap;
+ 
+@@ -737,7 +736,7 @@ eerrorx(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(eerrorx)
+ 
+ int
+-ebegin(const char *__EINFO_RESTRICT fmt, ...)
++ebegin(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -756,7 +755,7 @@ ebegin(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(ebegin)
+ 
+ static void
+-_eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
++_eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
+ {
+ 	int i;
+ 	int cols;
+@@ -790,8 +789,8 @@ _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
+ 	}
+ }
+ 
+-static int
+-_do_eend(const char *cmd, int retval, const char *__EINFO_RESTRICT fmt, va_list ap)
++static int EINFO_PRINTF(3, 0)
++_do_eend(const char *cmd, int retval, const char *EINFO_RESTRICT fmt, va_list ap)
+ {
+ 	int col = 0;
+ 	FILE *fp = stdout;
+@@ -814,7 +813,7 @@ _do_eend(const char *cmd, int retval, const char *__EINFO_RESTRICT fmt, va_list
+ }
+ 
+ int
+-eend(int retval, const char *__EINFO_RESTRICT fmt, ...)
++eend(int retval, const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	va_list ap;
+ 
+@@ -829,7 +828,7 @@ eend(int retval, const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(eend)
+ 
+ int
+-ewend(int retval, const char *__EINFO_RESTRICT fmt, ...)
++ewend(int retval, const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	va_list ap;
+ 
+@@ -897,7 +896,7 @@ void eoutdent(void)
+ hidden_def(eoutdent)
+ 
+ int
+-einfovn(const char *__EINFO_RESTRICT fmt, ...)
++einfovn(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -913,7 +912,7 @@ einfovn(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(einfovn)
+ 
+ int
+-ewarnvn(const char *__EINFO_RESTRICT fmt, ...)
++ewarnvn(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -929,7 +928,7 @@ ewarnvn(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(ewarnvn)
+ 
+ int
+-einfov(const char *__EINFO_RESTRICT fmt, ...)
++einfov(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -946,7 +945,7 @@ einfov(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(einfov)
+ 
+ int
+-ewarnv(const char *__EINFO_RESTRICT fmt, ...)
++ewarnv(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -963,7 +962,7 @@ ewarnv(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(ewarnv)
+ 
+ int
+-ebeginv(const char *__EINFO_RESTRICT fmt, ...)
++ebeginv(const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	int retval;
+ 	va_list ap;
+@@ -983,7 +982,7 @@ ebeginv(const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(ebeginv)
+ 
+ int
+-eendv(int retval, const char *__EINFO_RESTRICT fmt, ...)
++eendv(int retval, const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	va_list ap;
+ 
+@@ -998,7 +997,7 @@ eendv(int retval, const char *__EINFO_RESTRICT fmt, ...)
+ hidden_def(eendv)
+ 
+ int
+-ewendv(int retval, const char *__EINFO_RESTRICT fmt, ...)
++ewendv(int retval, const char *EINFO_RESTRICT fmt, ...)
+ {
+ 	va_list ap;
+ 
+diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c
+index f5892f9..eea4a01 100644
+--- a/src/rc/rc-applets.c
++++ b/src/rc/rc-applets.c
+@@ -84,8 +84,8 @@ static int do_e(int argc, char **argv)
+ 	int level = 0;
+ 	struct timespec ts;
+ 	struct timeval stop, now;
+-	int (*e) (const char *, ...) __EINFO_PRINTF = NULL;
+-	int (*ee) (int, const char *, ...) __EEND_PRINTF = NULL;
++	int (*e) (const char *, ...) EINFO_PRINTF(1, 2) = NULL;
++	int (*ee) (int, const char *, ...) EINFO_PRINTF(2, 3) = NULL;
+ 
+ 	/* Punt applet */
+ 	argc--;
+@@ -205,9 +205,10 @@ static int do_e(int argc, char **argv)
+ 		ee = eend;
+ 	else if (strcmp(applet, "ewend") == 0)
+ 		ee = ewend;
+-	else if (strcmp(applet, "esyslog") == 0)
+-		ee = elog;
+-	else if (strcmp(applet, "veinfo") == 0)
++	else if (strcmp(applet, "esyslog") == 0) {
++		elog(retval, "%s", message);
++		retval = 0;
++	} else if (strcmp(applet, "veinfo") == 0)
+ 		e = einfov;
+ 	else if (strcmp(applet, "veinfon") == 0)
+ 		e = einfovn;
+diff --git a/src/rc/runscript.c b/src/rc/runscript.c
+index c04f967..211beff 100644
+--- a/src/rc/runscript.c
++++ b/src/rc/runscript.c
+@@ -556,7 +556,7 @@ static bool svc_wait(const char *svc)
+ static RC_SERVICE svc_status(void)
+ {
+ 	char status[10];
+-	int (*e) (const char *fmt, ...) __EINFO_PRINTF = einfo;
++	int (*e) (const char *fmt, ...) EINFO_PRINTF(1, 2) = einfo;
+ 	RC_SERVICE state = rc_service_state(service);
+ 
+ 	if (state & RC_SERVICE_STOPPING) {
+-- 
+1.6.0.2
+
diff --git a/sys-apps/openrc/files/openrc-0.2.4-start-nodep.patch b/sys-apps/openrc/files/openrc-0.2.4-start-nodep.patch
deleted file mode 100644
index 2613bbc1421b..000000000000
--- a/sys-apps/openrc/files/openrc-0.2.4-start-nodep.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/rc/runscript.c b/src/rc/runscript.c
-index 7b87c27..e234b76 100644
---- a/src/rc/runscript.c
-+++ b/src/rc/runscript.c
-@@ -877,11 +877,13 @@ static void svc_start(bool deps)
- 	}
- 
- 	/* Do the same for any services we provide */
--	tmplist = rc_deptree_depend(deptree, "iprovide", applet);
--	if (tmplist) {
--		TAILQ_FOREACH(svc, tmplist, entries) {
--			services = rc_services_scheduled(svc->value);
--			if (services) {
-+	if (deptree) {
-+		tmplist = rc_deptree_depend(deptree, "iprovide", applet);
-+		if (tmplist) {
-+			TAILQ_FOREACH(svc, tmplist, entries) {
-+				services = rc_services_scheduled(svc->value);
-+				if (! services)
-+					continue;
- 				TAILQ_FOREACH(svc2, services, entries)
- 					if (rc_service_state(svc2->value) & RC_SERVICE_STOPPED)
- 						service_start(svc2->value);
diff --git a/sys-apps/openrc/openrc-0.3.0.ebuild b/sys-apps/openrc/openrc-0.3.0-r1.ebuild
index c5a74bb7ad2c..f00a8f5f1c4b 100644
--- a/sys-apps/openrc/openrc-0.3.0.ebuild
+++ b/sys-apps/openrc/openrc-0.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.3.0.ebuild,v 1.1 2008/10/06 16:56:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.3.0-r1.ebuild,v 1.1 2008/10/08 16:19:11 cardoe Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs