7 files changed, 55 insertions, 53 deletions

diff --git a/contrib/apparmor/abstractions/gnunet-common b/contrib/apparmor/abstractions/gnunet-common
index 7d7515d80..3bf6806f5 100644
--- a/contrib/apparmor/abstractions/gnunet-common
+++ b/contrib/apparmor/abstractions/gnunet-common
@@ -1,34 +1,12 @@
 # This files contains common permissions for gnunet
 
-  /usr/share/zoneinfo/                    r,
-  /usr/share/zoneinfo/**                  r,
+  #GNUnet configuration file
+  @{GNUNET_PREFIX}/share/gnunet/config.d/       r,
+  @{GNUNET_PREFIX}/share/gnunet/config.d/*.conf r,
   
-  /dev/urandom                            r,
-  
-  /etc/ld.so.cache                        r,
-
-  @{PROC}/@{pid}/maps                     r,
-
-  #Gnunet configuration file
-  /usr/local/share/gnunet/config.d/       r,
-  /usr/local/share/gnunet/config.d/*.conf r,
-  
-  /etc/gnunet.conf                        r,
-  owner @{HOME}/.config/gnunet.conf       r,
-
-  #Librairies
-  /usr/lib/libc-*.so                      mr,
-  /usr/lib/libdl-*.so                     mr,
-  /usr/lib/libgcrypt.so.*                 mr,
-  /usr/lib/libltdl.so.*                   mr,
-  /usr/lib/libgpg-error.so.*              mr,
-  /usr/lib/libm-*.so                      mr,
-  /usr/lib/libunistring.so.*              mr,
-  /usr/lib/libz.so.*                      mr,
+  /etc/gnunet.conf                         r,
+  @{HOME}/.config/gnunet.conf      r,
+  owner @{GNUNET_USER}/.config/gnunet.conf r,
 
-  #Gnunet librairies
-  /usr/local/lib/libgnunetutil.so.*       mr,
-  
-  #For testbed (if the /tmp directory is used)
-  /tmp/testbed*/                          rw,
-  /tmp/testbed*/**                        rwk,
+  #GNUnet librairies
+  @{GNUNET_PREFIX}/lib/libgnunet*.so.*    mr,
diff --git a/contrib/apparmor/abstractions/gnunet-db b/contrib/apparmor/abstractions/gnunet-db
new file mode 100644
index 000000000..73b869dca
--- /dev/null
+++ b/contrib/apparmor/abstractions/gnunet-db
@@ -0,0 +1,8 @@
+# gnunet-db
+@{GNUNET_USER}/.local/share/gnunet/namestore/ ra,
+@{GNUNET_USER}/.local/share/gnunet/namestore/sqlite.db rwk,
+@{GNUNET_USER}/.local/share/gnunet/namestore/sqlite.db-journal rw,
+
+@{HOME}/.local/share/gnunet/namestore/ r,
+@{HOME}/.local/share/gnunet/namestore/sqlite.db rwk,
+@{HOME}/.local/share/gnunet/namestore/sqlite.db-journal rw,
diff --git a/contrib/apparmor/abstractions/gnunet-gtk b/contrib/apparmor/abstractions/gnunet-gtk
new file mode 100644
index 000000000..bf47adc0c
--- /dev/null
+++ b/contrib/apparmor/abstractions/gnunet-gtk
@@ -0,0 +1,10 @@
+# gnunet-gtk
+
+  #include <abstractions/gnunet-common>
+ 
+  @{PROC}/@{pid}/cmdline          r,
+
+  /usr/share/gtk-*/settings.ini r,
+
+  @{GNUNET_PREFIX}/share/gnunet-gtk/config.d/                   r,
+  @{GNUNET_PREFIX}/share/gnunet-gtk/config.d/gnunet-*-gtk.conf  r,
diff --git a/contrib/apparmor/abstractions/gnunet-libaudio b/contrib/apparmor/abstractions/gnunet-libaudio
deleted file mode 100644
index 6dda03573..000000000
--- a/contrib/apparmor/abstractions/gnunet-libaudio
+++ /dev/null
@@ -1,23 +0,0 @@
-/usr/lib/libFLAC.so.* mr,
-/usr/lib/libXau.so.* mr,
-/usr/lib/libXdmcp.so.* mr,
-/usr/lib/libasyncns.so.* mr,
-/usr/lib/libattr.so.* mr,
-/usr/lib/libcap.so.* mr,
-/usr/lib/libdbus-1.so.* mr,
-/usr/lib/libjson-c.so.* mr,
-/usr/lib/liblz4.so.* mr,
-/usr/lib/liblzma.so.* mr,
-/usr/lib/libnsl-*.so mr,
-/usr/lib/libogg.so.* mr,
-/usr/lib/libopus.so.* mr,
-/usr/lib/libpthread-*.so mr,
-/usr/lib/libpulse.so.* mr,
-/usr/lib/libresolv-*.so mr,
-/usr/lib/librt-*.so mr,
-/usr/lib/libsndfile.so.* mr,
-/usr/lib/libsystemd.so.* mr,
-/usr/lib/libvorbis.so.* mr,
-/usr/lib/libvorbisenc.so.* mr,
-/usr/lib/libxcb.so.* mr,
-/usr/lib/pulseaudio/libpulsecommon-*.so mr,
diff --git a/contrib/apparmor/abstractions/gnunet-sgid b/contrib/apparmor/abstractions/gnunet-sgid
new file mode 100644
index 000000000..b1a7655b1
--- /dev/null
+++ b/contrib/apparmor/abstractions/gnunet-sgid
@@ -0,0 +1 @@
+# gnunet-sgid
diff --git a/contrib/apparmor/abstractions/gnunet-suid b/contrib/apparmor/abstractions/gnunet-suid
new file mode 100644
index 000000000..a9310734c
--- /dev/null
+++ b/contrib/apparmor/abstractions/gnunet-suid
@@ -0,0 +1,15 @@
+# gnunet-suid
+
+  /etc/ld.so.cache                                      mr,
+  /lib{,32,64}/ld{,32,64}-*.so                          mrix,
+  /lib{,32,64}/**/ld{,32,64}-*.so                       mrix,
+  /lib/@{multiarch}/ld{,32,64}-*.so                     mrix,
+  /lib/tls/i686/{cmov,nosegneg}/ld-*.so                 mrix,
+  /lib/i386-linux-gnu/tls/i686/{cmov,nosegneg}/ld-*.so  mrix,
+  /opt/*-linux-uclibc/lib/ld-uClibc*so*                 mrix,
+
+  @{LIBPRE}@{LIBDIRS}/**                                   r,
+  @{LIBPRE}@{LIBDIRS}/@{LIBS}.so*                          mr,
+  @{LIBPRE}@{LIBDIRS}/**/@{LIBS}.so*                       mr,
+  /lib/tls/i686/{cmov,nosegneg}/@{LIBS}.so*                mr,
+  /lib/i386-linux-gnu/tls/i686/{cmov,nosegneg}/@{LIBS}.so* mr,
diff --git a/contrib/apparmor/abstractions/gnunet-test b/contrib/apparmor/abstractions/gnunet-test
new file mode 100644
index 000000000..8daf3ea9c
--- /dev/null
+++ b/contrib/apparmor/abstractions/gnunet-test
@@ -0,0 +1,13 @@
+
+  #testbed (if the /tmp directory is used)
+  /tmp/testbed*/        rw,
+  /tmp/testbed*/**      rwk,
+
+  #testbed helper
+  /tmp/testbed-helper*/ rw,
+  
+  #gnunet-testing
+  /tmp/gnunet-testing*  rw,
+  /tmp/gnunet_service_test*/ rw,
+  /tmp/gnunet_service_test*/** rw,
+