diff options
| author | Didier Raboud <odyx@debian.org> | 2015-02-10 16:07:18 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2015-02-10 16:14:46 +0100 |
| commit | 80a88f206e7aeac20bd816cda09a53bf0d522d92 (patch) | |
| tree | ae7ce929f888fe76c82c3e0bafd268c4ae9aff4c | |
| parent | 6b3940f1fd85d9d3fcd70953ac6ff0ac17678058 (diff) | |
| parent | 62420a02a4ab843629d57a600c442f252cc52890 (diff) | |
Merge branch 'master' into master-experimental
| -rw-r--r-- | debian/local/apparmor-profile | 2 | ||||
| -rw-r--r-- | debian/patches/pidfile.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/local/apparmor-profile b/debian/local/apparmor-profile index 1554ec339..976e178f0 100644 --- a/debian/local/apparmor-profile +++ b/debian/local/apparmor-profile @@ -141,7 +141,7 @@ # silence noise deny /etc/udev/udev.conf r, - profile third_party { + profile third_party flags=(attach_disconnected) { # third party backends, filters, and drivers get relatively no restrictions # as they often need high privileges, are unpredictable or otherwise beyond # our control diff --git a/debian/patches/pidfile.patch b/debian/patches/pidfile.patch index d6df96a79..8c73e47a6 100644 --- a/debian/patches/pidfile.patch +++ b/debian/patches/pidfile.patch @@ -110,7 +110,7 @@ Last-Update: 2015-02-10 */ --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -523,6 +523,7 @@ +@@ -540,6 +540,7 @@ DocumentRoot $root/doc RequestRoot $BASE/spool TempDir $BASE/spool/temp |