diff options
author | netblue30 <netblue30@yahoo.com> | 2020-08-22 07:07:41 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2020-08-22 07:07:41 -0400 |
commit | 1bd36a035a0f54dd96c59f9c525c6cbd5b079a29 (patch) | |
tree | c6d930e28a244c8936aace944e435741a288f8fd | |
parent | Merge pull request #3592 from onovy/signal-audio-video (diff) | |
download | firejail-1bd36a035a0f54dd96c59f9c525c6cbd5b079a29.tar.gz firejail-1bd36a035a0f54dd96c59f9c525c6cbd5b079a29.tar.zst firejail-1bd36a035a0f54dd96c59f9c525c6cbd5b079a29.zip |
renamed /etc/apparmor.d/local/firejail-local to /etc/apparmor.d/local/firejail.default - merge form 0.9.62.4
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | etc/apparmor/firejail-default | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 8cbba12e9..f1002f892 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -130,7 +130,7 @@ ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) | |||
130 | install -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d | 130 | install -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d |
131 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d/local ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d/local; fi;" | 131 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d/local ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d/local; fi;" |
132 | # install apparmor profile customization file | 132 | # install apparmor profile customization file |
133 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-local ]; then install -c -m 0644 etc/apparmor/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/.; fi;" | 133 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default ]; then install -c -m 0644 etc/apparmor/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default; fi;" |
134 | endif | 134 | endif |
135 | # man pages | 135 | # man pages |
136 | install -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 | 136 | install -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 |
@@ -63,6 +63,8 @@ Firejail Authors (alphabetical order) | |||
63 | - fix flameshot raw screenshots | 63 | - fix flameshot raw screenshots |
64 | 1dnrr (https://github.com/1dnrr) | 64 | 1dnrr (https://github.com/1dnrr) |
65 | - add pybitmessage profile | 65 | - add pybitmessage profile |
66 | Ádler Jonas Gross (https://github.com/adgross) | ||
67 | - AppArmor fix | ||
66 | Adrian L. Shaw (https://github.com/adrianlshaw) | 68 | Adrian L. Shaw (https://github.com/adrianlshaw) |
67 | - add profanity profile | 69 | - add profanity profile |
68 | - add barrirer profile | 70 | - add barrirer profile |
diff --git a/etc/apparmor/firejail-default b/etc/apparmor/firejail-default index 04a38f0ce..68e20d9b9 100644 --- a/etc/apparmor/firejail-default +++ b/etc/apparmor/firejail-default | |||
@@ -157,5 +157,5 @@ capability setfcap, | |||
157 | #capability mac_admin, | 157 | #capability mac_admin, |
158 | 158 | ||
159 | # Site-specific additions and overrides. See local/README for details. | 159 | # Site-specific additions and overrides. See local/README for details. |
160 | #include <local/firejail-local> | 160 | #include <local/firejail-default> |
161 | } | 161 | } |