Update ChangeLog

Remove the IFS manipulation and simplify the loop that processes the
settings.

ChangeLog

@@ -1,3 +1,131 @@
+commit d3f419900504b37aeda79b1bca68ac150d81efd6
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    agetty.in: allow status to be displayed
+
+commit dc071dfacd23686dd3ae7168c60193618e36f0fa
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon: fix off-by-one error
+
+commit 42cd8115b94525cad2f70a14cc14862e88c779be
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.35.5
+
+commit d46beb28c4fec99253542442ecacf59499e3159f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit f1c98888d8429a484b4f37930998e82ef18e8657
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Use _BSD_SOURCE on FreeBSD
+
+commit c2a90b832685f9abdf710ab740181a8b935f862a
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Remove _XOPEN_SOURCE macros from builds
+
+commit 53f5b6d894723d034ba520853a9e5484488a2294
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man: document default retry specification for supervise-daemon
+
+commit 0a50cc494a6e743712102c705e404faffcbcb110
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man: document default retry sppecification for start-stop-daemon
+
+commit f2a9891d7f7f01cb9d9e9cffa36cdfc8116f8295
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.35.4
+
+commit 5df7ee056458f849626b7a2c30ad0e27e62d8d33
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit b731c02a389303dfba30a4b6c44efd0c2540bf66
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Clean up cgroups v2 code
+    
+    Remove the IFS manipulation and simplify the loop that processes the
+    settings.
+
+commit c42916ea199c0eab35c6c0a72d9a9f2a326144b0
+Author: Scall <Scall@users.noreply.github.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d: swap should always be started after root
+    
+    Otherwise if a swap file is being used, and swap is started before
+    root, swapon may fail because of a read-only filesystem.
+
+commit f973354ccdcf4d94b19f08c68a14b2a004668c72
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.35.3
+
+commit 69349f7b57116572b95874c754b2ef87c552cf0d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit 1b1a70ecca43034cb0770e18e287ccbca9f1eb52
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.35.2
+
+commit 05cfbb8348cf92bcc2edd922af1dc0a4c4c2e1f4
+Author: Chris Cromer <cromerc@users.noreply.github.com>
+Commit: Doug Freed <dwfreed@mtu.edu>
+
+    openrc-run: fix memory size (#213)
+    
+    Fixes #212
+
+commit a70b65f851c4f79e4fd43440d500d23cbf4b4a89
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit 0660d2455d461d648cf45076cf63b1c03e8e24c0
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix build on FreeBSD
+
+commit 01c5b98d3842c8142891d4b88f21823f4042f594
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.35.1
+
+commit f62975a1f8c4d5d4abdf78d8cad5509216138f03
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
 commit 5bb6f9aa318a6d0507971b74d88c3fd2803bae4b
 Author: Jason Zaman <jason@perfinion.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
@@ -1774,73 +1902,3 @@ Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
     update news file
-
-commit c333707cba356f4cacfd58a6fcc78f7c073dddcd
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Remove all occurances of 'before *' from dependencies
-    
-    Using wildcards in dependencies causes issues when rc_parallel is set to
-    yes because it can lead to deadlocks.
-    All dependencies need to be explicit rather than implicit.
-    
-    This is the first stage of moving this direction.
-
-commit 5f5b1f7cbefd0bc14352e86a9c33260266f98d9b
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysfs.in: efivarfs tweaks
-    
-    Since we check for /sys/firmware/efi/efivars, we do not need to check
-    for /sys/firmware/efi
-    
-    Since Failing to mount efivarfs is not critical, we silence the error
-    message from mount.
-
-commit cfdf56475e600f79a433cd721cadf39114c6c58d
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    version 0.25
-
-commit fde3902d069dfdce9c59555186a5541d6d99c8aa
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    update ChangeLog
-
-commit d7bbb0f5830e1ec4df1ec52714d70ac6b0a81878
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    add agetty service
-    
-    The agetty service is an alternate way to manage gettys with agetty
-    under Linux which is separate from an external init system.
-
-commit 21ca2b746cce67e2b3578fb7015c9d4c243e3a0c
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysfs: drop modules completely from the dependencies
-    
-    This is for #112.
-
-commit 6a79aef0159d7035778fd852b26ecfac903cd029
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysfs: Do not load efivarfs module
-    
-    My understanding is that the kernel can autoload this module. If it
-    doesn't, the module should be built in or loaded from an initramfs.
-    
-    This fixes https://github.com/openrc/openrc/pulls/112.
-
-commit 4a269674b765e5267f024fa55c8644480a7304ea
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    make sure netmount and localmount start after root

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.35
+VERSION=	0.35.5
 PKG=		${NAME}-${VERSION}

init.d/agetty.in

@@ -16,7 +16,6 @@ term_type="${term_type:-linux}"
 command=/sbin/agetty
 command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
 pidfile="/run/${RC_SVCNAME}.pid"
-export EINFO_QUIET="${quiet:-yes}"
 
 depend() {
 	after local
@@ -29,5 +28,12 @@ start_pre() {
 		eerror "symbolic links to it for the ports you want to start"
 		eerror "agetty on and add those to the appropriate runlevels."
 		return 1
+	else
+		export EINFO_QUIET="${quiet:-yes}"
 	fi
 }
+
+stop_pre()
+{
+	export EINFO_QUIET="${quiet:-yes}"
+}

init.d/swap.in

@@ -11,7 +11,7 @@
 
 depend()
 {
-	after clock
+	after clock root
 	before localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

man/start-stop-daemon.8

@@ -151,6 +151,7 @@ These options are only used for stopping daemons:
 .It Fl R , -retry Ar timeout | Ar signal Ns / Ns Ar timeout
 The retry specification can be either a timeout in seconds or multiple
 signal/timeout pairs (like SIGTERM/5).
+If this option is not given, the default is SIGTERM/5.
 .El
 .Sh ENVIRONMENT
 .Va SSD_IONICELEVEL

man/supervise-daemon.8

@@ -120,6 +120,7 @@ description of --respawn-max for more information.
 .It Fl R , -retry Ar timeout | Ar signal Ns / Ns Ar timeout
 The retry specification can be either a timeout in seconds or multiple
 signal/timeout pairs (like SIGTERM/5).
+If this option is not given, the default is SIGTERM/5.
 .It Fl r , -chroot Ar path
 chroot to this directory before starting the daemon. All other paths, such
 as the path to the daemon, chdir and pidfile, should be relative to the chroot.

mk/os-FreeBSD.mk

@@ -11,3 +11,5 @@
 # Generic definitions
 
 include ${MK}/os-BSD.mk
+
+CPPFLAGS+=	-D_BSD_SOURCE

mk/os-GNU-kFreeBSD.mk

@@ -13,6 +13,6 @@
 SFX=		.GNU-kFreeBSD.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700
+CPPFLAGS+=	-D_BSD_SOURCE
 LIBDL=		-Wl,-Bdynamic -ldl
 LIBKVM?=

mk/os-GNU.mk

@@ -11,5 +11,5 @@
 SFX=		.GNU.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
+CPPFLAGS+=	-D_DEFAULT_SOURCE -DMAXPATHLEN=4096 -DPATH_MAX=4096
 LIBDL=		-Wl,-Bdynamic -ldl

mk/os-Linux.mk

@@ -11,7 +11,7 @@
 SFX=		.Linux.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
+CPPFLAGS+=	-D_DEFAULT_SOURCE
 LIBDL=		-Wl,-Bdynamic -ldl
 
 ifeq (${MKSELINUX},yes)

sh/rc-cgroup.sh.in

@@ -184,18 +184,17 @@ cgroup2_set_limits()
 	cgroup_path="$(cgroup2_find_path)"
 	[ -d "${cgroup_path}" ] || return 0
 	rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}"
-	local OIFS="$IFS"
-	IFS="
-"
 	[ ! -d "${rc_cgroup_path}" ] && mkdir "${rc_cgroup_path}"
-	printf "%d" 0 > "${rc_cgroup_path}/cgroup.procs"
+	[ -f "${rc_cgroup_path}"/cgroup.procs ] &&
-	echo "${rc_cgroup_settings}" | while IFS="$OIFS" read -r key value; do
+		printf 0 > "${rc_cgroup_path}"/cgroup.procs
-		[ -z "${key}" ] || [ -z "${value}" ] && continue
+	[ -z "${rc_cgroup_settings}" ] && return 0
-		[ ! -e "${rc_cgroup_path}/${key}" ] && continue
+	echo "${rc_cgroup_settings}" | while read -r key value; do
-		veinfo "${RC_SVCNAME}: cgroups: ${key} ${value}"
+		[ -z "${key}" ] && continue
-		printf "%s" "${value}" > "${rc_cgroup_path}/${key}"
+		[ -z "${value}" ] && continue
+		[ ! -f "${rc_cgroup_path}/${key}" ] && continue
+		veinfo "${RC_SVCNAME}: cgroups: setting ${key} to ${value}"
+		printf "%s\n" "${value}" > "${rc_cgroup_path}/${key}"
 	done
-	IFS="$OIFS"
 	return 0
 }
 

src/rc/openrc-run.c

@@ -1152,7 +1152,7 @@ int main(int argc, char **argv)
 	}
 	lnk = xmalloc(4096);
 	memset(lnk, 0, 4096);
-	if (readlink(argv[1], lnk, sizeof(lnk)-1)) {
+	if (readlink(argv[1], lnk, 4096)) {
 		dir = dirname(path);
 		if (strchr(lnk, '/')) {
 			save = xstrdup(dir);

src/rc/supervise-daemon.c

@@ -232,8 +232,8 @@ static char *make_cmdline(char **argv)
 
 	for (c = argv; c && *c; c++)
 		len += (strlen(*c) + 1);
-	cmdline = xmalloc(len);
+	cmdline = xmalloc(len+1);
-	memset(cmdline, 0, len);
+	memset(cmdline, 0, len+1);
 	for (c = argv; c && *c; c++) {
 		strcat(cmdline, *c);
 		strcat(cmdline, " ");