version 0.44.8

X-Gentoo-Bug: 821520
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=821520

.cirrus.yml

@@ -4,7 +4,8 @@
 test_task:
   freebsd_instance:
     matrix:
-      image: freebsd-12-1-release-amd64
+      image: freebsd-13-0-release-amd64
+      image: freebsd-12-2-release-amd64
       image: freebsd-11-4-release-amd64
   env:
     OS: FreeBSD

.github/workflows/ci-alpine-linux.yml

@@ -0,0 +1,26 @@
+name: ci_alpine_linux
+
+on: [push, pull_request]
+
+jobs:
+
+  gcc-musl:
+    runs-on: ubuntu-latest
+    container: alpine:latest
+    steps:
+      - name: install deps
+        run: >-
+          apk --no-cache add \
+            build-base \
+            meson \
+            pkgconf \
+            linux-pam \
+            linux-pam-dev
+      - name: checkout
+        uses: actions/checkout@v2
+      - run: meson setup builddir/
+        env:
+          CC: gcc
+      - run: ninja -C builddir
+        env:
+          CC: gcc

.github/workflows/ci-ubuntu.yml

@@ -0,0 +1,32 @@
+name: ci_ubuntu
+
+on: [push, pull_request]
+
+jobs:
+
+  gcc-glibc:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo apt-get update -q
+    - run: sudo apt-get install -q -y build-essential libpam-dev meson
+    - run: meson setup builddir/
+      env:
+        CC: gcc
+    - run: ninja -C builddir
+      env:
+        CC: gcc
+
+
+  clang-glibc:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo apt-get update -q
+    - run: sudo apt-get install -q -y build-essential clang libpam-dev meson
+    - run: meson setup builddir/
+      env:
+        CC: clang
+    - run: ninja -C builddir
+      env:
+        CC: clang

ChangeLog

@@ -1,3 +1,171 @@
+commit a850651f5ce29a37574f7d76ae40ef9e1d2d4a62
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    openrc-init: fix build for selinux
+    
+    X-Gentoo-Bug: 821520
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=821520
+
+commit b0a80a042d20d3d0ee4d204c5c96e1538a65575f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    build: pam fix
+    
+    Set the HAVE_PAM option if the dependency is found *and* pam is
+    requested.
+    
+    X-Gentoo-Bug: 821211
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=821211
+
+commit 49620e95ec8ecd5d91c554d8e50cdf65df1920b5
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix permission of installed version file
+
+commit b4789b99104f08136ad160920388b8d4df000508
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.44.7
+
+commit d5ae8a2ad1b66f4f20609b3eadf9968b36133f7a
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
+commit 3a276728e079aa9f44ab19cf5858e1eac2670462
+Author: Kerin Millar <kfm@plushkava.net>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/s6-svscan.in: make sure $command exists
+    
+    While the s6-svscan runscript belongs to OpenRC, the user is required to
+    install s6 before it can actually be used, potentially leading to
+    confusion. Check for the existence of $command in start_pre and, if it does not
+    exist, bail out with an error that makes this observation.
+    
+    X-Gentoo-Bug: 816978
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=816978
+
+commit 29d3e0bde237e13f8c5083d2f0db50652061bf2c
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    selinux build fix
+
+commit 969a0362252a7f9459337ac564ebf5f0c2c74476
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix bug in pam build tests
+
+commit 9767d24510e1d52b86a2051c25af2fa5928e7319
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    support older pam versions
+    
+    Some distros are still using versions of pam which do not create
+    *.pc files, so we need fallback logic for that situation.
+
+commit c73284ef963cd6b3c47dd007a45f5c13c5dafcb0
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    build: fix pam and pam_misc dependencies
+    
+    Pam generates pkgconfig files now, so meson can use them to find the pam
+    dependencies.
+
+commit 0657bf0d25a460b4b56579984eb326302f3bf121
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    separate github actions based on OS
+    
+    This fixes #466.
+
+commit 80aad11b02d575d5a949914bb6942b92fc15e834
+Author: Sam James <sam@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add github action to build on several linux platforms
+    
+    This github action runs a build on each of the following platforms on a
+    push or pull request.
+    
+    - Ubuntu LTS with gcc and glibc
+    - Ubuntu LTS with clang and glibc
+    - Alpine with gcc and musl
+    
+    This fixes #463.
+
+commit 2d9dc654b58c4a523b01097369ce94708c8cf43a
+Author: Sam James <sam@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    .cirrus.yml: update FreeBSD images
+
+commit f46cc83ef7100ce713c4e616524e63371825e153
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    move rc_bindir and rc_sbindir definitions to the top level
+
+commit cc45b55f895d0c21b5ac3e5a65b0bf00f76adeb7
+Author: Sam James <sam@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    checkpath: fix allocation size of path buffer
+    
+    strlen's return value isn't enough to be used
+    directly for (x)malloc; it doesn't include
+    the null byte at the end of the string.
+    
+    X-Gentoo-Bug: 816900
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/816900
+    Fixes: #459
+    Fixes: #462
+
+commit 930e69017f95766c662763c2445e2827eb037fd7
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.44.6
+
+commit 44912434cfe139a1953bbd3b2cde7e0b2bce0ae7
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
+commit c7fde9a3dab01d30d16f9907f7cce00799f92821
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix build for selinux
+    
+    I would like to thank jpds@protonmail.com for the patch.
+    
+    X-Gentoo-Bug: 815847
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=815847
+
+commit ffededbf955e39add0fbbacc22f2c0d7a8901b35
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.44.5
+
+commit b0efb663f9ed84627c302a2d051fc5a74fb0c2b6
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
 commit aa69e48125df7684ab3b77eaf9013f8c126b1fca
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
@@ -895,17 +1063,3 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     command line, but keep in mind that this is not secure.
     
     This fixes #201.
-
-commit aac1734a70b60da97d4d24930f1902ca46894b44
-Author: Julien Surloppe <julien@surloppe.fr>
-Commit: Mike Frysinger <vapier@gmail.com>
-
-    Update user-guide.md
-    
-    Add missing underscore.
-
-commit 2355f1a3f2a4fd62cac6d9af0e94c8731acd4c0f
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    supervise-daemon: only log debug logs when verbose mode is active

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.44.5
+VERSION=	0.44.8
 PKG=		${NAME}-${VERSION}

init.d/s6-svscan.in

@@ -21,9 +21,13 @@ depend()
 
 start_pre()
 {
-	einfo "Creating s6 scan directory"
-	checkpath -d -m 0755 "$RC_SVCDIR"/s6-scan
-	return $?
+	if [ ! -e "$command" ]; then
+		eerror "$command is missing (please install s6)"
+	else
+		einfo "Creating s6 scan directory"
+		checkpath -d -m 0755 "$RC_SVCDIR"/s6-scan
+	fi
+	return
 }
 
 stop_post()

meson.build

@@ -1,5 +1,5 @@
 project('OpenRC', 'c',
-  version : '0.44.5',
+  version : '0.44.8',
   license: 'BSD-2',
   default_options : [
     'c_std=c99',
@@ -42,17 +42,20 @@ else
   os = option_os
 endif
 
-pam = get_option('pam')
-if pam
-  libpam = cc.find_library('pam')
-  libpam_misc = cc.find_library('pam_misc')
+pam_dep = dependency('pam', required: false)
+if not pam_dep.found()
+  pam_dep = cc.find_library('pam', required: false)
+endif
+if pam_dep.found() and get_option('pam')
   cc_pam_flags = '-DHAVE_PAM'
 else
-  libpam = []
-  libpam_misc = []
   cc_pam_flags = []
 endif
 
+if not pam_dep.found() and get_option('pam')
+  error('Pam was requested but could not be located')
+  endif
+
 option_pkg_prefix = get_option('pkg_prefix')
 if option_pkg_prefix == ''
   if os == 'Dragonfly' or os == 'FreeBSD'
@@ -86,13 +89,25 @@ if os == 'Linux' and libexecdir == 'libexec'
 endif
 libexecdir = rootprefix / libexecdir
 rc_libexecdir = libexecdir / 'rc'
+rc_bindir = rc_libexecdir / 'bin'
+rc_sbindir = rc_libexecdir / 'sbin'
 sbindir = rootprefix / get_option('sbindir')
 
 selinux_dep = dependency('libselinux', required : get_option('selinux'))
 if selinux_dep.found()
   cc_selinux_flags = '-DHAVE_SELINUX'
-  else
+  if pam_dep.found() and get_option('pam')
+    pam_misc_dep = dependency('pam_misc', required: false)
+    if not pam_misc_dep.found()
+      pam_misc_dep = cc.find_library('pam_misc', required: false)
+    endif
+    if not pam_misc_dep.found() and get_option('pam')
+      error('Pam was requested but could not be located')
+    endif
+  endif
+else
   cc_selinux_flags = []
+  pam_misc_dep = []
 endif
 
 termcap = get_option('termcap')

src/rc/checkpath.c

@@ -151,7 +151,7 @@ static char *clean_path(char *path)
 	char *ch;
 	char *ch2;
 	char *str;
-	str = xmalloc(strlen(path));
+	str = xmalloc(strlen(path) + 1);
 	ch = path;
 	ch2 = str;
 	while (true) {

src/rc/meson.build

@@ -14,7 +14,7 @@ usage_c = files([
   '_usage.c',
   ])
 
-if get_option('selinux').enabled()
+if selinux_dep.found()
   rc_selinux_c = files([
     'rc-selinux.c',
     ])
@@ -26,9 +26,6 @@ rc_wtmp_c = files([
   'rc-wtmp.c',
   ])
 
-rc_bindir = rc_libexecdir / 'bin'
-rc_sbindir = rc_libexecdir / 'sbin'
-
 executable('rc-status',
   ['rc-status.c', rc_misc_c, usage_c, version_h],
   c_args : cc_branding_flags,
@@ -53,7 +50,7 @@ executable('openrc-run',
   rc_selinux_c, version_h],
   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
   link_with: [libeinfo, librc],
-  dependencies: [audit_dep, dl_dep, libpam, libpam_misc, selinux_dep, util_dep],
+  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, selinux_dep, util_dep],
   include_directories: [incdir, einfo_incdir, rc_incdir],
   install: true,
   install_dir: sbindir)
@@ -88,7 +85,7 @@ executable('runscript',
     rc_selinux_c, version_h],
   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
   link_with: [libeinfo, librc],
-  dependencies: [audit_dep, dl_dep, libpam, util_dep, selinux_dep],
+  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep],
   include_directories: [incdir, einfo_incdir, rc_incdir],
   install: true,
   install_dir: sbindir)
@@ -98,7 +95,7 @@ executable('start-stop-daemon',
 	rc_selinux_c, usage_c, version_h],
   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
   link_with: [libeinfo, librc],
-  dependencies: [dl_dep, libpam, util_dep, selinux_dep],
+  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep],
   include_directories: [incdir, einfo_incdir, rc_incdir],
   install: true,
   install_dir: sbindir)
@@ -108,7 +105,7 @@ executable('supervise-daemon',
     usage_c, version_h],
   c_args : [cc_branding_flags, cc_pam_flags, cc_selinux_flags],
   link_with: [libeinfo, librc],
-  dependencies: [dl_dep, libpam, util_dep, selinux_dep],
+  dependencies: [dl_dep, pam_dep, util_dep, selinux_dep],
   include_directories: [incdir, einfo_incdir, rc_incdir],
   install: true,
   install_dir: sbindir)
@@ -116,9 +113,10 @@ executable('supervise-daemon',
 if os == 'Linux'
   executable('openrc-init',
     ['openrc-init.c', rc_plugin_c, rc_wtmp_c, version_h],
+  c_args : cc_selinux_flags,
     include_directories: [incdir, einfo_incdir, rc_incdir],
     link_with: [libeinfo, librc],
-    dependencies: [dl_dep],
+    dependencies: [dl_dep, selinux_dep],
     install: true,
     install_dir: sbindir)
 
@@ -171,7 +169,7 @@ executable('checkpath',
   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
   include_directories: [incdir, einfo_incdir, rc_incdir],
   link_with: [libeinfo, librc],
-  dependencies: [libpam, selinux_dep],
+  dependencies: [audit_dep, pam_dep, pam_misc_dep, selinux_dep],
   install: true,
   install_dir: rc_bindir)
 

tools/meson_final.sh

@@ -10,4 +10,4 @@ if [ ${os} != Linux ]; then
 	install -d "${DESTDIR}/${rc_libexecdir}"/init.d
 fi
 install -d "${DESTDIR}/${rc_libexecdir}"/tmp
-install "${MESON_BUILD_ROOT}/src/common/version" "${DESTDIR}/${rc_libexecdir}"
+install -m 644 "${MESON_BUILD_ROOT}/src/common/version" "${DESTDIR}/${rc_libexecdir}"