7 files changed, 44 insertions, 19 deletions
diff --git a/kernels/pax-flags-libre/PKGBUILD b/kernels/pax-flags-libre/PKGBUILD
index 6cb10454e..36ab838a7 100644
--- a/kernels/pax-flags-libre/PKGBUILD
+++ b/kernels/pax-flags-libre/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=pax-flags-libre
 pkgdesc='Deactivates PaX flags for several binaries to work with PaX enabled kernels (a libre fork of linux-pax-flags)'
-pkgver=2.0.16
+pkgver=2.0.17
 pkgrel=1
 arch=(any)
 url='https://github.com/g4jc/pax-flags-libre'
@@ -20,8 +20,8 @@ conflicts=linux-pax-flags
 provides=linux-pax-flags
 source=(
   $pkgname.sh $pkgname.rb $pkgname.8
-  replicant.conf clamav.conf games.conf java.conf kde.conf polkit.conf qemu.conf
-  ruby.conf simple.conf valgrind.conf
+  replicant.conf browsers.conf clamav.conf games.conf imagemagick.conf java.conf
+  kde.conf polkit.conf qemu.conf ruby.conf simple.conf valgrind.conf wine.conf
 )
 
 package() {
@@ -40,12 +40,15 @@ sha256sums=('06295e9d2afea0ea01c42620f0cd5e3ae785bc42c2749d4bef52f7d5b8a043ce'
             '79367f1b72eb836557e24df20fc4ad142af55669c0fee1e3e7a0d34d35bfc9dc'
             '9d62896dd51be4979cd85bfcd09de219f6068ec312f27e2a66f7a2f2c78d1f38'
             '7bbbad18a19150893916995723cd7e256a7b4e2baa5c2ff57bc27886c40f51fc'
+            'aedce25acf41fffa7a5c15c2ad7e5034eb56bfedcde65612ae4bc3f86ef4841a'
             'bb87f4dce8e20f2ce601bdcb888dd688d8f0e9d0ab367e09c8081daffa15b03a'
-            '4185bc6401ff3b21958fd24c49fc56d590435e5bc9f1ccb69798bb0c2acdd4c1'
+            '95471682765c3c5ca31b29e3de7f8a07de6b2857e999dcdd714d062fe3da04ea'
+            '7dc92a303004c9d74a1fe4d40d75105a703366ade8b2b459b0aae8d6f8b62ed0'
             '71afe786955d149fe216ff1a60348562914a6820d3b7f9dc42aa44913062b04e'
             '01ddeec77c605e1d3aa00a1fdc4c3537989468ab78da5f37b893cdbcfe34176c'
             '1f205fddfb427a696fb00221a3007453e25fbbf180ea026c264d23eeac9e1870'
             '2736d0ef20d0127c34e132db38d8993dee3062ba0ac0cdf8d444a8d3665698b8'
-            '6171eefd363f2c70bed9ac41fae3458d9e03460fdaf079c99445482e9649555a'
-            '5ea06a1680cf3bd7e57db904829aae5ef0649d6a0f065b35e5dc2e64dd7ed18f'
-            'ea003c4201745cd0c4bcf5cec5ca2d0a79cc6b1b04ceaa276ace0ad0287b8c50')
+            'e5562d68df885c5ceeb51709fc57c86d7b2c7849b9d99f828a77228878e25d71'
+            '7d9f510e649e4ead08be3bb5f6fe1b6371b47a9fbb2f9b829cf329caa16bad94'
+            'ea003c4201745cd0c4bcf5cec5ca2d0a79cc6b1b04ceaa276ace0ad0287b8c50'
+            'd78fe0a02b5801c70e3d64045b12c3cbee358689da9082d71003b1cffda73ee3')
diff --git a/kernels/pax-flags-libre/browsers.conf b/kernels/pax-flags-libre/browsers.conf
new file mode 100644
index 000000000..a37590b80
--- /dev/null
+++ b/kernels/pax-flags-libre/browsers.conf
@@ -0,0 +1,10 @@
+# MPROTECT and RANDMMAP off
+PSmXEr:
+	- /usr/bin/elinks
+	- /usr/bin/qupzilla
+	- /usr/lib/iceweasel/iceweasel
+	- /usr/lib/iceweasel/plugin-container
+
+# MPROTECT off
+PSmXER:
+	- /usr/bin/midori
diff --git a/kernels/pax-flags-libre/games.conf b/kernels/pax-flags-libre/games.conf
index 8b74b0108..59d5c7296 100644
--- a/kernels/pax-flags-libre/games.conf
+++ b/kernels/pax-flags-libre/games.conf
@@ -13,6 +13,7 @@ PSmXER:
 	- /opt/enemy-territory/et.x86
 	- /opt/quake3/ioquake3.i386
 	- /opt/quake3/ioquake3.x86_64
+	- /opt/ryzom/ryzom_client
 	- /usr/bin/bzflag
 	- /usr/bin/minetest
 	- /usr/bin/opencity
diff --git a/kernels/pax-flags-libre/imagemagick.conf b/kernels/pax-flags-libre/imagemagick.conf
new file mode 100644
index 000000000..a2201a754
--- /dev/null
+++ b/kernels/pax-flags-libre/imagemagick.conf
@@ -0,0 +1,13 @@
+# MPROTECT off
+PSmXER:
+	- /usr/bin/animate
+	- /usr/bin/compare
+	- /usr/bin/composite
+	- /usr/bin/conjure
+	- /usr/bin/convert
+	- /usr/bin/display
+	- /usr/bin/identify
+	- /usr/bin/import
+	- /usr/bin/mogrify
+	- /usr/bin/montage
+	- /usr/bin/stream
diff --git a/kernels/pax-flags-libre/ruby.conf b/kernels/pax-flags-libre/ruby.conf
index ec595d462..c6d976649 100644
--- a/kernels/pax-flags-libre/ruby.conf
+++ b/kernels/pax-flags-libre/ruby.conf
@@ -4,4 +4,5 @@ PSmXER:
 	- ~/.rbenv/versions/?.?.?{,-p*}/lib/ruby/gems/*/gems/capybara-webkit-*/bin/webkit_server
 	- ~/.rvm/rubies/ruby-?.?.?{,-p*}/bin/ruby
 	- ~/.rvm/gems/ruby-?.?.?{,-p*}/gems/capybara-webkit-*/bin/webkit_server
+	- /usr/bin/rbx
 	- /usr/bin/ruby
diff --git a/kernels/pax-flags-libre/simple.conf b/kernels/pax-flags-libre/simple.conf
index 180b3e18c..3039f1215 100644
--- a/kernels/pax-flags-libre/simple.conf
+++ b/kernels/pax-flags-libre/simple.conf
@@ -4,20 +4,17 @@ PSMXEr:
 
 # MPROTECT and RANDMMAP off
 PSmXEr:
-	- /usr/bin/elinks
 	- /usr/bin/gnome-shell
 	- /usr/bin/grub-bios-setup
-	- /usr/lib/iceweasel/iceweasel
-	- /usr/lib/iceweasel/plugin-container
 	- /usr/lib/gcc/x86_64-unknown-linux-gnu/*/cc1plus
 	- /usr/lib/icedove/icedove
-	- /usr/bin/qupzilla
 
 # MPROTECT off
 PSmXER:
 	- /usr/bin/blender
 	- /usr/bin/btsync
 	- /usr/bin/cabal
+	- /usr/bin/cheese
 	- /usr/bin/dolphin-emu
 	- /usr/bin/dosbox
 	- /usr/bin/epiphany
@@ -29,12 +26,15 @@ PSmXER:
 	- /usr/bin/goldendict
 	- /usr/bin/gtk-query-immodules-*
 	- /usr/bin/inkscape
+	- /usr/bin/konstruktor
 	- /usr/bin/liferea
+	- /usr/bin/minitube
 	- /usr/bin/mono
 	- /usr/bin/mplayer
 	- /usr/bin/mumble
 	- /usr/bin/obex-data-server
 	- /usr/bin/python2
+	- /usr/bin/rhythmbox
 	- /usr/bin/scheme
 	- /usr/bin/seahorse
 	- /usr/bin/spicec
@@ -49,15 +49,8 @@ PSmXER:
 	- /usr/lib/xbmc/xbmc.bin
 	- /usr/sbin/grub-probe
 	- /usr/sbin/vbetool
-	- /usr/bin/midori
-	- /usr/bin/cheese
-	- /use/bin/minitube
+	- /usr/bin/xiphos
 
 # PAGEEXEC, MPROTECT, EMUTRAMP and RANDMMAP off
 pSmXer:
 	- /usr/bin/sbcl
-
-# All off :(
-psmxer:
-	- /usr/bin/wine
-	- /usr/bin/wine-preloader
diff --git a/kernels/pax-flags-libre/wine.conf b/kernels/pax-flags-libre/wine.conf
new file mode 100644
index 000000000..77b33053d
--- /dev/null
+++ b/kernels/pax-flags-libre/wine.conf
@@ -0,0 +1,4 @@
+# All off :(
+psmxer:
+	- /usr/bin/wine-preloader
+	- /usr/bin/wine64-preloader