gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r36247 - in gnunet/contrib/apparmor: . abstractions tunable


From: gnunet
Subject: [GNUnet-SVN] r36247 - in gnunet/contrib/apparmor: . abstractions tunables
Date: Mon, 17 Aug 2015 11:23:39 +0200

Author: jmorvan
Date: 2015-08-17 11:23:39 +0200 (Mon, 17 Aug 2015)
New Revision: 36247

Added:
   gnunet/contrib/apparmor/abstractions/gnunet-common
   gnunet/contrib/apparmor/abstractions/gnunet-db
   gnunet/contrib/apparmor/abstractions/gnunet-gtk
   gnunet/contrib/apparmor/abstractions/gnunet-sgid
   gnunet/contrib/apparmor/abstractions/gnunet-suid
   gnunet/contrib/apparmor/abstractions/gnunet-test
   gnunet/contrib/apparmor/gnunet-arm
   gnunet/contrib/apparmor/gnunet-ats
   gnunet/contrib/apparmor/gnunet-auto-share
   gnunet/contrib/apparmor/gnunet-bcd
   gnunet/contrib/apparmor/gnunet-cadet
   gnunet/contrib/apparmor/gnunet-config
   gnunet/contrib/apparmor/gnunet-conversation
   gnunet/contrib/apparmor/gnunet-conversation-gtk
   gnunet/contrib/apparmor/gnunet-conversation-test
   gnunet/contrib/apparmor/gnunet-core
   gnunet/contrib/apparmor/gnunet-daemon-exit
   gnunet/contrib/apparmor/gnunet-daemon-hostlist
   gnunet/contrib/apparmor/gnunet-daemon-latency-logger
   gnunet/contrib/apparmor/gnunet-daemon-pt
   gnunet/contrib/apparmor/gnunet-daemon-regexprofiler
   gnunet/contrib/apparmor/gnunet-daemon-testbed-blacklist
   gnunet/contrib/apparmor/gnunet-daemon-testbed-underlay
   gnunet/contrib/apparmor/gnunet-daemon-topology
   gnunet/contrib/apparmor/gnunet-datastore
   gnunet/contrib/apparmor/gnunet-directory
   gnunet/contrib/apparmor/gnunet-dns2gns
   gnunet/contrib/apparmor/gnunet-download
   gnunet/contrib/apparmor/gnunet-download-manager.scm
   gnunet/contrib/apparmor/gnunet-ecc
   gnunet/contrib/apparmor/gnunet-fs
   gnunet/contrib/apparmor/gnunet-fs-gtk
   gnunet/contrib/apparmor/gnunet-gns
   gnunet/contrib/apparmor/gnunet-gns-import.sh
   gnunet/contrib/apparmor/gnunet-gns-proxy
   gnunet/contrib/apparmor/gnunet-gns-proxy-setup-ca
   gnunet/contrib/apparmor/gnunet-gtk
   gnunet/contrib/apparmor/gnunet-helper-audio-playback
   gnunet/contrib/apparmor/gnunet-helper-audio-record
   gnunet/contrib/apparmor/gnunet-helper-dns
   gnunet/contrib/apparmor/gnunet-helper-exit
   gnunet/contrib/apparmor/gnunet-helper-fs-publish
   gnunet/contrib/apparmor/gnunet-helper-nat-client
   gnunet/contrib/apparmor/gnunet-helper-nat-server
   gnunet/contrib/apparmor/gnunet-helper-testbed
   gnunet/contrib/apparmor/gnunet-helper-transport-bluetooth
   gnunet/contrib/apparmor/gnunet-helper-transport-wlan
   gnunet/contrib/apparmor/gnunet-helper-transport-wlan-dummy
   gnunet/contrib/apparmor/gnunet-helper-vpn
   gnunet/contrib/apparmor/gnunet-identity
   gnunet/contrib/apparmor/gnunet-identity-gtk
   gnunet/contrib/apparmor/gnunet-mesh
   gnunet/contrib/apparmor/gnunet-namecache
   gnunet/contrib/apparmor/gnunet-namestore
   gnunet/contrib/apparmor/gnunet-namestore-fcfsd
   gnunet/contrib/apparmor/gnunet-namestore-gtk
   gnunet/contrib/apparmor/gnunet-nat-server
   gnunet/contrib/apparmor/gnunet-nse
   gnunet/contrib/apparmor/gnunet-peerinfo
   gnunet/contrib/apparmor/gnunet-peerinfo-gtk
   gnunet/contrib/apparmor/gnunet-peerstore
   gnunet/contrib/apparmor/gnunet-publish
   gnunet/contrib/apparmor/gnunet-qr
   gnunet/contrib/apparmor/gnunet-resolver
   gnunet/contrib/apparmor/gnunet-revocation
   gnunet/contrib/apparmor/gnunet-scalarproduct
   gnunet/contrib/apparmor/gnunet-scrypt
   gnunet/contrib/apparmor/gnunet-search
   gnunet/contrib/apparmor/gnunet-service-arm
   gnunet/contrib/apparmor/gnunet-service-ats
   gnunet/contrib/apparmor/gnunet-service-cadet
   gnunet/contrib/apparmor/gnunet-service-conversation
   gnunet/contrib/apparmor/gnunet-service-core
   gnunet/contrib/apparmor/gnunet-service-datastore
   gnunet/contrib/apparmor/gnunet-service-dht
   gnunet/contrib/apparmor/gnunet-service-dns
   gnunet/contrib/apparmor/gnunet-service-fs
   gnunet/contrib/apparmor/gnunet-service-gns
   gnunet/contrib/apparmor/gnunet-service-identity
   gnunet/contrib/apparmor/gnunet-service-mesh
   gnunet/contrib/apparmor/gnunet-service-namecache
   gnunet/contrib/apparmor/gnunet-service-namestore
   gnunet/contrib/apparmor/gnunet-service-nse
   gnunet/contrib/apparmor/gnunet-service-peerinfo
   gnunet/contrib/apparmor/gnunet-service-peerstore
   gnunet/contrib/apparmor/gnunet-service-regex
   gnunet/contrib/apparmor/gnunet-service-resolver
   gnunet/contrib/apparmor/gnunet-service-revocation
   gnunet/contrib/apparmor/gnunet-service-scalarproduct-alice
   gnunet/contrib/apparmor/gnunet-service-scalarproduct-bob
   gnunet/contrib/apparmor/gnunet-service-set
   gnunet/contrib/apparmor/gnunet-service-statistics
   gnunet/contrib/apparmor/gnunet-service-template
   gnunet/contrib/apparmor/gnunet-service-testbed
   gnunet/contrib/apparmor/gnunet-service-testbed-logger
   gnunet/contrib/apparmor/gnunet-service-transport
   gnunet/contrib/apparmor/gnunet-service-vpn
   gnunet/contrib/apparmor/gnunet-set-ibf-profiler
   gnunet/contrib/apparmor/gnunet-set-profiler
   gnunet/contrib/apparmor/gnunet-setup
   gnunet/contrib/apparmor/gnunet-statistics
   gnunet/contrib/apparmor/gnunet-statistics-gtk
   gnunet/contrib/apparmor/gnunet-template
   gnunet/contrib/apparmor/gnunet-testbed-profiler
   gnunet/contrib/apparmor/gnunet-testing
   gnunet/contrib/apparmor/gnunet-transport
   gnunet/contrib/apparmor/gnunet-transport-certificate-creation
   gnunet/contrib/apparmor/gnunet-unindex
   gnunet/contrib/apparmor/gnunet-uri
   gnunet/contrib/apparmor/gnunet-vpn
   gnunet/contrib/apparmor/tunables/gnunet
Removed:
   gnunet/contrib/apparmor/abstractions/gnunet-common
   gnunet/contrib/apparmor/abstractions/gnunet-libaudio
   gnunet/contrib/apparmor/gnunet-arm
   gnunet/contrib/apparmor/gnunet-daemon-exit
   gnunet/contrib/apparmor/gnunet-daemon-hostlist
   gnunet/contrib/apparmor/gnunet-daemon-latency-logger
   gnunet/contrib/apparmor/gnunet-daemon-pt
   gnunet/contrib/apparmor/gnunet-daemon-regexprofiler
   gnunet/contrib/apparmor/gnunet-daemon-testbed-blacklist
   gnunet/contrib/apparmor/gnunet-daemon-testbed-underlay
   gnunet/contrib/apparmor/gnunet-daemon-topology
   gnunet/contrib/apparmor/gnunet-dns2gns
   gnunet/contrib/apparmor/gnunet-gns-proxy
   gnunet/contrib/apparmor/gnunet-helper-audio-playback
   gnunet/contrib/apparmor/gnunet-helper-audio-record
   gnunet/contrib/apparmor/gnunet-helper-dns
   gnunet/contrib/apparmor/gnunet-helper-exit
   gnunet/contrib/apparmor/gnunet-helper-fs-publish
   gnunet/contrib/apparmor/gnunet-helper-nat-client
   gnunet/contrib/apparmor/gnunet-helper-nat-server
   gnunet/contrib/apparmor/gnunet-helper-testbed
   gnunet/contrib/apparmor/gnunet-helper-transport-wlan
   gnunet/contrib/apparmor/gnunet-helper-transport-wlan-dummy
   gnunet/contrib/apparmor/gnunet-helper-vpn
   gnunet/contrib/apparmor/gnunet-namestore-fcfsd
   gnunet/contrib/apparmor/gnunet-service-arm
   gnunet/contrib/apparmor/gnunet-service-ats
   gnunet/contrib/apparmor/gnunet-service-cadet
   gnunet/contrib/apparmor/gnunet-service-conversation
   gnunet/contrib/apparmor/gnunet-service-core
   gnunet/contrib/apparmor/gnunet-service-datastore
   gnunet/contrib/apparmor/gnunet-service-dht
   gnunet/contrib/apparmor/gnunet-service-dns
   gnunet/contrib/apparmor/gnunet-service-fs
   gnunet/contrib/apparmor/gnunet-service-gns
   gnunet/contrib/apparmor/gnunet-service-identity
   gnunet/contrib/apparmor/gnunet-service-namecache
   gnunet/contrib/apparmor/gnunet-service-namestore
   gnunet/contrib/apparmor/gnunet-service-nse
   gnunet/contrib/apparmor/gnunet-service-peerinfo
   gnunet/contrib/apparmor/gnunet-service-peerstore
   gnunet/contrib/apparmor/gnunet-service-regex
   gnunet/contrib/apparmor/gnunet-service-resolver
   gnunet/contrib/apparmor/gnunet-service-revocation
   gnunet/contrib/apparmor/gnunet-service-scalarproduct-alice
   gnunet/contrib/apparmor/gnunet-service-scalarproduct-bob
   gnunet/contrib/apparmor/gnunet-service-set
   gnunet/contrib/apparmor/gnunet-service-statistics
   gnunet/contrib/apparmor/gnunet-service-template
   gnunet/contrib/apparmor/gnunet-service-testbed
   gnunet/contrib/apparmor/gnunet-service-testbed-logger
   gnunet/contrib/apparmor/gnunet-service-transport
   gnunet/contrib/apparmor/gnunet-service-vpn
   gnunet/contrib/apparmor/tunables/gnunet
Log:


Deleted: gnunet/contrib/apparmor/abstractions/gnunet-common
===================================================================
--- gnunet/contrib/apparmor/abstractions/gnunet-common  2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/abstractions/gnunet-common  2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,34 +0,0 @@
-# This files contains common permissions for gnunet
-
-  /usr/share/zoneinfo/                   r,
-  /usr/share/zoneinfo/**                 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,
-
-  #Gnunet librairies
-  /usr/local/lib/libgnunetutil.so.*      mr,
-  
-  #For testbed (if the /tmp directory is used)
-  /tmp/testbed*/                         rw,
-  /tmp/testbed*/**                       rwk,

Added: gnunet/contrib/apparmor/abstractions/gnunet-common
===================================================================
--- gnunet/contrib/apparmor/abstractions/gnunet-common                          
(rev 0)
+++ gnunet/contrib/apparmor/abstractions/gnunet-common  2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,12 @@
+# This files contains common permissions for gnunet
+
+  #GNUnet configuration file
+  @{GNUNET_PREFIX}/share/gnunet/config.d/       r,
+  @{GNUNET_PREFIX}/share/gnunet/config.d/*.conf r,
+  
+  /etc/gnunet.conf                        r,
+  @{HOME}/.config/gnunet.conf     r,
+  owner @{GNUNET_USER}/.config/gnunet.conf r,
+
+  #GNUnet librairies
+  @{GNUNET_PREFIX}/lib/libgnunet*.so.*           mr,

Added: gnunet/contrib/apparmor/abstractions/gnunet-db
===================================================================
--- gnunet/contrib/apparmor/abstractions/gnunet-db                              
(rev 0)
+++ gnunet/contrib/apparmor/abstractions/gnunet-db      2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,8 @@
+# gnunet-db
address@hidden/.local/share/gnunet/namestore/ ra,
address@hidden/.local/share/gnunet/namestore/sqlite.db rwk,
address@hidden/.local/share/gnunet/namestore/sqlite.db-journal rw,
+
address@hidden/.local/share/gnunet/namestore/ r,
address@hidden/.local/share/gnunet/namestore/sqlite.db rwk,
address@hidden/.local/share/gnunet/namestore/sqlite.db-journal rw,

Added: gnunet/contrib/apparmor/abstractions/gnunet-gtk
===================================================================
--- gnunet/contrib/apparmor/abstractions/gnunet-gtk                             
(rev 0)
+++ gnunet/contrib/apparmor/abstractions/gnunet-gtk     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -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,

Deleted: gnunet/contrib/apparmor/abstractions/gnunet-libaudio
===================================================================
--- gnunet/contrib/apparmor/abstractions/gnunet-libaudio        2015-08-17 
02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/abstractions/gnunet-libaudio        2015-08-17 
09:23:39 UTC (rev 36247)
@@ -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,

Added: gnunet/contrib/apparmor/abstractions/gnunet-sgid
===================================================================
--- gnunet/contrib/apparmor/abstractions/gnunet-sgid                            
(rev 0)
+++ gnunet/contrib/apparmor/abstractions/gnunet-sgid    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1 @@
+# gnunet-sgid

Added: gnunet/contrib/apparmor/abstractions/gnunet-suid
===================================================================
--- gnunet/contrib/apparmor/abstractions/gnunet-suid                            
(rev 0)
+++ gnunet/contrib/apparmor/abstractions/gnunet-suid    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -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,
+
+  @address@hidden/**                              r,
+  @address@hidden/@{LIBS}.so*                     mr,
+  @address@hidden/**/@{LIBS}.so*                          mr,
+  /lib/tls/i686/{cmov,nosegneg}/@{LIBS}.so*               mr,
+  /lib/i386-linux-gnu/tls/i686/{cmov,nosegneg}/@{LIBS}.so* mr,

Added: gnunet/contrib/apparmor/abstractions/gnunet-test
===================================================================
--- gnunet/contrib/apparmor/abstractions/gnunet-test                            
(rev 0)
+++ gnunet/contrib/apparmor/abstractions/gnunet-test    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -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,
+  

Deleted: gnunet/contrib/apparmor/gnunet-arm
===================================================================
--- gnunet/contrib/apparmor/gnunet-arm  2015-08-17 02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/gnunet-arm  2015-08-17 09:23:39 UTC (rev 36247)
@@ -1,28 +0,0 @@
-#Last Modified: Fri Jul  3 14:48:33 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/bin/gnunet-arm {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/bin/gnunet-arm mr,
-
-  /usr/lib/gconv/gconv-modules r,
-
-  @{GNUNET_PREFIX}/lib/libgnunetarm.so.* mr,
-
-  /dev/null ra,
-
-  /usr/lib/locale/locale-archive r,
-
-  /usr/share/locale/locale.alias r,
-  /usr/share/locale/fr/LC_MESSAGES/libc.mo r,
-
-  #Gnunet service
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm Px ,
-
-  /tmp/gnunet-*-runtime/ rw,
-  /tmp/gnunet-*-runtime/gnunet-service-arm.sock rw,
-
-  #/tmp/gnunet-gnunet-runtime/* rw,
-}

Added: gnunet/contrib/apparmor/gnunet-arm
===================================================================
--- gnunet/contrib/apparmor/gnunet-arm                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-arm  2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,21 @@
+#Last Modified: Fri Jul  3 14:48:33 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-arm {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-arm mr,
+
+  @{GNUNET_PREFIX}/lib/libgnunetarm.so.* mr,
+
+  #GNUnet service
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm Px ,
+
+  /tmp/gnunet-*-runtime/ rw,
+  /tmp/gnunet-*-runtime/gnunet-service-arm.sock rw,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-ats
===================================================================
--- gnunet/contrib/apparmor/gnunet-ats                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-ats  2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,15 @@
+# Last Modified: Wed Aug  5 15:08:43 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-ats {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{HOME}/.config/gnunet.conf r,
+
+  @{GNUNET_PREFIX}/bin/gnunet-ats mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-auto-share
===================================================================
--- gnunet/contrib/apparmor/gnunet-auto-share                           (rev 0)
+++ gnunet/contrib/apparmor/gnunet-auto-share   2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,27 @@
+# Last Modified: Thu Aug  6 11:44:37 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-auto-share {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{HOME}/.config/gnunet.conf r,
+
+  #Directory access(?)
+  @{HOME}/gnunet-fs/ r,
+  @{HOME}/gnunet-fs/.auto-share rw,
+
+  @{GNUNET_PREFIX}/bin/gnunet-auto-share mr,
+
+  @{GNUNET_PREFIX}/bin/gnunet-publish Px,
+
+  @{GNUNET_PREFIX}/lib/libgnunetutil.so.* mr,
+
+  @{GNUNET_PREFIX}/share/gnunet/config.d/ r,
+  @{GNUNET_PREFIX}/share/gnunet/config.d/*.conf r,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+
+}

Added: gnunet/contrib/apparmor/gnunet-bcd
===================================================================
--- gnunet/contrib/apparmor/gnunet-bcd                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-bcd  2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,14 @@
+# Last Modified: Thu Aug  6 11:50:51 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-bcd {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  
+  @{GNUNET_PREFIX}/bin/gnunet-bcd mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+
+}

Added: gnunet/contrib/apparmor/gnunet-cadet
===================================================================
--- gnunet/contrib/apparmor/gnunet-cadet                                (rev 0)
+++ gnunet/contrib/apparmor/gnunet-cadet        2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Thu Aug  6 11:59:53 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-cadet {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-cadet mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-config
===================================================================
--- gnunet/contrib/apparmor/gnunet-config                               (rev 0)
+++ gnunet/contrib/apparmor/gnunet-config       2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Fri Aug  7 15:36:02 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-config {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-config mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-conversation
===================================================================
--- gnunet/contrib/apparmor/gnunet-conversation                         (rev 0)
+++ gnunet/contrib/apparmor/gnunet-conversation 2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Fri Aug  7 15:41:05 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-conversation {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-conversation mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-conversation-gtk
===================================================================
--- gnunet/contrib/apparmor/gnunet-conversation-gtk                             
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-conversation-gtk     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,26 @@
+# Last Modified: Tue Aug  4 16:59:51 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-conversation-gtk {
+  #include <abstractions/kde>
+  #include <abstractions/gnome>
+  #include <abstractions/gnunet-gtk>
+
+  @{GNUNET_PREFIX}/bin/gnunet-conversation-gtk mr,
+
+  @{GNUNET_PREFIX}/lib/gnunet/ r,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_conversation.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_conversation.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_dns.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_dns.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_gns.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_gns.so mr,
+
+  @{GNUNET_PREFIX}/share/gnunet-gtk/gnunet_conversation_gtk_main_window.glade 
r,
+
+  @{HOME}/.local/share/gnunet/private_key.ecc rk,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-conversation-test
===================================================================
--- gnunet/contrib/apparmor/gnunet-conversation-test                            
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-conversation-test    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,16 @@
+# Last Modified: Fri Aug  7 16:02:29 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-conversation-test {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-conversation-test mr,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-playback Px,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-record Px,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-core
===================================================================
--- gnunet/contrib/apparmor/gnunet-core                         (rev 0)
+++ gnunet/contrib/apparmor/gnunet-core 2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Fri Aug  7 16:12:14 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-core {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-core mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-daemon-exit
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-exit  2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-daemon-exit  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,24 +0,0 @@
-# Last Modified: Mon Jul 27 15:57:50 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-exit {
-  #include <abstractions/gnunet-common>
-
-  /usr/lib/ld-*.so r,
-
-  /usr/lib/locale/locale-archive r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-exit mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetcadet.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdht.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdnsstub.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetregex.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettun.so.* mr,
-
-  /usr/share/locale/locale.alias r,
-
-}

Added: gnunet/contrib/apparmor/gnunet-daemon-exit
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-exit                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-daemon-exit  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Jul 27 15:57:50 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-exit {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-exit mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-daemon-hostlist
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-hostlist      2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-daemon-hostlist      2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,66 +0,0 @@
-# Last Modified: Fri Jul 10 10:43:55 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-hostlist {
-   #include <abstractions/gnunet-common>
-
-  /etc/gai.conf r,
-  /etc/host.conf r,
-  /etc/hosts r,
-  /etc/nsswitch.conf r,
-  /etc/resolv.conf r,
-
-  /usr/lib/gconv/gconv-modules r,
-
-  #Librairies  
-  /usr/lib/ld-*.so r,
-  /usr/lib/libacl.so.* mr,
-  /usr/lib/libattr.so.* mr,
-  /usr/lib/libcap.so.* mr,
-  /usr/lib/libcom_err.so.* mr,
-  /usr/lib/libcrypto.so.* mr,
-  /usr/lib/libffi.so.* mr,
-  /usr/lib/libgmp.so.* mr,
-  /usr/lib/libgnurl.so.* mr,
-  /usr/lib/libgnutls.so.* mr,
-  /usr/lib/libgssapi_krb5.so.* mr,
-  /usr/lib/libhogweed.so.* mr,
-  /usr/lib/libidn.so.* mr,
-  /usr/lib/libk5crypto.so.* mr,
-  /usr/lib/libkeyutils.so.* mr,
-  /usr/lib/libkrb5.so.* mr,
-  /usr/lib/libkrb5support.so.* mr,
-  /usr/lib/liblz4.so.* mr,
-  /usr/lib/liblzma.so.* mr,
-  /usr/lib/libmicrohttpd.so.* mr,
-  /usr/lib/libnettle.so.* mr,
-  /usr/lib/libnss_dns-*.so mr,
-  /usr/lib/libnss_files-*.so mr,
-  /usr/lib/libnss_gns.so.* mr,
-  /usr/lib/libnss_myhostname.so.* mr,
-  /usr/lib/libp11-kit.so.* mr,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/libresolv-*.so mr,
-  /usr/lib/librt-*.so mr,
-  /usr/lib/libseccomp.so.* mr,
-  /usr/lib/libssh2.so.* mr,
-  /usr/lib/libssl.so.* mr,
-  /usr/lib/libtasn1.so.* mr,
-
-  /usr/lib/locale/locale-archive r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-hostlist mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetpeerinfo.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetutil.so.* mr,
-
-  /usr/share/locale/fr/LC_MESSAGES/libc.mo r,
-  /usr/share/locale/locale.alias r,
-}

Added: gnunet/contrib/apparmor/gnunet-daemon-hostlist
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-hostlist                              
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-daemon-hostlist      2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,19 @@
+# Last Modified: Fri Jul 10 10:43:55 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-hostlist {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  /etc/gai.conf r,
+  /etc/host.conf r,
+  /etc/hosts r,
+  /etc/nsswitch.conf r,
+  /etc/resolv.conf r,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-hostlist mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-daemon-latency-logger
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-latency-logger        2015-08-17 
02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/gnunet-daemon-latency-logger        2015-08-17 
09:23:39 UTC (rev 36247)
@@ -1,17 +0,0 @@
-# Last Modified: Mon Jul 27 16:25:08 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-latency-logger {
-  #include <abstractions/gnunet-common>
-
-  /usr/lib/ld-*.so r,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/libsqlite3.so.* mr,
-  /usr/lib/locale/locale-archive r,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-latency-logger mr,
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  /usr/share/locale/locale.alias r,
-
-}

Added: gnunet/contrib/apparmor/gnunet-daemon-latency-logger
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-latency-logger                        
        (rev 0)
+++ gnunet/contrib/apparmor/gnunet-daemon-latency-logger        2015-08-17 
09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Jul 27 16:25:08 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-latency-logger {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-latency-logger mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-daemon-pt
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-pt    2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-daemon-pt    2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,25 +0,0 @@
-# Last Modified: Mon Jul 20 17:48:20 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-pt {
-  #include <abstractions/gnunet-common>
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libidn.so.* mr,
-
-  /usr/lib/locale/locale-archive r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-pt mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetcadet.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdht.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdns.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdnsparser.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetvpn.so.* mr,
-
-  /usr/share/locale/locale.alias r,
-}

Added: gnunet/contrib/apparmor/gnunet-daemon-pt
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-pt                            (rev 0)
+++ gnunet/contrib/apparmor/gnunet-daemon-pt    2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Jul 20 17:48:20 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-pt {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-pt mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-daemon-regexprofiler
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-regexprofiler 2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-daemon-regexprofiler 2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,13 +0,0 @@
-# Last Modified: Tue Jul 28 11:42:58 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-regexprofiler 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-regexprofiler mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdht.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetregexblock.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-
-}

Added: gnunet/contrib/apparmor/gnunet-daemon-regexprofiler
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-regexprofiler                         
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-daemon-regexprofiler 2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Tue Jul 28 11:42:58 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-regexprofiler {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-regexprofiler mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-daemon-testbed-blacklist
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-testbed-blacklist     2015-08-17 
02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/gnunet-daemon-testbed-blacklist     2015-08-17 
09:23:39 UTC (rev 36247)
@@ -1,13 +0,0 @@
-# Last Modified: Tue Jul 28 11:42:58 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-testbed-blacklist 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-testbed-blacklist mr,
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-
-}

Added: gnunet/contrib/apparmor/gnunet-daemon-testbed-blacklist
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-testbed-blacklist                     
        (rev 0)
+++ gnunet/contrib/apparmor/gnunet-daemon-testbed-blacklist     2015-08-17 
09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Tue Jul 28 11:42:58 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-testbed-blacklist {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-testbed-blacklist mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-daemon-testbed-underlay
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-testbed-underlay      2015-08-17 
02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/gnunet-daemon-testbed-underlay      2015-08-17 
09:23:39 UTC (rev 36247)
@@ -1,23 +0,0 @@
-# Last Modified: Mon Jul 27 16:37:03 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-testbed-underlay {
-  #include <abstractions/gnunet-common>
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/libsqlite3.so.* mr,
-
-  /usr/lib/locale/locale-archive r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-testbed-underlay mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-
-  /usr/share/locale/locale.alias r,
-}

Added: gnunet/contrib/apparmor/gnunet-daemon-testbed-underlay
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-testbed-underlay                      
        (rev 0)
+++ gnunet/contrib/apparmor/gnunet-daemon-testbed-underlay      2015-08-17 
09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Jul 27 16:37:03 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-testbed-underlay {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-testbed-underlay mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-daemon-topology
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-topology      2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-daemon-topology      2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,27 +0,0 @@
-# Last Modified: Fri Jul  3 17:37:12 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-topology {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-topology mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetfriends.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetpeerinfo.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-
-  /usr/lib/ld-*.so r,
-  
-  /usr/lib//locale/locale-archive r,
-
-  /usr/lib/gconv/gconv-modules r,
-
-  /usr/share/locale/locale.alias r,
-  /usr/share/locale/fr/LC_MESSAGES/libc.mo r,
-}

Added: gnunet/contrib/apparmor/gnunet-daemon-topology
===================================================================
--- gnunet/contrib/apparmor/gnunet-daemon-topology                              
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-daemon-topology      2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Fri Jul  3 17:37:12 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-topology {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-topology mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-datastore
===================================================================
--- gnunet/contrib/apparmor/gnunet-datastore                            (rev 0)
+++ gnunet/contrib/apparmor/gnunet-datastore    2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Fri Aug  7 16:29:48 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-datastore {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-datastore mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-directory
===================================================================
--- gnunet/contrib/apparmor/gnunet-directory                            (rev 0)
+++ gnunet/contrib/apparmor/gnunet-directory    2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,16 @@
+# Last Modified: Fri Aug  7 16:34:37 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-directory {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-directory mr,
+
+  # Access to directory ?
+
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-dns2gns
===================================================================
--- gnunet/contrib/apparmor/gnunet-dns2gns      2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-dns2gns      2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,26 +0,0 @@
-# Last Modified: Tue Jul 21 16:45:05 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-dns2gns {
-  #include <abstractions/gnunet-common>
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libidn.so.* mr,
-
-  /usr/lib/locale/locale-archive r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-dns2gns mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetdnsparser.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdnsstub.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgns.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgnsrecord.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetidentity.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetnamestore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-
-  /usr/share/locale/locale.alias r,
-}

Added: gnunet/contrib/apparmor/gnunet-dns2gns
===================================================================
--- gnunet/contrib/apparmor/gnunet-dns2gns                              (rev 0)
+++ gnunet/contrib/apparmor/gnunet-dns2gns      2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Tue Jul 21 16:45:05 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-dns2gns {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-dns2gns mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-download
===================================================================
--- gnunet/contrib/apparmor/gnunet-download                             (rev 0)
+++ gnunet/contrib/apparmor/gnunet-download     2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Fri Aug  7 16:42:43 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-download {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-download mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-download-manager.scm
===================================================================
--- gnunet/contrib/apparmor/gnunet-download-manager.scm                         
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-download-manager.scm 2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,25 @@
+# vim:syntax=apparmor
+# Last Modified: Tue Aug 11 11:17:17 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-download-manager.scm {
+  #include <abstractions/base>
+  #include <abstractions/bash>
+
+  /dev/tty rw,
+
+  
@{HOME}/.cache/guile/ccache/address@hidden/bin/gnunet-download-manager.scm.go.* 
rw,
+
+  @{PROC}/@{pid}/statm r,
+
+  /usr/bin/bash ix,
+  /usr/bin/guile rix,
+
+  @{GNUNET_PREFIX}/bin/gnunet-download-manager.scm r,
+
+  /usr/share/guile/**/*.scm r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-ecc
===================================================================
--- gnunet/contrib/apparmor/gnunet-ecc                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-ecc  2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,15 @@
+# Last Modified: Fri Aug  7 16:54:41 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-ecc {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-ecc mr,
+
+  #Access to filename?
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-fs
===================================================================
--- gnunet/contrib/apparmor/gnunet-fs                           (rev 0)
+++ gnunet/contrib/apparmor/gnunet-fs   2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Fri Aug  7 17:09:21 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-fs {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-fs mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-fs-gtk
===================================================================
--- gnunet/contrib/apparmor/gnunet-fs-gtk                               (rev 0)
+++ gnunet/contrib/apparmor/gnunet-fs-gtk       2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,43 @@
+# Last Modified: Wed Aug  5 10:53:37 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-fs-gtk {
+  #include <abstractions/gnome>
+  #include <abstractions/kde>
+  #include <abstractions/dconf>
+  #include <abstractions/gnunet-gtk>
+  #include <abstractions/user-download>
+
+#  /dev/shm/LE-* rw,  
+
+  owner @{HOME}/.config/gtk-*/bookmarks r,
+  owner 
@{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/download-child/* rw,
+  owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/download/ r,
+  owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/download/* rw,
+  owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/search/ r,
+  owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/search/** rw,
+  owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish-file/ 
ra,
+  owner 
@{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish-file/* rw,
+  owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish/ ra,
+  owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish/* rw,
+  
+  #Acces to files to share ? (lets create a gnunet directory in home)
+  owner @{HOME}/gnunet-fs/ r,
+
+  @{GNUNET_PREFIX}/bin/gnunet-fs-gtk mr,
+
+  @{GNUNET_PREFIX}/share/gnunet-gtk/* r,
+
+  /usr/share/glib-*/schemas/gschemas.compiled r,
+
+  #abstractions/dconf but we need write right here 
+  /run/user/*/dconf/user rw,
+ 
+  @{HOME}/.cache/thumbnails/normal/*.png r,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-fs-publish Px,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-gns
===================================================================
--- gnunet/contrib/apparmor/gnunet-gns                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-gns  2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,21 @@
+# Last Modified: Fri Aug  7 17:41:19 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile /usr/local/bin/gnunet-gns {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  /usr/local/bin/gnunet-gns mr,
+
+  /usr/local/lib/gnunet/ r,
+# /usr/local/lib/gnunet/libgnunet_plugin_gnsrecord_conversation.la r,
+  /usr/local/lib/gnunet/libgnunet_plugin_gnsrecord_conversation.so mr,
+# /usr/local/lib/gnunet/libgnunet_plugin_gnsrecord_dns.la r,
+  /usr/local/lib/gnunet/libgnunet_plugin_gnsrecord_dns.so mr,
+# /usr/local/lib/gnunet/libgnunet_plugin_gnsrecord_gns.la r,
+  /usr/local/lib/gnunet/libgnunet_plugin_gnsrecord_gns.so mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-gns-import.sh
===================================================================
--- gnunet/contrib/apparmor/gnunet-gns-import.sh                                
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-gns-import.sh        2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,22 @@
+# Last Modified: Tue Aug 11 10:19:01 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-gns-import.sh {
+  #include <abstractions/base>
+  #include <abstractions/bash>
+  #include <abstractions/gnunet-common>
+
+  /dev/tty rw,
+  /usr/bin/bash ix,
+  /usr/bin/gawk rix,
+  /usr/bin/grep rix,
+  /usr/bin/which rix,
+  @{GNUNET_PREFIX}/bin/gnunet-arm Px,
+  @{GNUNET_PREFIX}/bin/gnunet-config rPx,
+  @{GNUNET_PREFIX}/bin/gnunet-gns-import.sh r,
+  @{GNUNET_PREFIX}/bin/gnunet-identity Px,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-gns-proxy
===================================================================
--- gnunet/contrib/apparmor/gnunet-gns-proxy    2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-gns-proxy    2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,50 +0,0 @@
-# Last Modified: Tue Jul 21 16:35:07 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-gns-proxy {
-  #include <abstractions/gnunet-common>
-
-  /etc/ssl/openssl.cnf r,
-
-  @{HOME}/.local/share/gnunet/gns/gns_ca_cert.pem r,
-
-  #Librairies
-  /usr/lib/gconv/gconv-modules r,
-  /usr/lib/ld-*.so r,
-  /usr/lib/libcom_err.so.* mr,
-  /usr/lib/libcrypto.so.* mr,
-  /usr/lib/libffi.so.* mr,
-  /usr/lib/libgmp.so.* mr,
-  /usr/lib/libgnurl.so.* mr,
-  /usr/lib/libgnutls.so.* mr,
-  /usr/lib/libgssapi_krb5.so.* mr,
-  /usr/lib/libhogweed.so.* mr,
-  /usr/lib/libidn.so.* mr,
-  /usr/lib/libk5crypto.so.* mr,
-  /usr/lib/libkeyutils.so.* mr,
-  /usr/lib/libkrb5.so.* mr,
-  /usr/lib/libkrb5support.so.* mr,
-  /usr/lib/libltdl.so.* mr,
-  /usr/lib/libmicrohttpd.so.* mr,
-  /usr/lib/libnettle.so.* mr,
-  /usr/lib/libp11-kit.so.* mr,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/libresolv-*.so mr,
-  /usr/lib/libssh2.so.* mr,
-  /usr/lib/libssl.so.* mr,
-  /usr/lib/libtasn1.so.* mr,
-
-  /usr/lib/locale/locale-archive r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-gns-proxy mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetdnsparser.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgns.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgnsrecord.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetidentity.so.* mr,
-
-  /usr/share/locale/fr/LC_MESSAGES/libc.mo r,
-  /usr/share/locale/locale.alias r,
-}

Added: gnunet/contrib/apparmor/gnunet-gns-proxy
===================================================================
--- gnunet/contrib/apparmor/gnunet-gns-proxy                            (rev 0)
+++ gnunet/contrib/apparmor/gnunet-gns-proxy    2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,17 @@
+# Last Modified: Tue Jul 21 16:35:07 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-gns-proxy {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  /etc/ssl/openssl.cnf r,
+
+  @{HOME}/.local/share/gnunet/gns/gns_ca_cert.pem r,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-gns-proxy mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-gns-proxy-setup-ca
===================================================================
--- gnunet/contrib/apparmor/gnunet-gns-proxy-setup-ca                           
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-gns-proxy-setup-ca   2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,40 @@
+# Last Modified: Tue Aug 11 11:40:50 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-gns-proxy-setup-ca {
+  #include <abstractions/base>
+  #include <abstractions/bash>
+  #include <abstractions/user-tmp>
+  #include <abstractions/openssl>
+
+  /dev/tty rw,
+  /etc/passwd r,
+  /home/*/.local/share/gnunet/gns/ r,
+  /home/*/.local/share/gnunet/gns/gns_ca_cert.pem rw,
+  /home/*/.mozilla/firefox/ r,
+  /home/*/.mozilla/firefox/kw6js9xl.default/cert8.db rw,
+  /home/*/.mozilla/firefox/kw6js9xl.default/key3.db rw,
+  /home/*/.mozilla/firefox/kw6js9xl.default/secmod.db r,
+  /home/*/.pki/nssdb/cert8.db rw,
+  /home/*/.pki/nssdb/key3.db rw,
+  /home/*/.pki/nssdb/secmod.db r,
+  /home/*/.rnd rw,
+
+  /usr/bin/bash ix,
+  /usr/bin/cat rix,
+  /usr/bin/certtool r,
+  /usr/bin/certutil rix,
+  /usr/bin/dirname rix,
+  /usr/bin/mkdir rix,
+  /usr/bin/mktemp rix,
+  /usr/bin/openssl rix,
+  /usr/bin/rm rix,
+  /usr/bin/which rix,
+
+  @{GNUNET_PREFIX}/bin/gnunet-config Px,
+  @{GNUNET_PREFIX}/bin/gnunet-gns-proxy-setup-ca r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-gtk
===================================================================
--- gnunet/contrib/apparmor/gnunet-gtk                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-gtk  2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,26 @@
+# Last Modified: Wed Aug  5 11:25:26 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-gtk {
+  #include <abstractions/gnome>
+  #include <abstractions/gnunet-gtk>
+  #include <abstractions/kde>
+
+  @{GNUNET_PREFIX}/bin/gnunet-gtk mr,
+
+  #GNUnet gtk binaries
+  @{GNUNET_PREFIX}/bin/gnunet-conversation-gtk Px,
+  @{GNUNET_PREFIX}/bin/gnunet-fs-gtk Px,
+  @{GNUNET_PREFIX}/bin/gnunet-identity-gtk Px,
+  @{GNUNET_PREFIX}/bin/gnunet-namestore-gtk Px,
+  @{GNUNET_PREFIX}/bin/gnunet-peerinfo-gtk Px,
+  @{GNUNET_PREFIX}/bin/gnunet-statistics-gtk Px,
+
+  @{GNUNET_PREFIX}/share/gnunet-gtk/*.png r,
+  @{GNUNET_PREFIX}/share/gnunet-gtk/gnunet_gtk.glade r,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-audio-playback
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-audio-playback        2015-08-17 
02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/gnunet-helper-audio-playback        2015-08-17 
09:23:39 UTC (rev 36247)
@@ -1,10 +0,0 @@
-# Last Modified: Tue Jul 28 11:46:24 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-playback 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-  #include <abstractions/gnunet-libaudio>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-playback mr,
-}

Added: gnunet/contrib/apparmor/gnunet-helper-audio-playback
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-audio-playback                        
        (rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-audio-playback        2015-08-17 
09:23:39 UTC (rev 36247)
@@ -0,0 +1,17 @@
+# Last Modified: Tue Jul 28 11:46:24 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-playback {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/audio>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-playback mr,
+  
+  /etc/machine-id r,
+  owner @{HOME}/.Xauthority r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-audio-record
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-audio-record  2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-helper-audio-record  2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,10 +0,0 @@
-# Last Modified: Tue Jul 28 11:42:58 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-record 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-  #include <abstractions/gnunet-libaudio>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-record mr,
-}

Added: gnunet/contrib/apparmor/gnunet-helper-audio-record
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-audio-record                          
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-audio-record  2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,17 @@
+# Last Modified: Tue Jul 28 11:42:58 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-record {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/audio>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-record mr,
+ 
+  /etc/machine-id r,
+  owner @{HOME}/.Xauthority r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-dns
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-dns   2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-helper-dns   2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,45 +0,0 @@
-# Last Modified: Mon Jul 27 15:24:34 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns flags=(complain) 
{
-  #include <abstractions/gnunet-common>
-
-  #Capability
-  capability net_admin,
-  capability net_raw,
-  capability setuid,
-
-  /dev/net/tun rw,
-  /dev/null rw,
-
-  /etc/gai.conf r,
-  /etc/group r,
-  /etc/iproute2/rt_tables r,
-  /etc/nsswitch.conf r,
-  /etc/protocols r,
-
-  @{PROC}/@{pid}/net/ip_tables_names r,
-  @{PROC}/sys/net/ipv4/conf/all/rp_filter rw,
-  @{PROC}/sys/net/ipv4/conf/default/rp_filter rw,
-
-  /usr/bin/ip rix,
-  /usr/bin/sysctl rix,
-  /usr/bin/xtables-multi rix,
-
-  #Librairies
-  /usr/lib/iptables/libxt_MARK.so mr,
-  /usr/lib/iptables/libxt_owner.so mr,
-  /usr/lib/iptables/libxt_standard.so mr,
-  /usr/lib/iptables/libxt_udp.so mr,
-  /usr/lib/ld-*.so r,
-  /usr/lib/libip4tc.so.* mr,
-  /usr/lib/libip6tc.so.* mr,
-  /usr/lib/libnss_files-*.so mr,
-
-  /usr/lib/libxtables.so.* mr,
-
-  /usr/lib/locale/locale-archive r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns mr,
-}

Added: gnunet/contrib/apparmor/gnunet-helper-dns
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-dns                           (rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-dns   2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,48 @@
+# Last Modified: Mon Jul 27 15:24:34 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns {
+  #include <abstractions/gnunet-suid>
+
+  #Capability
+  capability net_admin,
+  capability net_raw,
+  capability setuid,
+
+  /dev/net/tun rw,
+  /dev/null rw,
+
+  /etc/gai.conf r,
+  /etc/group r,
+  /etc/iproute2/rt_tables r,
+  /etc/nsswitch.conf r,
+  /etc/protocols r,
+
+  @{PROC}/@{pid}/net/ip_tables_names r,
+  @{PROC}/sys/net/ipv4/conf/all/rp_filter rw,
+  @{PROC}/sys/net/ipv4/conf/default/rp_filter rw,
+
+  /usr/bin/ip rix,
+  /usr/bin/sysctl rix,
+  /usr/bin/xtables-multi rix,
+
+  #Librairies
+  /usr/lib/iptables/libxt_MARK.so mr,
+  /usr/lib/iptables/libxt_owner.so mr,
+  /usr/lib/iptables/libxt_standard.so mr,
+  /usr/lib/iptables/libxt_udp.so mr,
+  /usr/lib/ld-*.so r,
+  /usr/lib/libip4tc.so.* mr,
+  /usr/lib/libip6tc.so.* mr,
+  /usr/lib/libnss_files-*.so mr,
+
+  /usr/lib/libxtables.so.* mr,
+
+  /usr/lib/locale/locale-archive r,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-exit
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-exit  2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-helper-exit  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,12 +0,0 @@
-# Last Modified: Tue Jul 28 11:44:00 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-exit 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-
-  capability setuid,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-exit mr,
-
-}

Added: gnunet/contrib/apparmor/gnunet-helper-exit
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-exit                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-exit  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,14 @@
+# Last Modified: Tue Jul 28 11:44:00 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-exit {
+  #include <abstractions/gnunet-suid>
+
+  capability setuid,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-exit mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet-suid>
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-fs-publish
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-fs-publish    2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-helper-fs-publish    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,14 +0,0 @@
-# Last Modified: Tue Jul 28 11:42:58 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-fs-publish 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-
-  /usr/lib/libbz2.so.* mr,
-  /usr/lib/libextractor.so.* mr,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/librt-*.so mr,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-fs-publish mr,
-}

Added: gnunet/contrib/apparmor/gnunet-helper-fs-publish
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-fs-publish                            
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-fs-publish    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,18 @@
+# Last Modified: Tue Jul 28 11:42:58 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-fs-publish {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/user-download>
+
+  /dev/shm/LE-* r,
+
+  /usr/share/file/misc/magic.mgc r,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-fs-publish mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-nat-client
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-nat-client    2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-helper-nat-client    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,12 +0,0 @@
-# Last Modified: Tue Jul 28 11:44:00 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-client 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-
-  capability setuid,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-client mr,
-
-}

Added: gnunet/contrib/apparmor/gnunet-helper-nat-client
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-nat-client                            
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-nat-client    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,14 @@
+# Last Modified: Tue Jul 28 11:44:00 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-client {
+  #include <abstractions/gnunet-suid>
+
+  capability setuid,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-client mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet-suid>
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-nat-server
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-nat-server    2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-helper-nat-server    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,12 +0,0 @@
-# Last Modified: Tue Jul 28 11:44:00 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-
-  capability setuid,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server mr,
-
-}

Added: gnunet/contrib/apparmor/gnunet-helper-nat-server
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-nat-server                            
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-nat-server    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,15 @@
+# Last Modified: Tue Jul 28 11:44:00 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server {
+  #include <abstractions/gnunet-suid>
+
+  capability setuid,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet-suid>
+
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-testbed
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-testbed       2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-helper-testbed       2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,37 +0,0 @@
-# Last Modified: Mon Jul 27 11:02:37 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-testbed 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-
-  /dev/null rw,
- 
-  /etc/gai.conf r,
-
-  /usr/lib/ld-*.so r,
-
-  /usr/lib/locale/locale-archive r,
-
-  /usr/share/locale/locale.alias r,
-  /usr/share/locale/fr/LC_MESSAGES/libc.mo r,
-
-  /usr/lib/gconv/gconv-modules r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/ r,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-testbed mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm r,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed Px,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetarm.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettestbed.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettesting.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-
-  @{GNUNET_PREFIX}/share/gnunet/testing_hostkeys.ecc r,
-}

Added: gnunet/contrib/apparmor/gnunet-helper-testbed
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-testbed                               
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-testbed       2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,21 @@
+# Last Modified: Mon Jul 27 11:02:37 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-testbed {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/gnunet-test>
+
+  /etc/gai.conf r,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/ r,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-testbed mr,
+  address@hidden/lib/gnunet/libexec/gnunet-service-arm r,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed Px,
+
+  @{GNUNET_PREFIX}/share/gnunet/testing_hostkeys.ecc r,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-helper-transport-bluetooth
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-transport-bluetooth                   
        (rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-transport-bluetooth   2015-08-17 
09:23:39 UTC (rev 36247)
@@ -0,0 +1,18 @@
+# Last Modified: Tue Jul 28 11:44:00 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+# Add extra libs for this helper(libthread and libbluetooth)
address@hidden libbluetooth
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-bluetooth {
+  #include <abstractions/gnunet-suid>
+
+  capability setuid,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-bluetooth mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet-suid>
+
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-transport-wlan
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-transport-wlan        2015-08-17 
02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/gnunet-helper-transport-wlan        2015-08-17 
09:23:39 UTC (rev 36247)
@@ -1,12 +0,0 @@
-# Last Modified: Tue Jul 28 11:44:00 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-wlan 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-
-  capability setuid,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-wlan mr,
-
-}

Added: gnunet/contrib/apparmor/gnunet-helper-transport-wlan
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-transport-wlan                        
        (rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-transport-wlan        2015-08-17 
09:23:39 UTC (rev 36247)
@@ -0,0 +1,15 @@
+# Last Modified: Tue Jul 28 11:44:00 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-wlan {
+  #include <abstractions/gnunet-suid>
+
+  capability setuid,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-wlan mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet-suid>
+
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-transport-wlan-dummy
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-transport-wlan-dummy  2015-08-17 
02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/gnunet-helper-transport-wlan-dummy  2015-08-17 
09:23:39 UTC (rev 36247)
@@ -1,10 +0,0 @@
-# Last Modified: Tue Jul 28 11:36:52 2015
-#include <tunables/global>
-#include <tunables/gnunet> 
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-wlan-dummy 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-wlan-dummy mr,
-
-}

Added: gnunet/contrib/apparmor/gnunet-helper-transport-wlan-dummy
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-transport-wlan-dummy                  
        (rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-transport-wlan-dummy  2015-08-17 
09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Tue Jul 28 11:36:52 2015
+#include <tunables/global>
+#include <tunables/gnunet> 
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-wlan-dummy 
{
+  #include <abstractions/gnunet-suid>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-wlan-dummy mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+
+}

Deleted: gnunet/contrib/apparmor/gnunet-helper-vpn
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-vpn   2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-helper-vpn   2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,21 +0,0 @@
-# Last Modified: Mon Jul 27 11:06:22 2015
-#include <tunables/global>
-#include <tunables/gnunet> 
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-vpn flags=(complain) 
{
-
-  #Capability
-  capability net_admin,
-  capability setuid,
-
-  /dev/net/tun rw,
-  /etc/ld.so.cache r,
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libc-*.so mr,
-  /usr/lib/libm-*.so mr,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-vpn mr,
-
-}

Added: gnunet/contrib/apparmor/gnunet-helper-vpn
===================================================================
--- gnunet/contrib/apparmor/gnunet-helper-vpn                           (rev 0)
+++ gnunet/contrib/apparmor/gnunet-helper-vpn   2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,18 @@
+# Last Modified: Mon Jul 27 11:06:22 2015
+#include <tunables/global>
+#include <tunables/gnunet> 
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-vpn {
+  #include <abstractions/gnunet-suid>
+
+  #Capability
+  capability net_admin,
+  capability setuid,
+
+  /dev/net/tun rw,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-vpn mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-identity
===================================================================
--- gnunet/contrib/apparmor/gnunet-identity                             (rev 0)
+++ gnunet/contrib/apparmor/gnunet-identity     2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,15 @@
+# Last Modified: Fri Aug  7 17:48:29 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-identity {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{HOME}/.local/share/gnunet/identity/egos/* rw,
+
+  @{GNUNET_PREFIX}/bin/gnunet-identity mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-identity-gtk
===================================================================
--- gnunet/contrib/apparmor/gnunet-identity-gtk                         (rev 0)
+++ gnunet/contrib/apparmor/gnunet-identity-gtk 2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,16 @@
+# Last Modified: Wed Aug  5 11:24:55 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-identity-gtk {
+  #include <abstractions/gnome>
+  #include <abstractions/gnunet-gtk>
+  #include <abstractions/kde>
+
+  @{GNUNET_PREFIX}/bin/gnunet-identity-gtk mr,
+
+  @{GNUNET_PREFIX}/share/gnunet-gtk/gnunet_identity_gtk_main_window.glade r,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-mesh
===================================================================
--- gnunet/contrib/apparmor/gnunet-mesh                         (rev 0)
+++ gnunet/contrib/apparmor/gnunet-mesh 2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Fri Aug  7 18:02:28 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-mesh {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-mesh mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-namecache
===================================================================
--- gnunet/contrib/apparmor/gnunet-namecache                            (rev 0)
+++ gnunet/contrib/apparmor/gnunet-namecache    2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Fri Aug  7 18:07:23 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-namecache {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-namecache mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-namestore
===================================================================
--- gnunet/contrib/apparmor/gnunet-namestore                            (rev 0)
+++ gnunet/contrib/apparmor/gnunet-namestore    2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,21 @@
+# Last Modified: Mon Aug 10 11:05:21 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-namestore {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-namestore mr,
+
+  #GNUnet plugin
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_conversation.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_conversation.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_dns.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_dns.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_gns.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_gns.so mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-namestore-fcfsd
===================================================================
--- gnunet/contrib/apparmor/gnunet-namestore-fcfsd      2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-namestore-fcfsd      2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,31 +0,0 @@
-# Last Modified: Tue Jul 21 17:25:12 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-namestore-fcfsd {
-  #include <abstractions/gnunet-common>
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libffi.so.* mr,
-  /usr/lib/libgmp.so.* mr,
-  /usr/lib/libgnutls.so.* mr,
-  /usr/lib/libhogweed.so.* mr,
-  /usr/lib/libidn.so.* mr,
-  /usr/lib/libmicrohttpd.so.* mr,
-  /usr/lib/libnettle.so.* mr,
-  /usr/lib/libp11-kit.so.* mr,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/libtasn1.so.* mr,
-
-  /usr/lib/locale/locale-archive r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-namestore-fcfsd mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetdnsparser.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgnsrecord.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetidentity.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetnamestore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-namestore-fcfsd
===================================================================
--- gnunet/contrib/apparmor/gnunet-namestore-fcfsd                              
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-namestore-fcfsd      2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Tue Jul 21 17:25:12 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-namestore-fcfsd {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-namestore-fcfsd mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-namestore-gtk
===================================================================
--- gnunet/contrib/apparmor/gnunet-namestore-gtk                                
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-namestore-gtk        2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,27 @@
+# Last Modified: Wed Aug  5 11:24:52 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-namestore-gtk {
+  #include <abstractions/gnome>
+  #include <abstractions/gnunet-gtk>
+  #include <abstractions/kde>
+
+  @{GNUNET_PREFIX}/bin/gnunet-namestore-gtk mr,
+
+  @{GNUNET_PREFIX}/lib/gnunet/ r,
+
+  #GNUnet plugin
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_conversation.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_conversation.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_dns.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_dns.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_gns.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_gnsrecord_gns.so mr,
+
+  @{GNUNET_PREFIX}/share/gnunet-gtk/gnunet_namestore_gtk_main_window.glade r,
+  @{GNUNET_PREFIX}/share/gnunet-gtk/qr_dummy.png r,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-nat-server
===================================================================
--- gnunet/contrib/apparmor/gnunet-nat-server                           (rev 0)
+++ gnunet/contrib/apparmor/gnunet-nat-server   2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 11:34:29 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-nat-server {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-nat-server mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-nse
===================================================================
--- gnunet/contrib/apparmor/gnunet-nse                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-nse  2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 11:38:47 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-nse {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-nse mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-peerinfo
===================================================================
--- gnunet/contrib/apparmor/gnunet-peerinfo                             (rev 0)
+++ gnunet/contrib/apparmor/gnunet-peerinfo     2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,19 @@
+# Last Modified: Mon Aug 10 11:46:50 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-peerinfo {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-peerinfo mr,
+
+  #GNUnet plugin
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_tcp.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_tcp.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_udp.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_udp.so mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-peerinfo-gtk
===================================================================
--- gnunet/contrib/apparmor/gnunet-peerinfo-gtk                         (rev 0)
+++ gnunet/contrib/apparmor/gnunet-peerinfo-gtk 2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,17 @@
+# Last Modified: Tue Aug 11 16:20:57 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-peerinfo-gtk {
+  #include <abstractions/gnome>
+  #include <abstractions/gnunet-gtk>
+  #include <abstractions/kde>
+
+  @{GNUNET_PREFIX}/bin/gnunet-peerinfo-gtk mr,
+
+  @{GNUNET_PREFIX}/share/gnunet-gtk/* r,
+  @{GNUNET_PREFIX}/share/gnunet-gtk/flags/*.png r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-peerstore
===================================================================
--- gnunet/contrib/apparmor/gnunet-peerstore                            (rev 0)
+++ gnunet/contrib/apparmor/gnunet-peerstore    2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 12:03:53 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-peerstore {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-peerstore mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-publish
===================================================================
--- gnunet/contrib/apparmor/gnunet-publish                              (rev 0)
+++ gnunet/contrib/apparmor/gnunet-publish      2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,16 @@
+# Last Modified: Thu Aug  6 12:00:00 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-publish {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/user-download>
+
+  @{GNUNET_PREFIX}/bin/gnunet-publish mr,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-fs-publish Px,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-qr
===================================================================
--- gnunet/contrib/apparmor/gnunet-qr                           (rev 0)
+++ gnunet/contrib/apparmor/gnunet-qr   2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,15 @@
+# Last Modified: Tue Aug 11 16:14:05 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-qr {
+  #include <abstractions/base>
+  #include <abstractions/python>
+  #include <abstractions/gnunet-common>
+
+  /usr/bin/python3.4 ix,
+  @{GNUNET_PREFIX}/bin/gnunet-qr r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-resolver
===================================================================
--- gnunet/contrib/apparmor/gnunet-resolver                             (rev 0)
+++ gnunet/contrib/apparmor/gnunet-resolver     2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 12:21:50 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-resolver {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-resolver mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-revocation
===================================================================
--- gnunet/contrib/apparmor/gnunet-revocation                           (rev 0)
+++ gnunet/contrib/apparmor/gnunet-revocation   2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 15:03:13 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-revocation {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-revocation mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-scalarproduct
===================================================================
--- gnunet/contrib/apparmor/gnunet-scalarproduct                                
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-scalarproduct        2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 15:13:42 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-scalarproduct {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-scalarproduct mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-scrypt
===================================================================
--- gnunet/contrib/apparmor/gnunet-scrypt                               (rev 0)
+++ gnunet/contrib/apparmor/gnunet-scrypt       2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,19 @@
+# Last Modified: Mon Aug 10 15:36:34 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-scrypt {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{HOME}/.local/share/gnunet/nse/proof.dat rw,
+  @{HOME}/.local/share/gnunet/private_key.ecc rk,
+
+  @{GNUNET_PREFIX}/bin/gnunet-scrypt mr,
+
+  @{GNUNET_USER}/.local/share/gnunet/nse/proof.dat rw,
+  @{GNUNET_USER}/.local/share/gnunet/private_key.ecc rk,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-search
===================================================================
--- gnunet/contrib/apparmor/gnunet-search                               (rev 0)
+++ gnunet/contrib/apparmor/gnunet-search       2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 15:59:45 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-search {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-search mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-arm
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-arm  2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-service-arm  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,108 +0,0 @@
-# Last Modified: Thu Jul  9 10:27:23 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm {
-  #include <abstractions/gnunet-common> 
-
-  /dev/null ra,
-
-  /tmp/gnunet-*-runtime/ rw,
-  /tmp/gnunet-*-runtime/gnunet-service-arm.sock rw,
-  /tmp/gnunet-*-runtime/gnunet-service-gns.sock rw,
-  /tmp/gnunet-*-runtime/gnunet-service-identity.unix rw,
-  /tmp/gnunet-*-runtime/gnunet-service-namestore.sock rw,
-
-  /tmp/gnunet-system-runtime/ rw,
-  /tmp/gnunet-system-runtime/gnunet-service-*.sock rw,
-  /tmp/gnunet-system-runtime/gnunet-service-nse.unix rw,
-  /tmp/gnunet-system-runtime/gnunet-service-revocation.unix rw,
-
-  /var/lib/gnunet/.local/share/gnunet/ r,
-  /var/lib/gnunet/.local/share/gnunet/revocation.dat r,
-  /var/lib/gnunet/.local/share/gnunet/peerstore/ a,
-  /var/lib/gnunet/.local/share/gnunet/peerstore/sqlite.db rwk,
-  /var/lib/gnunet/.local/share/gnunet/peerstore/sqlite.db-journal rw,
-  /var/lib/gnunet/.config/gnunet.conf r,
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libpthread-*.so mr,
-  
-  /usr/lib/libsqlite3.so.* mr,
-
-  /usr/lib/locale/locale-archive r,
-
-  /usr/share/locale/locale-alias r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm mr,
-
-  @{GNUNET_PREFIX}/lib/gnunet/ r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/ r,
-
-  #Gnunet daemon
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-exit Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-hostlist Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-latency-logger Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-testbed-underlay Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-topology Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-pt Px,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-dns2gns Px,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-gns-proxy Px,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-namestore-fcfsd Px,
-
-  #Gnunet service
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-ats Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-cadet Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-core Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-conversation Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-datastore Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dht Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dns Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-fs Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-gns Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-identity Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-namecache Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-namestore Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-nse Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-peerinfo Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-peerstore Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-regex Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-resolver Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-revocation Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-set Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-scalarproduct-alice Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-scalarproduct-bob Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-statistics Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-template Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed-logger Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-transport Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-vpn Px,
-
-  #Gnunet helper
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns r,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcadet.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdht.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdnsstub.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgnsrecord.so.* r,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetnamecache.so.* r,
-  @{GNUNET_PREFIX}/lib/libgnunetpeerstore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetregex.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetset.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettun.so.* mr,
-
-  #Gnunet plugin
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_peerstore_sqlite.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_peerstore_sqlite.so mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-arm
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-arm                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-arm  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,42 @@
+# Last Modified: Thu Jul  9 10:27:23 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common> 
+
+  /tmp/gnunet-*-runtime/ rw,
+# /tmp/gnunet-*-runtime/gnunet-service-arm.sock rw,
+# /tmp/gnunet-*-runtime/gnunet-service-namestore.sock r,
+# /tmp/gnunet-*-runtime/gnunet-service-identity.sock r,
+# /tmp/gnunet-*-runtime/gnunet-service-gns.sock r,
+  
+  /tmp/gnunet-*-runtime/gnunet-service-*.sock rw,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm mr,
+
+  @{GNUNET_PREFIX}/lib/gnunet/ r,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/ r,
+
+  #GNUnet daemon
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-exit Px,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-hostlist Px,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-latency-logger Px,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-testbed-underlay Px,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-topology Px,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-pt Px,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-dns2gns Px,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-gns-proxy Px,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-namestore-fcfsd Px,
+
+  #GNUnet service
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-* Px,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-ats
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-ats  2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-service-ats  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,20 +0,0 @@
-# Last Modified: Wed Jul  8 10:49:34 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-ats {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-ats mr,
-  
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-
-  #Gnunet plugin
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_ats_proportional.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_ats_proportional.so mr,
-
-  /usr/lib/ld-*.so r,
-}

Added: gnunet/contrib/apparmor/gnunet-service-ats
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-ats                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-ats  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,18 @@
+# Last Modified: Wed Jul  8 10:49:34 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-ats {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-ats mr,
+  
+  #Gnunet plugin
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_ats_proportional.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_ats_proportional.so mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-cadet
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-cadet        2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-cadet        2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,26 +0,0 @@
-# Last Modified: Mon Jul 27 11:09:34 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-cadet {
-  #include <abstractions/gnunet-common>
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/librt-*.so mr,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-cadet mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetblock.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdht.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetpeerinfo.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-
-  /var/lib/gnunet/.local/share/gnunet/private_key.ecc rk,
-}

Added: gnunet/contrib/apparmor/gnunet-service-cadet
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-cadet                                
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-cadet        2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,17 @@
+# Last Modified: Mon Jul 27 11:09:34 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-cadet {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  /tmp/gnunet-system-runtime/gnunet-service-cadet.sock rw,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-cadet mr,
+
+  @{GNUNET_USER}/.local/share/gnunet/private_key.ecc rk,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-conversation
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-conversation 2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-conversation 2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,27 +0,0 @@
-# Last Modified: Tue Jul 21 16:53:39 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-conversation {
-  #include <abstractions/gnunet-common>
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libidn.so.* mr,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-conversation mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetcadet.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetconversation.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdnsparser.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgns.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgnsrecord.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetidentity.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetmicrophone.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetnamestore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetspeaker.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-
-  /var/lib/gnunet/.local/share/gnunet/private_key.ecc rk,
-}

Added: gnunet/contrib/apparmor/gnunet-service-conversation
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-conversation                         
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-conversation 2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,19 @@
+# Last Modified: Tue Jul 21 16:53:39 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-conversation {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-conversation mr,
+
+  #GNUnet helper
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-playback Px,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-audio-record   Px,
+
+  @{GNUNET_USER}/.local/share/gnunet/private_key.ecc rk,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-core
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-core 2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-service-core 2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,20 +0,0 @@
-# Last Modified: Thu Jul  9 10:16:30 2015
-
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-core {
-  #include <abstractions/gnunet-common>
-
-  /var/lib/gnunet/.local/share/gnunet/private_key.ecc rk,
-
-  /usr/lib/ld-*.so r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-core mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-core
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-core                         (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-core 2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,15 @@
+# Last Modified: Thu Jul  9 10:16:30 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-core {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_USER}/.local/share/gnunet/private_key.ecc rk,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-core mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-datastore
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-datastore    2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-datastore    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,27 +0,0 @@
-# Last Modified: Thu Jul  9 10:16:30 2015
-
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-datastore {
-  #include <abstractions/gnunet-common>
-  
-  /var/lib/gnunet/.local/share/gnunet/datastore/bloomfilter.sqlite rw,
-  /var/lib/gnunet/.local/share/gnunet/datastore/sqlite.db rwk,
-  /var/lib/gnunet/.local/share/gnunet/datastore/sqlite.db-journal rw,
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/libsqlite3.so.* mr,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-datastore mr,
-
-  #Gnunet plugin
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datastore_sqlite.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datastore_sqlite.so mr,
-
-  #Gnunet Librairies
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetutil.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-datastore
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-datastore                            
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-datastore    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,22 @@
+# Last Modified: Thu Jul  9 10:16:30 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-datastore {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/gnunet-db>
+  
+  @{GNUNET_USER}/.local/share/gnunet/datastore/bloomfilter.sqlite rw,
+  @{GNUNET_USER}/.local/share/gnunet/datastore/sqlite.db rwk,
+  @{GNUNET_USER}/.local/share/gnunet/datastore/sqlite.db-journal rw,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-datastore mr,
+
+  #Gnunet plugin
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datastore_sqlite.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datastore_sqlite.so mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-dht
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-dht  2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-service-dht  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,57 +0,0 @@
-# Last Modified: Fri Jul  3 17:37:39 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dht {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dht mr,
- 
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetnse.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetpeerinfo.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetblock.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdatacache.so.* mr,  
-  @{GNUNET_PREFIX}/lib/libgnunetfs.so.* mr,  
-  @{GNUNET_PREFIX}/lib/libgnunetdatastore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetregexblock.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgnsrecord.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdnsparser.so.* mr,
-  
-  #Gnunet plugin
-  @{GNUNET_PREFIX}/lib/gnunet/ r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_template.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_template.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dns.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dns.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_fs.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_fs.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_regex.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_regex.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dht.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dht.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dht.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_test.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_test.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_gns.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_gns.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datacache_heap.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datacache_heap.so mr,
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libextractor.so.* mr,
-  /usr/lib/libbz2.so.* mr,
-  /usr/lib/librt-*.so mr,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/libidn.so.* mr,
-
-  /tmp/gnunet-system-runtime/gnunet-service-dht.sock w,
-  
-  /tmp/gnunet-datacachebloom* rw,
-}

Added: gnunet/contrib/apparmor/gnunet-service-dht
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-dht                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-dht  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,36 @@
+# Last Modified: Fri Jul  3 17:37:39 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dht {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dht mr,
+ 
+  #Gnunet plugin
+  @{GNUNET_PREFIX}/lib/gnunet/ r,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_template.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_template.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dns.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dns.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_fs.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_fs.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_regex.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_regex.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dht.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dht.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_test.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_test.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_gns.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_gns.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datacache_heap.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datacache_heap.so mr,
+
+  /tmp/gnunet-system-runtime/gnunet-service-dht.sock w,
+  
+  /tmp/gnunet-datacachebloom* rw,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-dns
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-dns  2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-service-dns  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,20 +0,0 @@
-# Last Modified: Mon Jul 27 15:18:30 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dns {
-  #include <abstractions/gnunet-common>
-
-  capability setgid,
-
-  /usr/lib/ld-*.so r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns Px,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dns mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetdnsstub.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettun.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-dns
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-dns                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-dns  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,24 @@
+# Last Modified: Mon Jul 27 15:18:30 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dns {
+  #include <abstractions/gnunet-sgid>
+
+  capability setgid,
+
+  /usr/lib/ld-*.so r,
+
+  #GNUnet helper
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns Px,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dns mr,
+
+  #Gnunet librairies
+  @{GNUNET_PREFIX}/lib/libgnunetdnsstub.so.* mr,
+  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
+  @{GNUNET_PREFIX}/lib/libgnunettun.so.* mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet-sgid>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-fs
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-fs   2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-service-fs   2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,59 +0,0 @@
-# Last Modified: Wed Jul  8 10:52:48 2015
-
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-fs {
-  #include <abstractions/gnunet-common>
-
-  /etc/gnunet.conf r,
-  @{HOME}/.config/gnunet.conf r,
-
-  /tmp/gnunet-system-runtime/gnunet-service-fs.sock w,
-
-  /var/lib/gnunet/.local/share/gnunet/private_key.ecc rk,
-
-  owner @{HOME}/.local/share/gnunet/fs/idxinfo.lst r,
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libbz2.so.* mr,
-  /usr/lib/libextractor.so.* mr,
-  /usr/lib/libidn.so.* mr,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/librt-*.so mr,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-fs mr,
-
-  #Gnunet plugin
-  @{GNUNET_PREFIX}/lib/gnunet/ r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dht.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dht.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dns.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dns.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_fs.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_fs.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_gns.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_gns.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_regex.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_regex.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_template.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_template.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_test.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_test.so mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetblock.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcadet.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdatastore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdht.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdnsparser.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetfs.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgnsrecord.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetpeerstore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetregexblock.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-fs
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-fs                           (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-fs   2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,37 @@
+# Last Modified: Wed Jul  8 10:52:48 2015
+
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-fs {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  /tmp/gnunet-system-runtime/gnunet-service-fs.sock w,
+
+  @{GNUNET_USER}/.local/share/gnunet/private_key.ecc rk,
+
+  owner @{HOME}/.local/share/gnunet/fs/idxinfo.lst r,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-fs mr,
+
+  #Gnunet plugin
+  @{GNUNET_PREFIX}/lib/gnunet/ r,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dht.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dht.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dns.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_dns.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_fs.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_fs.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_gns.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_gns.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_regex.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_regex.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_template.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_template.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_test.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_block_test.so mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-gns
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-gns  2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-service-gns  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,30 +0,0 @@
-# Last Modified: Wed Jul  8 15:17:46 2015
-
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-gns {
-  #include <abstractions/gnunet-common>
-
-  @{HOME}/.config/gnunet.conf r,
-
-  #Librairies
-  /usr/lib/ld-2.21.so r,
-  /usr/lib/libidn.so.* mr,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-gns mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetdht.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdns.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdnsparser.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdnsstub.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgnsrecord.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetidentity.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetnamecache.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetnamestore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetrevocation.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettun.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetvpn.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-gns
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-gns                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-gns  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,18 @@
+# Last Modified: Wed Jul  8 15:17:46 2015
+
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-gns {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  /tmp/gnunet-*-runtime/gnunet-service-gns.sock rw,
+
+  @{HOME}/.config/gnunet.conf r,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-gns mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-identity
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-identity     2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-identity     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,25 +0,0 @@
-# Last Modified: Tue Jul 21 11:51:29 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-identity {
-  #include <abstractions/gnunet-common>
-
-  /tmp/gnunet-*-runtime/ a,
-
-  /usr/lib/ld-*.so r,
-
-  /var/lib/gnunet/.local/share/gnunet/identity/ a,
-  /var/lib/gnunet/.local/share/gnunet/identity/egos/ ra,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-identity mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-
-  @{HOME}/.config/gnunet/identity/subsystem_defaults.conf rw,
-
-  @{HOME}/.local/share/gnunet/identity/egos/ r,
-  @{HOME}/.local/share/gnunet/identity/egos/master-zone rk,
-  @{HOME}/.local/share/gnunet/identity/egos/private-zone rk,
-  @{HOME}/.local/share/gnunet/identity/egos/short-zone rk,
-  @{HOME}/.local/share/gnunet/identity/egos/sks-zone rk,
-}

Added: gnunet/contrib/apparmor/gnunet-service-identity
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-identity                             
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-identity     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,26 @@
+# Last Modified: Tue Jul 21 11:51:29 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-identity {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  /tmp/gnunet-*-runtime/ a,
+
+  @{GNUNET_USER}/.local/share/gnunet/identity/ a,
+  @{GNUNET_USER}/.local/share/gnunet/identity/egos/ ra,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-identity mr,
+
+  @{HOME}/.config/gnunet/identity/subsystem_defaults.conf rw,
+
+  @{HOME}/.local/share/gnunet/identity/egos/ r,
+  @{HOME}/.local/share/gnunet/identity/egos/master-zone rk,
+  @{HOME}/.local/share/gnunet/identity/egos/private-zone rk,
+  @{HOME}/.local/share/gnunet/identity/egos/short-zone rk,
+  @{HOME}/.local/share/gnunet/identity/egos/sks-zone rk,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-service-mesh
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-mesh                         (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-mesh 2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,19 @@
+# Last Modified: Fri Jul  3 17:37:56 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-mesh {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-mesh mr,
+
+  @{HOME}/.local/share/gnunet/private_key.ecc rk,
+
+  /tmp/gnunet-system-runtime/gnunet-service-mesh.sock w,
+
+  @{GNUNET_USER}/.local/share/gnunet/private_key.ecc rwk,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-namecache
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-namecache    2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-namecache    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,30 +0,0 @@
-# Last Modified: Thu Jul  9 10:01:49 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-namecache {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-namecache mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetdnsparser.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetnamecache.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgnsrecord.so.* mr,
-
-  #Gnunet plugin
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_namecache_sqlite.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_namecache_sqlite.so mr,
-
-  /var/lib/gnunet/.local/share/gnunet/namecache/ r,
-  /var/lib/gnunet/.local/share/gnunet/namecache/sqlite.db rwk,
-  /var/lib/gnunet/.local/share/gnunet/namecache/sqlite.db-journal rw,
-
-  #Librairies  
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/libsqlite3.so.* mr,
-  /usr/lib/libidn.so.* mr,
-  /usr/lib/ld-*.so r,
-}
-

Added: gnunet/contrib/apparmor/gnunet-service-namecache
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-namecache                            
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-namecache    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,23 @@
+# Last Modified: Thu Jul  9 10:01:49 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-namecache {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/gnunet-db>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-namecache mr,
+
+  #Gnunet plugin
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_namecache_sqlite.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_namecache_sqlite.so mr,
+
+  @{GNUNET_USER}/.local/share/gnunet/namecache/ r,
+  @{GNUNET_USER}/.local/share/gnunet/namecache/sqlite.db rwk,
+  @{GNUNET_USER}/.local/share/gnunet/namecache/sqlite.db-journal rw,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}
+

Deleted: gnunet/contrib/apparmor/gnunet-service-namestore
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-namestore    2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-namestore    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,36 +0,0 @@
-# Last Modified: Tue Jul  7 10:43:41 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-namestore {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-namestore mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetnamecache.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetgnsrecord.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetnamestore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetdnsparser.so.* mr,
-
-  #Gnunet plugin
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_namestore_sqlite.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_namestore_sqlite.so mr,
-
-  #Librairies
-  /usr/lib/libidn.so.* mr,
-  /usr/lib/ld-*.so r,
-  /usr/lib/libsqlite3.so.* mr,
-  /usr/lib/libpthread-*.so mr,
-
-  /var/lib/gnunet/.local/share/gnunet/namestore/ ra,
-  /var/lib/gnunet/.local/share/gnunet/namestore/sqlite.db rwk,
-  /var/lib/gnunet/.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,
-
-  /tmp/gnunet-*-runtime/ a,
-}

Added: gnunet/contrib/apparmor/gnunet-service-namestore
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-namestore                            
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-namestore    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,20 @@
+# Last Modified: Tue Jul  7 10:43:41 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-namestore {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/gnunet-db>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-namestore mr,
+
+  #Gnunet plugin
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_namestore_sqlite.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_namestore_sqlite.so mr,
+
+  /tmp/gnunet-*-runtime/ a,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-nse
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-nse  2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-service-nse  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,24 +0,0 @@
-# Last Modified: Fri Jul  3 17:37:49 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-nse {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-nse mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetnse.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-
-  /usr/lib/ld-*.so mr,
-
-  /tmp/gnunet-system-runtime/gnunet-service-nse.unix w,
-
-  @{HOME}/.local/share/gnunet/private_key.ecc rk,
-  owner @{HOME}/.local/share/gnunet/nse/proof.dat rw,
-
-  /var/lib/gnunet/.local/share/gnunet/private_key.ecc rwk,
-  /var/lib/gnunet/.local/share/gnunet/nse/proof.dat rw,
-}

Added: gnunet/contrib/apparmor/gnunet-service-nse
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-nse                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-nse  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,21 @@
+# Last Modified: Fri Jul  3 17:37:49 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-nse {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-nse mr,
+
+  /tmp/gnunet-system-runtime/gnunet-service-nse.sock rw,
+
+  @{HOME}/.local/share/gnunet/private_key.ecc rk,
+  owner @{HOME}/.local/share/gnunet/nse/proof.dat rw,
+
+  @{GNUNET_USER}/.local/share/gnunet/private_key.ecc rwk,
+  @{GNUNET_USER}/.local/share/gnunet/nse/proof.dat rw,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-peerinfo
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-peerinfo     2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-peerinfo     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,21 +0,0 @@
-# Last Modified: Wed Jul  8 17:03:17 2015
-
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-peerinfo {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/share/gnunet/hellos/ r,
-  @{GNUNET_PREFIX}/share/gnunet/hellos/* r,
-
-  /var/lib/gnunet/.local/share/gnunet/peerinfo/hosts/ r,
-  /var/lib/gnunet/.local/share/gnunet/peerinfo/hosts/* rw,
-
-  /usr/lib/ld-*.so r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-peerinfo mr,
-
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-peerinfo
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-peerinfo                             
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-peerinfo     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,20 @@
+# Last Modified: Wed Jul  8 17:03:17 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-peerinfo {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/share/gnunet/hellos/ r,
+  @{GNUNET_PREFIX}/share/gnunet/hellos/* r,
+
+  @{GNUNET_USER}/.local/share/gnunet/peerinfo/hosts/ r,
+  @{GNUNET_USER}/.local/share/gnunet/peerinfo/hosts/* rw,
+
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-peerinfo mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-peerstore
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-peerstore    2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-peerstore    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,24 +0,0 @@
-# Last Modified: Mon Jul 27 11:06:13 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-peerstore {
-  #include <abstractions/gnunet-common>
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/libsqlite3.so.* mr,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-peerstore mr,
-
-  #Gnunet Plugin
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_peerstore_sqlite.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_peerstore_sqlite.so mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetpeerstore.so.* mr,
-
-  /var/lib/gnunet/.local/share/gnunet/peerstore/sqlite.db rwk,
-  /var/lib/gnunet/.local/share/gnunet/peerstore/sqlite.db-journal rw,
-}

Added: gnunet/contrib/apparmor/gnunet-service-peerstore
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-peerstore                            
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-peerstore    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,21 @@
+# Last Modified: Mon Jul 27 11:06:13 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-peerstore {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/gnunet-db>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-peerstore mr,
+
+  #Gnunet Plugin
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_peerstore_sqlite.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_peerstore_sqlite.so mr,
+
+  @{GNUNET_USER}/.local/share/gnunet/peerstore/sqlite.db rwk,
+  @{GNUNET_USER}/.local/share/gnunet/peerstore/sqlite.db-journal rw,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-regex
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-regex        2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-regex        2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,18 +0,0 @@
-# Last Modified: Tue Jul 21 16:59:39 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-regex {
-  #include <abstractions/gnunet-common>
-
-  /usr/lib/ld-*.so r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-regex mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetdht.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetregexblock.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-
-  /var/lib/gnunet/.local/share/gnunet/private_key.ecc rk,
-}

Added: gnunet/contrib/apparmor/gnunet-service-regex
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-regex                                
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-regex        2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,15 @@
+# Last Modified: Tue Jul 21 16:59:39 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-regex {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-regex mr,
+
+  @{GNUNET_USER}/.local/share/gnunet/private_key.ecc rk,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-resolver
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-resolver     2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-resolver     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,33 +0,0 @@
-# Last Modified: Thu Jul  9 10:01:36 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-resolver {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-resolver mr,
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-  /usr/lib/libnss_files-*.so mr,
-  /usr/lib/libnss_gns.so.* mr,
-  /usr/lib/libnss_dns-*.so mr,
-  /usr/lib/libresolv-*.so mr,
-  /usr/lib/libnss_myhostname.so.* mr,
-  /usr/lib/librt-*.so mr,
-  /usr/lib/liblzma.so.* mr,
-  /usr/lib/liblz4.so.* mr,
-  /usr/lib/libacl.so.* mr,
-  /usr/lib/libidn.so.* mr,
-  /usr/lib/libseccomp.so.* mr,
-  /usr/lib/libcap.so.* mr,
-  /usr/lib/libpthread-*.so mr,
-  /usr/lib/libattr.so.* mr,
-
-  /etc/nsswitch.conf r,
-  /etc/resolv.conf r,
-  /etc/host.conf r,
-  /etc/hosts r,
-
-  /tmp/gnunet-system-runtime/gnunet-service-resolver.sock w,
-}

Added: gnunet/contrib/apparmor/gnunet-service-resolver
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-resolver                             
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-resolver     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,20 @@
+# Last Modified: Thu Jul  9 10:01:36 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-resolver {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-resolver mr,
+
+  /etc/nsswitch.conf r,
+  /etc/resolv.conf r,
+  /etc/host.conf r,
+  /etc/hosts r,
+
+  /tmp/gnunet-system-runtime/gnunet-service-resolver.sock w,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-revocation
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-revocation   2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-revocation   2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,27 +0,0 @@
-# Last Modified: Thu Jul  9 10:16:30 2015
-
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-revocation {
-  #include <abstractions/gnunet-common>
-  
-  /etc/gnunet.conf r,
-  @{HOME}/.config/gnunet.conf r,
-
-  /tmp/gnunet-system-runtime/gnunet-service-revocation.unix w,
-
-  /var/lib/gnunet/.local/share/gnunet/revocation.dat rw,
-
-  @{HOME}/.local/share/gnunet/revocation.dat rw,
-
-  /usr/lib/ld-*.so r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-revocation mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetrevocation.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetset.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-revocation
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-revocation                           
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-revocation   2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,19 @@
+# Last Modified: Thu Jul  9 10:16:30 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-revocation {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  
+  /tmp/gnunet-system-runtime/gnunet-service-revocation.sock rw,
+
+  @{GNUNET_USER}/.local/share/gnunet/revocation.dat rw,
+
+  @{HOME}/.local/share/gnunet/revocation.dat rw,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-revocation mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-scalarproduct-alice
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-scalarproduct-alice  2015-08-17 
02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-scalarproduct-alice  2015-08-17 
09:23:39 UTC (rev 36247)
@@ -1,13 +0,0 @@
-# Last Modified: Mon Jul 27 15:48:05 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-scalarproduct-alice 
{
-  #include <abstractions/gnunet-common>
-
-  /usr/lib/ld-*.so r,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-scalarproduct-alice mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcadet.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetset.so.* mr,
-
-}

Added: gnunet/contrib/apparmor/gnunet-service-scalarproduct-alice
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-scalarproduct-alice                  
        (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-scalarproduct-alice  2015-08-17 
09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Jul 27 15:48:05 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-scalarproduct-alice 
{
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-scalarproduct-alice mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-scalarproduct-bob
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-scalarproduct-bob    2015-08-17 
02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-scalarproduct-bob    2015-08-17 
09:23:39 UTC (rev 36247)
@@ -1,14 +0,0 @@
-# Last Modified: Mon Jul 27 15:48:05 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-scalarproduct-bob {
-  #include <abstractions/gnunet-common>
-
-  /usr/lib/ld-*.so r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-scalarproduct-bob mr,
-
-  @{GNUNET_PREFIX}/lib/libgnunetcadet.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetset.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-scalarproduct-bob
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-scalarproduct-bob                    
        (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-scalarproduct-bob    2015-08-17 
09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Jul 27 15:48:05 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-scalarproduct-bob {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-scalarproduct-bob mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-set
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-set  2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-service-set  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,17 +0,0 @@
-# Last Modified: Wed Jul  8 10:52:48 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-set {
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-set mr,
-  
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetcadet.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetblock.so.* mr,
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-}

Added: gnunet/contrib/apparmor/gnunet-service-set
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-set                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-set  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Wed Jul  8 10:52:48 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-set {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-set mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-statistics
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-statistics   2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-statistics   2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,16 +0,0 @@
-# Last Modified: Thu Jul  9 10:16:30 2015
-
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-statistics {
-  #include <abstractions/gnunet-common>
-
-  /var/lib/gnunet/.local/share/gnunet/statistics.dat rw,
-
-  /usr/lib/ld-*.so r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-statistics mr,
-
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-statistics
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-statistics                           
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-statistics   2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,15 @@
+# Last Modified: Thu Jul  9 10:16:30 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-statistics {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_USER}/.local/share/gnunet/statistics.dat rw,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-statistics mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-template
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-template     2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-template     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,16 +0,0 @@
-# Last Modified: Tue Jul 21 16:06:04 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-template {
-  #include <abstractions/gnunet-common>
-
-  /tmp/gnunet-system-runtime/ w,
-  /tmp/gnunet-system-runtime/gnunet-service-template.sock w,
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-
-  #Gnunet Librairies
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-template mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-template
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-template                             
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-template     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,16 @@
+# Last Modified: Tue Jul 21 16:06:04 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-template {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  /tmp/gnunet-system-runtime/ w,
+  /tmp/gnunet-system-runtime/gnunet-service-template.sock w,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-template mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-testbed
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-testbed      2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-testbed      2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,36 +0,0 @@
-# Last Modified: Mon Jul 27 11:02:46 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed 
flags=(complain) {
-  #include <abstractions/gnunet-common>
-
-  /etc/gai.conf r,
- 
-  /tmp/gnunet-system-runtime/ w,
-  /tmp/gnunet-system-runtime/gnunet-service-testbed-barrier.sock w,
-  /tmp/gnunet-system-runtime/gnunet-service-testbed.sock w,
-
-  /usr/lib/ld-*.so r,
-
-  /dev/null r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-* r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/ r,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetarm.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetcore.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettestbed.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettesting.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-
-  @{GNUNET_PREFIX}/share/gnunet/testing_hostkeys.ecc r,
-
-}

Added: gnunet/contrib/apparmor/gnunet-service-testbed
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-testbed                              
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-testbed      2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,29 @@
+# Last Modified: Mon Jul 27 11:02:46 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/gnunet-test>
+
+  /etc/gai.conf r,
+ 
+  /tmp/gnunet-system-runtime/ w,
+  /tmp/gnunet-system-runtime/gnunet-service-testbed-barrier.sock w,
+  /tmp/gnunet-system-runtime/gnunet-service-testbed.sock w,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-* r,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/ r,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm Px,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed mr,
+
+  @{GNUNET_PREFIX}/share/gnunet/testing_hostkeys.ecc r,
+  
+  #GNUnet helper
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-testbed Px,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-testbed-logger
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-testbed-logger       2015-08-17 
02:55:38 UTC (rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-testbed-logger       2015-08-17 
09:23:39 UTC (rev 36247)
@@ -1,17 +0,0 @@
-# Last Modified: Tue Jul 21 17:19:18 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed-logger {
-  #include <abstractions/gnunet-common>
-
-  #???
-  /tmp/archlinux_*.dat w,
-
-  /tmp/gnunet-system-runtime/ w,
-  /tmp/gnunet-system-runtime/gnunet-gnunet-testbed-logger.sock w,
-
-  /usr/lib/ld-*.so r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed-logger mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-testbed-logger
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-testbed-logger                       
        (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-testbed-logger       2015-08-17 
09:23:39 UTC (rev 36247)
@@ -0,0 +1,19 @@
+# Last Modified: Tue Jul 21 17:19:18 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed-logger {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  #???
+  /tmp/archlinux_*.dat w,
+
+  /tmp/gnunet-system-runtime/ w,
+  /tmp/gnunet-system-runtime/gnunet-gnunet-testbed-logger.sock w,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-testbed-logger mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-transport
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-transport    2015-08-17 02:55:38 UTC 
(rev 36246)
+++ gnunet/contrib/apparmor/gnunet-service-transport    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -1,29 +0,0 @@
-# Last Modified: Thu Jul  9 10:16:30 2015
-
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-transport {
-  #include <abstractions/gnunet-common>
-
-  /var/lib/gnunet/.local/share/gnunet/private_key.ecc rk,
-
-  /usr/lib/ld-*.so r,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-transport mr,
-
-  #Gnunet plugin
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_tcp.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_tcp.so mr,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_udp.la r,
-  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_udp.so mr,
-
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetats.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetfragmentation.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunethello.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetnat.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetpeerinfo.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettransport.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-transport
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-transport                            
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-transport    2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,21 @@
+# Last Modified: Thu Jul  9 10:16:30 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-transport {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_USER}/.local/share/gnunet/private_key.ecc rk,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-transport mr,
+
+  #Gnunet plugin
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_tcp.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_tcp.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_udp.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_udp.so mr,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/gnunet-service-vpn
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-vpn  2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/gnunet-service-vpn  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1,27 +0,0 @@
-# Last Modified: Mon Jul 20 11:20:57 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-vpn {
-  #include <abstractions/gnunet-common>
-  
-  #Capability
-  capability setuid,
-  capability net_admin,
-
-  /dev/net/tun rw,
-
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-vpn mr,
-
-  #Librairies
-  /usr/lib/ld-*.so r,
-
-  #Gnunet helper
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-vpn Px,
-  
-  #Gnunet librairies
-  @{GNUNET_PREFIX}/lib/libgnunetcadet.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetregex.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr,
-  @{GNUNET_PREFIX}/lib/libgnunettun.so.* mr,
-}

Added: gnunet/contrib/apparmor/gnunet-service-vpn
===================================================================
--- gnunet/contrib/apparmor/gnunet-service-vpn                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-service-vpn  2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,17 @@
+# Last Modified: Mon Jul 20 11:20:57 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-vpn {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-vpn mr,
+
+  #Gnunet helper
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-vpn Px,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-set-ibf-profiler
===================================================================
--- gnunet/contrib/apparmor/gnunet-set-ibf-profiler                             
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-set-ibf-profiler     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 18:15:38 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-set-ibf-profiler {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-set-ibf-profiler mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-set-profiler
===================================================================
--- gnunet/contrib/apparmor/gnunet-set-profiler                         (rev 0)
+++ gnunet/contrib/apparmor/gnunet-set-profiler 2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,14 @@
+# Last Modified: Mon Aug 10 18:17:19 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-set-profiler {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{HOME}/.local/share/gnunet/private_key.ecc rk,
+  @{GNUNET_PREFIX}/bin/gnunet-set-profiler mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-setup
===================================================================
--- gnunet/contrib/apparmor/gnunet-setup                                (rev 0)
+++ gnunet/contrib/apparmor/gnunet-setup        2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,57 @@
+# Last Modified: Tue Aug 11 16:25:03 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-setup {
+  #include <abstractions/gnome>
+  #include <abstractions/gnunet-gtk>
+  #include <abstractions/kde>
+
+  /etc/nsswitch.conf r,
+  /etc/passwd r,
+  @{PROC}/@{pid}/fd/ r,
+
+  /usr/bin/exo-open rix,
+
+  @{GNUNET_PREFIX}/bin/gnunet-peerinfo-gtk Px,
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-daemon-hostlist Px,
+
+  @{GNUNET_PREFIX}/bin/gnunet-setup mr,
+
+  @{GNUNET_PREFIX}/share/gnunet-gtk/*.png r,
+  @{GNUNET_PREFIX}/share/gnunet-gtk/gnunet_setup_main_window.glade r,
+
+  @{HOME}/.config/gtk-*/bookmarks r,
+
+  #GNUnet plugin
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datacache_heap.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datacache_heap.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datacache_sqlite.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datacache_sqlite.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datastore_mysql.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datastore_mysql.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datastore_sqlite.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_datastore_sqlite.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_namestore_sqlite.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_namestore_sqlite.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_http_client.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_http_client.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_http_server.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_http_server.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_https_client.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_https_client.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_https_server.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_https_server.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_tcp.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_tcp.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_udp.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_udp.so mr,
+# @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_wlan.la r,
+  @{GNUNET_PREFIX}/lib/gnunet/libgnunet_plugin_transport_wlan.so mr,
+
+  /usr/share/glib-*/schemas/gschemas.compiled r,
+  /usr/share/gtk-*/gtkrc r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-statistics
===================================================================
--- gnunet/contrib/apparmor/gnunet-statistics                           (rev 0)
+++ gnunet/contrib/apparmor/gnunet-statistics   2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 16:15:07 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-statistics {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-statistics mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-statistics-gtk
===================================================================
--- gnunet/contrib/apparmor/gnunet-statistics-gtk                               
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-statistics-gtk       2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,16 @@
+# Last Modified: Wed Aug  5 11:25:27 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-statistics-gtk {
+  #include <abstractions/kde>
+  #include <abstractions/gnome>
+  #include <abstractions/gnunet-gtk>
+
+  @{GNUNET_PREFIX}/bin/gnunet-statistics-gtk mr,
+
+  @{GNUNET_PREFIX}/share/gnunet-gtk/gnunet_statistics_gtk_main_window.glade r,
+  
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-template
===================================================================
--- gnunet/contrib/apparmor/gnunet-template                             (rev 0)
+++ gnunet/contrib/apparmor/gnunet-template     2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 16:22:33 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-template {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-template mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-testbed-profiler
===================================================================
--- gnunet/contrib/apparmor/gnunet-testbed-profiler                             
(rev 0)
+++ gnunet/contrib/apparmor/gnunet-testbed-profiler     2015-08-17 09:23:39 UTC 
(rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 16:38:17 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-testbed-profiler {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-testbed-profiler mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-testing
===================================================================
--- gnunet/contrib/apparmor/gnunet-testing                              (rev 0)
+++ gnunet/contrib/apparmor/gnunet-testing      2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,20 @@
+# Last Modified: Mon Aug 10 16:54:53 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-testing {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+  #include <abstractions/gnunet-test>
+
+  /etc/gai.conf r,
+
+  @{GNUNET_PREFIX}/bin/gnunet-testing mr,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-* Px,
+   
+  @{GNUNET_PREFIX}/share/gnunet/testing_hostkeys.ecc r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-transport
===================================================================
--- gnunet/contrib/apparmor/gnunet-transport                            (rev 0)
+++ gnunet/contrib/apparmor/gnunet-transport    2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,15 @@
+# Last Modified: Mon Aug 10 17:17:40 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-transport {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-transport mr,
+
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-resolver Px,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-transport-certificate-creation
===================================================================
--- gnunet/contrib/apparmor/gnunet-transport-certificate-creation               
                (rev 0)
+++ gnunet/contrib/apparmor/gnunet-transport-certificate-creation       
2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,26 @@
+# Last Modified: Mon Aug 10 17:31:32 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-transport-certificate-creation {
+  #include <abstractions/base>
+  #include <abstractions/openssl>
+  #include <abstractions/gnunet-common>
+
+  @{HOME}/.rnd rw,
+
+  @{PROC}/meminfo r,
+
+  /usr/bin/openssl rix,
+
+  @{GNUNET_PREFIX}/bin/gnunet-transport-certificate-creation mr,
+
+  #Access to arg privatekey and certificate ?
+  @{HOME}/ rw,
+  @{HOME}/** rw,
+  deny @{HOME}/.*/ rw,
+  deny @{HOME}/.*/** rw,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-unindex
===================================================================
--- gnunet/contrib/apparmor/gnunet-unindex                              (rev 0)
+++ gnunet/contrib/apparmor/gnunet-unindex      2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,21 @@
+# Last Modified: Mon Aug 10 17:40:53 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-unindex {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-unindex mr,
+  
+  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-fs-publish Px,
+
+  #Path to files to unindex ?
+  @{HOME}/ rw,
+  @{HOME}/** rw,
+  deny @{HOME}/.*/ rw,
+  deny @{HOME}/.*/** rw,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-uri
===================================================================
--- gnunet/contrib/apparmor/gnunet-uri                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-uri  2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,16 @@
+# Last Modified: Mon Aug 10 18:04:08 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-uri {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  #More needed
+  @{GNUNET_PREFIX}/bin/gnunet-fs-gtk Px,
+
+  @{GNUNET_PREFIX}/bin/gnunet-uri mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Added: gnunet/contrib/apparmor/gnunet-vpn
===================================================================
--- gnunet/contrib/apparmor/gnunet-vpn                          (rev 0)
+++ gnunet/contrib/apparmor/gnunet-vpn  2015-08-17 09:23:39 UTC (rev 36247)
@@ -0,0 +1,13 @@
+# Last Modified: Mon Aug 10 18:11:26 2015
+#include <tunables/global>
+#include <tunables/gnunet>
+
+profile @{GNUNET_PREFIX}/bin/gnunet-vpn {
+  #include <abstractions/base>
+  #include <abstractions/gnunet-common>
+
+  @{GNUNET_PREFIX}/bin/gnunet-vpn mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/gnunet>
+}

Deleted: gnunet/contrib/apparmor/tunables/gnunet
===================================================================
--- gnunet/contrib/apparmor/tunables/gnunet     2015-08-17 02:55:38 UTC (rev 
36246)
+++ gnunet/contrib/apparmor/tunables/gnunet     2015-08-17 09:23:39 UTC (rev 
36247)
@@ -1 +0,0 @@
address@hidden/usr/local

Added: gnunet/contrib/apparmor/tunables/gnunet
===================================================================
--- gnunet/contrib/apparmor/tunables/gnunet                             (rev 0)
+++ gnunet/contrib/apparmor/tunables/gnunet     2015-08-17 09:23:39 UTC (rev 
36247)
@@ -0,0 +1,6 @@
address@hidden/usr/local
address@hidden/var/lib/gnunet
address@hidden/ /usr/
address@hidden,32,64} lib/@{multiarch}
address@hidden libm linux-vso 
+




reply via email to

[Prev in Thread] Current Thread [Next in Thread]