From 58f44a4b28a57906187ec44c725ffaa044a04329 Mon Sep 17 00:00:00 2001
From: rusty-snake <41237666+rusty-snake@users.noreply.github.com>
Date: Sun, 12 Apr 2020 14:59:32 +0200
Subject: [PATCH] misc fixes

 - Makefile.in: loops are slow
 - Makefile.in: firecfg.config wasn't installed
 - allow-gjs.inc: gjs uses libmozjs, forgotten to commit
---
 Makefile.in       | 11 ++---------
 README.md         |  2 +-
 etc/allow-gjs.inc |  1 +
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0a0715023..13d5c456a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,12 +94,8 @@ endif
 	install -c -m 0755 src/firecfg/firecfg $(DESTDIR)/$(bindir)/.
 	# libraries and plugins
 	install -m 0755 -d $(DESTDIR)/$(libdir)/firejail
-	for file in $(MYLIBS) $(SECCOMP_FILTERS); do \
-		install -c -m 0644 $$file $(DESTDIR)/$(libdir)/firejail/; \
-	done
-	for app in $(SBOX_APPS); do \
-		install -c -m 0755 $$app $(DESTDIR)/$(libdir)/firejail/; \
-	done
+	install -m 0644 -t $(DESTDIR)/$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS) src/firecfg/firecfg.config
+	install -m 0755 -t $(DESTDIR)/$(libdir)/firejail $(SBOX_APPS)
 ifeq ($(HAVE_CONTRIB_INSTALL),yes)
 	install -c -m 0755 contrib/fix_private-bin.py $(DESTDIR)/$(libdir)/firejail/.
 	install -c -m 0755 contrib/fjclip.py $(DESTDIR)/$(libdir)/firejail/.
@@ -121,9 +117,6 @@ ifeq ($(BUSYBOX_WORKAROUND),yes)
 endif
 	install -m 0755 -d $(DESTDIR)/$(sysconfdir)/firejail
 	install -m 0644 -t $(DESTDIR)/$(sysconfdir)/firejail etc/*.profile etc/*.inc etc/*.net etc/firejail.config
-#	for file in etc/*.profile etc/*.inc etc/*.net etc/firejail.config; do \
-#		install -c -m 0644 $$file $(DESTDIR)/$(sysconfdir)/firejail; \
-#	done
 	sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
 ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
 	# install apparmor profile
diff --git a/README.md b/README.md
index eb576d5f3..a947a8e7e 100644
--- a/README.md
+++ b/README.md
@@ -187,4 +187,4 @@ gnome-screenshot, ripperX, sound-juicer, iagno, com.github.dahenson.agenda, gnom
 penguin-command, x2goclient, frogatto, gnome-mines, gnome-nibbles, lightsoff, ts3client_runscript.sh, warmux, ferdi, abiword,
 four-in-a-row, gnome-mahjongg, gnome-robots, gnome-sudoku, gnome-taquin, gnome-tetravex, blobwars, gravity-beams-and-evaporating-stars,
 hyperrogue, jumpnbump-menu, jumpnbump, magicor, mindless, mirrormagic, mrrescue, scorched3d-wrapper, scorchwentbonkers,
-seahorse-adventures, wordwarvi, xbill, gnome-klotski, five-or-more, swell-foop,,fdns
+seahorse-adventures, wordwarvi, xbill, gnome-klotski, five-or-more, swell-foop, fdns
diff --git a/etc/allow-gjs.inc b/etc/allow-gjs.inc
index f552ede9d..f4f9926cd 100644
--- a/etc/allow-gjs.inc
+++ b/etc/allow-gjs.inc
@@ -8,3 +8,4 @@ noblacklist /usr/lib/gjs
 noblacklist /usr/lib64/gjs
 noblacklist /usr/lib/libgjs*
 noblacklist /usr/lib64/libgjs*
+noblacklist /usr/lib64/libmozjs-*