From caeee856bfcad871003db1b51abd2e98eefc461c Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Tue, 21 Apr 2020 18:13:14 -0400
Subject: small fixes

---
 Makefile.in                 | 2 +-
 README                      | 8 ++++++++
 etc/apparmor/firejail-local | 2 ++
 etc/firejail-local          | 2 --
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 etc/apparmor/firejail-local
 delete mode 100644 etc/firejail-local

diff --git a/Makefile.in b/Makefile.in
index 890862b12..cf83fc1cf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -124,7 +124,7 @@ ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
 	install -c -m 0644 etc/apparmor/firejail-default $(DESTDIR)/$(sysconfdir)/apparmor.d/.
 	sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d/local ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d/local; fi;"
 	# install apparmor profile customization file
-	sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-local ]; then install -c -m 0644 etc/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/.; fi;"
+	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;"
 endif
 	# man pages
 	install -m 0755 -d $(DESTDIR)/$(mandir)/man1
diff --git a/README b/README
index 3ea3e8d1f..48683ed8a 100644
--- a/README
+++ b/README
@@ -104,6 +104,8 @@ Andrey Alekseenko (https://github.com/al42and)
 	- fixed Skype profile
 andrew160 (https://github.com/andrew160)
 	- profile and man pages fixes
+Andrew Branson (https://github.com/abranson)
+	- 32bit ARM syscall table
 announ (https://github.com/announ)
 	- mpv and youtube-dl profile fixes
 	- git profile fix
@@ -113,6 +115,7 @@ Antonio Russo (https://github.com/aerusso)
 	- fix join-or-start
 	- wusc fixes
 	- okular profile fixes
+	- manpage fixes
 aoand (https://github.com/aoand)
 	- seccomp fix: allow numeric syscalls
 Atrate (https://github.com/Atrate)
@@ -122,6 +125,8 @@ Austin Morton (https://github.com/apmorton)
 	- private-cwd options
 Austin S. Hemmelgarn (https://github.com/Ferroin)
 	- unbound profile update
+Avi Lumelsky (https://github.com/avilum)
+	- syscall.sh improvements
 avoidr (https://github.com/avoidr)
 	- whitelist fix
 	- recently-used.xbel fix
@@ -175,6 +180,8 @@ Carlo Abelli (https://github.com/carloabelli)
 	- Allow mbind syscall for GIMP
 Cat (https://github.com/ecat3)
 	- prevent tmux connecting to an existing session
+Christian Pinedo (https://github.com/chrpinedo)
+	- added nicotine profile
 creideiki (https://github.com/creideiki)
 	- make the sandbox process reap all children
 	- tor browser profile fix
@@ -528,6 +535,7 @@ Matthew Gyurgyik (https://github.com/pyther)
 matu3ba (https://github.com/matu3ba)
 	- evince hardening, dbus removed
 	- fix dia profile
+	- several template fixes
 maxice8 (https://github.com/maxice8)
 	- fixed missing header
 Melvin Vermeeren (https://github.com/melvinvermeeren)
diff --git a/etc/apparmor/firejail-local b/etc/apparmor/firejail-local
new file mode 100644
index 000000000..f086653f8
--- /dev/null
+++ b/etc/apparmor/firejail-local
@@ -0,0 +1,2 @@
+# Site-specific additions and overrides for 'firejail-default'.
+# For more details, please see /etc/apparmor.d/local/README.
diff --git a/etc/firejail-local b/etc/firejail-local
deleted file mode 100644
index f086653f8..000000000
--- a/etc/firejail-local
+++ /dev/null
@@ -1,2 +0,0 @@
-# Site-specific additions and overrides for 'firejail-default'.
-# For more details, please see /etc/apparmor.d/local/README.
-- 
cgit v1.2.3-70-g09d2