firejail bugfix

3 files changed, 52 insertions, 58 deletions

diff --git a/pcr/firejail/PKGBUILD b/pcr/firejail/PKGBUILD
index 1ca45358e..51340d769 100644
--- a/pcr/firejail/PKGBUILD
+++ b/pcr/firejail/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=firejail
 pkgver=0.9.36
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux namespaces sandbox program"
 arch=('i686' 'x86_64' 'armv7h')
 license=(GPL2)
@@ -17,7 +17,7 @@ validpgpkeys=('CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697') # PKGBUILD Maintainer'
 sha512sums=('8b9b7f3dd071825117a45e41c1e33871bf4f7788faf27f322913079a7094e6fa4eb7a94362630664c4b441213c357531a2f9f41bd94ff06c64bc6f8a6ee68fd1'
             'SKIP'
             'SKIP'
-            'f4b86fab3c1f0944458aca5af683f70080e206249bcb9209d7e02df3ad408abed3129f7447ff91589854fe1479da2e95b6824395ed2f21f5728aec2306166dfc')
+            '8e8638616aa7b2cdfbdc2eb27ebfb7caf5ffce2d45c293554e0dcecaa4bcef7cae108953c1a0a8463bc6b6ef44633d9876a2d2d8628f3b5b8e4b2c7ccfe8b5ec')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/pcr/firejail/PKGBUILD.sig b/pcr/firejail/PKGBUILD.sig
index d56c62d09..f5ef45048 100644
--- a/pcr/firejail/PKGBUILD.sig
+++ b/pcr/firejail/PKGBUILD.sig
diff --git a/pcr/firejail/firejail.install b/pcr/firejail/firejail.install
index ff9f47783..eea219968 100644
--- a/pcr/firejail/firejail.install
+++ b/pcr/firejail/firejail.install
@@ -1,51 +1,51 @@
 pre_upgrade() {
-echo "Checking 33 firejail profiles for user modification, backing up as needed..."
-	FilesToCheck=(
-/etc/firejail/audacious.profile
-/etc/firejail/bitlbee.profile
-/etc/firejail/clementine.profile
-/etc/firejail/conkeror.profile
-/etc/firejail/deadbeef.profile
-/etc/firejail/deluge.profile
-/etc/firejail/disable-common.inc
-/etc/firejail/disable-devel.inc
-/etc/firejail/disable-mgmt.inc
-/etc/firejail/disable-secret.inc
-/etc/firejail/dnscrypt-proxy.profile
-/etc/firejail/dropbox.profile
-/etc/firejail/empathy.profile
-/etc/firejail/evince.profile
-/etc/firejail/fbreader.profile
-/etc/firejail/filezilla.profile
-/etc/firejail/firefox.profile
-/etc/firejail/generic.profile
-/etc/firejail/gnome-mplayer.profile
-/etc/firejail/hexchat.profile
-/etc/firejail/icecat.profile
-/etc/firejail/icedove.profile
-/etc/firejail/iceweasel.profile
-/etc/firejail/login.users
-/etc/firejail/midori.profile
-/etc/firejail/nolocal.net
-/etc/firejail/parole.profile
-/etc/firejail/pidgin.profile
-/etc/firejail/qbittorrent.profile
-/etc/firejail/quassel.profile
-/etc/firejail/rhythmbox.profile
-/etc/firejail/rtorrent.profile
-/etc/firejail/server.profile
-/etc/firejail/thunderbird.profile
-/etc/firejail/totem.profile
-/etc/firejail/transmission-gtk.profile
-/etc/firejail/transmission-qt.profile
-/etc/firejail/unbound.profile
-/etc/firejail/vlc.profile
-/etc/firejail/webserver.net
-/etc/firejail/weechat-curses.profile
-/etc/firejail/weechat.profile
-/etc/firejail/whitelist-common.inc
-/etc/firejail/wine.profile
-/etc/firejail/xchat.profile
+echo "Checking 44 firejail profiles for user modification, backing up as needed..."
+
+FilesToCheck=(
+'/etc/firejail/audacious.profile'
+'/etc/firejail/bitlbee.profile'
+'/etc/firejail/clementine.profile'
+'/etc/firejail/conkeror.profile'
+'/etc/firejail/deadbeef.profile'
+'/etc/firejail/deluge.profile'
+'/etc/firejail/disable-common.inc'
+'/etc/firejail/disable-devel.inc'
+'/etc/firejail/disable-mgmt.inc'
+'/etc/firejail/disable-secret.inc'
+'/etc/firejail/dnscrypt-proxy.profile'
+'/etc/firejail/empathy.profile'
+'/etc/firejail/evince.profile'
+'/etc/firejail/fbreader.profile'
+'/etc/firejail/filezilla.profile'
+'/etc/firejail/firefox.profile'
+'/etc/firejail/generic.profile'
+'/etc/firejail/gnome-mplayer.profile'
+'/etc/firejail/hexchat.profile'
+'/etc/firejail/icecat.profile'
+'/etc/firejail/icedove.profile'
+'/etc/firejail/iceweasel.profile'
+'/etc/firejail/login.users'
+'/etc/firejail/midori.profile'
+'/etc/firejail/nolocal.net'
+'/etc/firejail/parole.profile'
+'/etc/firejail/pidgin.profile'
+'/etc/firejail/qbittorrent.profile'
+'/etc/firejail/quassel.profile'
+'/etc/firejail/rhythmbox.profile'
+'/etc/firejail/rtorrent.profile'
+'/etc/firejail/server.profile'
+'/etc/firejail/thunderbird.profile'
+'/etc/firejail/totem.profile'
+'/etc/firejail/transmission-gtk.profile'
+'/etc/firejail/transmission-qt.profile'
+'/etc/firejail/unbound.profile'
+'/etc/firejail/vlc.profile'
+'/etc/firejail/webserver.net'
+'/etc/firejail/weechat-curses.profile'
+'/etc/firejail/weechat.profile'
+'/etc/firejail/whitelist-common.inc'
+'/etc/firejail/wine.profile'
+'/etc/firejail/xchat.profile'
 )
 
 OriginalFileHashes=(
@@ -60,7 +60,6 @@ OriginalFileHashes=(
 '14efe7280fb77093a22999739ce323e90fccdc2a43c6b1ead30d3b176decd7ca7f6ed79382c1b63e7b8a8a88f65e03198a40339a26dd6a28e68878c7afa97c66'
 'b0e6b65d9e2c1be90989f0cafbded7c7ebc7a50fd22dccca2ecd16e45547e076ea4ce010e2e7156dce8796d0af6fd5cdf9067f51b9cc91ebd4c9f300f05dcc40'
 '6aba29b3b68b7f96e90c28a4e31e9a4b2d00f07a9f49cb792da29531a56acb57b6d8ffade6661639ffaf0e844094647db5c3ecfcb1317095ab4f1655d511e3c6'
-'43c2ed16340847121ef2adc91fcf836d46295918ffaa486eb4f3b007fb833007da1884b656bd7b13e0cad5ce6d2df16fe830c3ed7d41615800b4dbf62fde332f'
 '1aed5fd7a711f68e1d1522be8caee86c8f0df2799b3d5e59abea96fa4c3424d5df393b549c15eff3ffe849a9ba3a2a96f1eb41ea9a4ef003a2344df15e107f8f'
 '93f40b47b08eee43e02db3915ac8e1275114f754dc6b24707ad07d2007c4c9abd8a09984e4ce78fda25100908f863a4cba5d6256d227816af717510145366ed5'
 'c4810f982f370f480f116eefe33bccd5f91a60f615a809b8c5e66db6c6e557f42cea07e66ddd41badad39a4e0a39cafc4fee82ad8aa61fe4fb6c6b2a3d812491'
@@ -97,9 +96,9 @@ OriginalFileHashes=(
 )
 
 ## Uses above arrays to check if file's original hash matches, if not the file was edited, so we save a backup and notify the user.
-
+echo "test"
 [[ "$(openssl dgst -r -whirlpool ${FilesToCheck[0]} | awk '{print $1}')" = ${OriginalFileHashes[0]} ]] || { cat "${FilesToCheck[0]}" > "${FilesToCheck[0]}.pacsave" ;  echo "Backup saved: ${FilesToCheck[0]}.pacsave"; } 
-
+echo "test2"
 [[ "$(openssl dgst -r -whirlpool ${FilesToCheck[1]} | awk '{print $1}')" = ${OriginalFileHashes[1]} ]] || { cat "${FilesToCheck[1]}" > "${FilesToCheck[1]}.pacsave" ;  echo "Backup saved: ${FilesToCheck[1]}.pacsave"; }
 
 [[ "$(openssl dgst -r -whirlpool ${FilesToCheck[2]} | awk '{print $1}')" = ${OriginalFileHashes[2]} ]] || { cat "${FilesToCheck[2]}" > "${FilesToCheck[2]}.pacsave" ;  echo "Backup saved: ${FilesToCheck[2]}.pacsave"; }
@@ -180,16 +179,11 @@ OriginalFileHashes=(
 
 [[ "$(openssl dgst -r -whirlpool ${FilesToCheck[40]} | awk '{print $1}')" = ${OriginalFileHashes[40]} ]] || { cat "${FilesToCheck[40]}" > "${FilesToCheck[40]}.pacsave" ;  echo "Backup saved: ${FilesToCheck[40]}.pacsave"; }
 
-[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[41]} | awk '{print $1}')" = ${OriginalFileHashes[41} ]] || { cat "${FilesToCheck[41]}" > "${FilesToCheck[41]}.pacsave" ;  echo "Backup saved: ${FilesToCheck[41]}.pacsave"; }
+[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[41]} | awk '{print $1}')" = ${OriginalFileHashes[41]} ]] || { cat "${FilesToCheck[41]}" > "${FilesToCheck[41]}.pacsave" ;  echo "Backup saved: ${FilesToCheck[41]}.pacsave"; }
 
 [[ "$(openssl dgst -r -whirlpool ${FilesToCheck[42]} | awk '{print $1}')" = ${OriginalFileHashes[42]} ]] || { cat "${FilesToCheck[42]}" > "${FilesToCheck[42]}.pacsave" ;  echo "Backup saved: ${FilesToCheck[42]}.pacsave"; }
 
 [[ "$(openssl dgst -r -whirlpool ${FilesToCheck[43]} | awk '{print $1}')" = ${OriginalFileHashes[43]} ]] || { cat "${FilesToCheck[43]}" > "${FilesToCheck[43]}.pacsave" ;  echo "Backup saved: ${FilesToCheck[43]}.pacsave"; }
 
-[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[44]} | awk '{print $1}')" = ${OriginalFileHashes[44]} ]] || { cat "${FilesToCheck[44]}" > "${FilesToCheck[44]}.pacsave" ;  echo "Backup saved: ${FilesToCheck[44]}.pacsave"; }
-
-[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[45]} | awk '{print $1}')" = ${OriginalFileHashes[45]} ]] || { cat "${FilesToCheck[45 ]}" > "${FilesToCheck[45]}.pacsave" ;  echo "Backup saved: ${FilesToCheck[45]}.pacsave"; }
-
 echo "Done!"
-
 }
\ No newline at end of file