update changelog

ChangeLog

@@ -1,3 +1,33 @@
+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.1
 PKG=		${NAME}-${VERSION}

src/rc/Makefile

@@ -75,7 +75,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,7 +104,10 @@ 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
+ifeq (${MKSELINUX},yes)
+openrc rc: rc-selinux.o
+endif
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o

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