WE 18

etc/meson.build

@@ -11,7 +11,25 @@ foreach dir : ['inc', 'net', 'profile-a-l', 'profile-m-z']
 endforeach
 
 if get_option('busybox-workaround')
-  #TODO: meson.add_install_script()
+  meson.add_install_script(sh.path(), '-e', '-c',
+'''
+disable_common_inc="$MESON_INSTALL_DESTDIR_PREFIX/$1/firejail/disable-common.inc"
+cat >"$disable_common_inc" <<\EOF
+# Workaround for systems where common UNIX utilities are symlinks to busybox.
+# If this is not your case you can remove -Dbusybox-workaround=true from
+# meson setup options, for added security.
+noblacklist ${PATH}/busybox
+noblacklist ${PATH}/crontab
+noblacklist ${PATH}/mount
+noblacklist ${PATH}/nc
+noblacklist ${PATH}/su
+noblacklist ${PATH}/sudo
+noblacklist ${PATH}/umount
+
+EOF
+cat >>"$disable_common_inc" <"$2"
+''', '--', sysconfdir, meson.current_source_dir() / 'inc/disable-common.inc',
+  )
 else
   install_data('inc/disable-common.inc',
     install_dir: sysconfdir / project_name,

src/bash_completion/meson.build

@@ -6,8 +6,7 @@ firejail_bash_completion = configure_file(
 custom_target('firejail.bash_completion',
   build_by_default: true,
   capture: true,
-  # BIG FAT FIXME: This will fail if -Dmanpage=false
-  command: [gawk, '-f', preproc_awk,  '--', facilities, '@INPUT@'],
+  command: preproc_awk_cmd,
   input: firejail_bash_completion,
   install: true,
   install_dir: bashcompletiondir,

src/man/meson.build

@@ -1,37 +1,37 @@
-preproc_awk = files('preproc.awk')
-
 # The kwarg env: of run_command is only supported by meson>=0.50
-month = run_command(sh, '-c', 'LC_ALL=C date -u +%b', check: true).stdout().strip()
-year = run_command(sh, '-c', 'LC_ALL=C date -u +%Y', check: true).stdout().strip()
+date = run_command(sh, '-c', 'LC_ALL=C date -u +%Y-%b',
+  check: true,
+).stdout().strip().split('-')
 
 manconf = configuration_data()
 manconf.set('VERSION', meson.project_version())
-manconf.set('MONTH', month)
-manconf.set('YEAR', year)
+manconf.set('YEAR', date[0])
+manconf.set('MONTH', date[1])
 
-manpages = {
-  'firecfg': '1',
-  'firejail-login': '5',
-  'firejail-profile': '5',
-  'firejail': '1',
-  'firejail-users': '5',
-  'firemon': '1',
-  'jailcheck': '1',
-}
+manpages = [
+  'firecfg.1',
+  'firejail-login.5',
+  'firejail-profile.5',
+  'firejail.1',
+  'firejail-users.5',
+  'firemon.1',
+  'jailcheck.1',
+]
 
-foreach manpage, section : manpages
+foreach manpage : manpages
+  section = manpage.split('.')[1]
   configured_manpage = configure_file(
     configuration: manconf,
-    input: manpage + '.txt',
+    input: manpage.split('.')[0] + '.txt',
     output: '@PLAINNAME@',
   )
-  custom_target(manpage + '.' + section,
+  custom_target(manpage,
     build_by_default: true,
     capture: true,
-    command: [gawk, '-f', preproc_awk,  '--', facilities, '@INPUT@'],
+    command: preproc_awk_cmd,
     input: configured_manpage,
     install: true,
     install_dir: get_option('mandir') / 'man' + section,
-    output: manpage + '.' + section,
+    output: manpage,
   )
 endforeach

src/meson.build

@@ -2,11 +2,14 @@
 # directly call the compiler. Therefore we need additional flags which
 # are set otherwise by meson.
 c_args_libtrace = ['-Wall', '-O2', '-shared', '-fPIC', '-Wl,-z,relro']
-#c_args_libtrace += ['-O' + get_option('optimization')]
 if get_option('werror')
   c_args_libtrace += ['-Werror']
 endif
 
+preproc_awk_cmd = [
+  gawk, '-f', files('man/preproc.awk'),  '--', facilities, '@INPUT@',
+]
+
 # # # # # # # # # #
 
 # APPS

src/zsh_completion/meson.build

@@ -6,8 +6,7 @@ firejail_zsh_completion = configure_file(
 custom_target('firejail.zsh_completion',
   build_by_default: true,
   capture: true,
-  # BIG FAT FIXME: This will fail if -Dmanpage=false
-  command: [gawk, '-f', preproc_awk,  '--', facilities, '@INPUT@'],
+  command: preproc_awk_cmd,
   input: firejail_zsh_completion,
   install: true,
   install_dir: zshcompletiondir,