Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions fapolicyd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ BuildRequires: libasan
Recommends: %{name}-selinux
%endif

Requires: file
Requires(pre): shadow-utils
Requires(post): systemd-units
Requires(preun): systemd-units
Expand Down Expand Up @@ -251,6 +252,7 @@ fi
%attr(755,root,root) %dir %{_datadir}/%{name}/sample-rules
%attr(644,root,root) %{_datadir}/%{name}/default-ruleset.known-libs
%attr(644,root,root) %{_datadir}/%{name}/sample-rules/*
%attr(644,root,root) %{_datadir}/%{name}/fapolicyd-magic
%attr(644,root,root) %{_datadir}/%{name}/fapolicyd-magic.mgc
%attr(750,root,%{name}) %dir %{_sysconfdir}/%{name}
%attr(750,root,%{name}) %dir %{_sysconfdir}/%{name}/trust.d
Expand Down
10 changes: 5 additions & 5 deletions init/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ sbin_SCRIPTS = fagenrules
completiondir = $(sysconfdir)/bash_completion.d/
dist_completion_DATA = fapolicyd.bash_completion

MAGIC = fapolicyd-magic.mgc
pkgdata_DATA = ${MAGIC}
CLEANFILES = ${MAGIC} fapolicyd.service
MAGIC = fapolicyd-magic
pkgdata_DATA = ${MAGIC} ${MAGIC}.mgc
CLEANFILES = ${MAGIC}.mgc fapolicyd.service

${MAGIC}: $(EXTRA_DIST)
file -C -m ${top_srcdir}/init/fapolicyd-magic
${MAGIC}.mgc: $(EXTRA_DIST)
file -C -m ${srcdir}/${MAGIC}

install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(fapolicyrulesdir)"
Expand Down
2 changes: 2 additions & 0 deletions init/fapolicyd.service.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Type=@FAPOLICYD_SERVICE_TYPE@
@FAPOLICYD_SERVICE_NOTIFY_ACCESS@
@FAPOLICYD_SERVICE_PIDFILE@
ExecStartPre=/usr/sbin/fagenrules
# Regenerate the compiled magic database so it always matches the system's libmagic version.
ExecStartPre=-/bin/sh -c "cd /usr/share/fapolicyd && /usr/bin/file -C -m fapolicyd-magic"
ExecStart=@FAPOLICYD_SERVICE_EXEC@
@FAPOLICYD_SERVICE_WATCHDOG@
Restart=on-failure
Expand Down
Loading