update change log

We were attempting to include rc.h in rc-misc.h instead of the source
files where it should be included.

ChangeLog

@@ -1,3 +1,69 @@
+commit fb37e1aa96df351b1bf591dc36ef332f86820a2b
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    src/rc/Makefile: fix make depend target
+
+commit 8769cca71089983ad8a8a69cec852c6bc169248d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    include rc.h properly in source files
+    
+    We were attempting to include rc.h in rc-misc.h instead of the source
+    files where it should be included.
+
+commit 506f2887e13eb8093bbff0915381644c4c08fc5c
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix selinux build
+    
+    X-Gentoo-Bug: 571798
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=571798
+
+commit 83223a6e97ff2ed3a8b06c4794b55cdd1c61c657
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.20.2
+
+commit 2747f40f823c2d31b820f0525360532287c70eea
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update changelog
+
+commit 933972da532bdf23accaea68bd072fc723a4065d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix selinux build
+
+commit dbcb8ba3fe2ddce1052c6e0037c47e19d7c273aa
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Add LANG, LC_MESSAGES and TERM to the environment whitelist
+
+commit e462c3223ec71e4567916c74b7e02ec167d91819
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix seg fault
+
+commit 06f195ce37769fda1bbc2cfde13534abeb7f1176
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    increment version number
+
+commit 04f05c30d13ec83b85164a536eb570f29a66b275
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
 commit 9473ac514cb72663d5c3bac8b5473cced4a20bf7
 Author: joe9 <joe9mail@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.20
+VERSION=	0.20.2
 PKG=		${NAME}-${VERSION}

src/includes/rc-misc.h

@@ -26,7 +26,6 @@
 #include <unistd.h>
 
 #include "helpers.h"
-#include "rc.h"
 
 #define RC_LEVEL_BOOT           "boot"
 #define RC_LEVEL_DEFAULT        "default"

src/rc/Makefile

@@ -1,4 +1,9 @@
-SRCS=	rc.c 	rc-logger.c rc-misc.c rc-plugin.c
+SRCS=	checkpath.c do_e.c do_mark_service.c do_service.c \
+		do_value.c fstabinfo.c is_newer_than.c is_older_than.c \
+		mountinfo.c openrc-run.c rc-abort.c rc.c \
+		rc-depend.c rc-logger.c rc-misc.c rc-plugin.c \
+		rc-selinux.c rc-service.c rc-status.c rc-update.c \
+		shell_var.c start-stop-daemon.c swclock.c _usage.c
 
 ifeq (${MKSELINUX},yes)
 SRCS+=		rc-selinux.c
@@ -75,7 +80,10 @@ check test::
 
 all: ${ALL_PROGS}
 
-checkpath: checkpath.o _usage.o rc-misc.o rc-selinux.o
+checkpath: checkpath.o _usage.o rc-misc.o
+ifeq (${MKSELINUX},yes)
+checkpath: rc-selinux.o
+endif
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
@@ -101,10 +109,13 @@ mark_service_hotplugged mark_service_failed: do_mark_service.o rc-misc.o
 mountinfo: mountinfo.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o rc-selinux.o _usage.o
+openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o
+ifeq (${MKSELINUX},yes)
+openrc-run runscript: rc-selinux.o
+endif
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 rc-abort: rc-abort.o

src/rc/_usage.c

@@ -13,6 +13,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "rc.h"
 #include "rc-misc.h"
 #include "_usage.h"
 #include "version.h"

src/rc/checkpath.c

@@ -30,6 +30,7 @@
 #include <unistd.h>
 
 #include "einfo.h"
+#include "rc.h"
 #include "rc-misc.h"
 #include "rc-selinux.h"
 #include "_usage.h"

src/rc/do_value.c

@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include "einfo.h"
+#include "rc.h"
 #include "rc-misc.h"
 
 const char *applet = NULL;

src/rc/is_newer_than.c

@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "rc.h"
 #include "rc-misc.h"
 
 int main(int argc, char **argv)

src/rc/is_older_than.c

@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "rc.h"
 #include "rc-misc.h"
 
 int main(int argc, char **argv)

src/rc/rc-misc.c

@@ -53,6 +53,7 @@ rc_conf_yesno(const char *setting)
 static const char *const env_whitelist[] = {
 	"EERROR_QUIET", "EINFO_QUIET",
 	"IN_BACKGROUND", "IN_HOTPLUG",
+	"LANG", "LC_MESSAGES", "TERM",
 	NULL
 };
 
@@ -179,6 +180,8 @@ env_config(void)
 	sys = detect_container();
 	if (!sys)
 		sys = detect_vm();
+
+	if (sys)
 		setenv("RC_SYS", sys, 1);
 
 #ifdef PREFIX

src/rc/rc-selinux.c

@@ -15,8 +15,6 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#ifdef HAVE_SELINUX
-
 #include <stddef.h>
 #include <errno.h>
 #include <dlfcn.h>
@@ -386,5 +384,3 @@ out:
 	free(run_init_t);
 	free(curr_t);
 }
-
-#endif

src/rc/swclock.c

@@ -30,6 +30,7 @@
 #include <utime.h>
 
 #include "einfo.h"
+#include "rc.h"
 #include "rc-misc.h"
 #include "_usage.h"