version 0.44.5

update ChangeLog
build: fix rootprefix
2021-09-21 11:21:17 -05:00 · 2021-09-21 11:12:35 -05:00 · 2021-09-21 11:10:36 -05:00 · 2021-09-18 17:06:19 -05:00 · 2021-09-18 17:06:19 -05:00
4 changed files with 45 additions and 13 deletions
--- a/32
+++ b/32
@@ -1,3 +1,35 @@
+commit aa69e48125df7684ab3b77eaf9013f8c126b1fca
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    build: fix rootprefix
+    
+    This fixes #438.
+
+commit 4ba10f1d5074a45b4ddd96d2d404842fa3b38e63
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    link runscript with audit
+
+commit 38a9e2ff630b0e0bd261afb2e66072f904b5d608
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    link openrc-run with audit and libpam_misc
+
+commit 783af5abac209c7745fd5c06dc89b2f5dfa3b313
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.44.4
+
+commit 75c3b53e3195f2d3541a7d83920667d1c4b14337
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
 commit c300c180a2a7dbefb46272c2acac6462372b8eb0
 Author: Natanael Copa <ncopa@alpinelinux.org>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.44.4
+VERSION=	0.44.5
 PKG=		${NAME}-${VERSION}
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('OpenRC', 'c',
-  version : '0.44.4',
+  version : '0.44.5',
  license: 'BSD-2',
  default_options : [
    'c_std=c99',
@@ -72,19 +72,19 @@ else
  split_usr = get_option('split-usr') == 'true'
 endif

-rootprefix_default = split_usr ? '/' : '/usr'
-rootprefix_path = get_option('rootprefix')
-rootprefix = rootprefix_path != '' ? rootprefix_path : rootprefix_default
+rootprefix = get_option('rootprefix')
+rootprefix_default = '/'
+if rootprefix == ''
+rootprefix = rootprefix_default
+endif

 bindir = rootprefix / get_option('bindir')
 libdir = rootprefix / get_option('libdir')
-if os == 'Linux' and split_usr
-  libexecpath = 'lib'
-else
-  libexecpath = get_option('libexecdir')
+libexecdir = get_option('libexecdir')
+if os == 'Linux' and libexecdir == 'libexec'
+  libexecdir = 'lib'
 endif
-libexecdir = split_usr ? rootprefix / libexecpath :
-  get_option('prefix') / libexecpath
+libexecdir = rootprefix / libexecdir
 rc_libexecdir = libexecdir / 'rc'
 sbindir = rootprefix / get_option('sbindir')

--- a/src/rc/meson.build
+++ b/src/rc/meson.build
@@ -53,7 +53,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: [dl_dep, libpam, selinux_dep, util_dep],
+  dependencies: [audit_dep, dl_dep, libpam, libpam_misc, selinux_dep, util_dep],
  include_directories: [incdir, einfo_incdir, rc_incdir],
  install: true,
  install_dir: sbindir)
@@ -88,7 +88,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: [dl_dep, libpam, util_dep, selinux_dep],
+  dependencies: [audit_dep, dl_dep, libpam, util_dep, selinux_dep],
  include_directories: [incdir, einfo_incdir, rc_incdir],
  install: true,
  install_dir: sbindir)
Author	SHA1	Message	Date
William Hubbs	ffededbf95	version 0.44.5	2021-09-21 11:21:17 -05:00
William Hubbs	b0efb663f9	update ChangeLog	2021-09-21 11:12:35 -05:00
William Hubbs	aa69e48125	build: fix rootprefix This fixes #438.	2021-09-21 11:10:36 -05:00
William Hubbs	4ba10f1d50	link runscript with audit	2021-09-18 17:06:19 -05:00
William Hubbs	38a9e2ff63	link openrc-run with audit and libpam_misc	2021-09-18 17:06:19 -05:00