Merge lp:~morphis/aethercast/fix-apparmor-rules into lp:aethercast

[Simon Fels]

Fix apparmor rules to let us use the ics-dhcp-server properly.

Fix apparmor rules to let us use the ics-dhcp-server properly.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/aethercast-ci/135/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-amd64-ci/134/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-armhf-ci/135/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-i386-ci/134/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/aethercast-ci/135/rebuild

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

CI fails because we need to merge https://code.launchpad.net/~morphis/aethercast/fix-wds-api-break

[Thomas Voß (thomas-voss)]

LGTM, feel free to ignore niggles inline.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/aethercast-autolanding/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-amd64-autolanding/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-armhf-autolanding/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-i386-autolanding/10/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/aethercast-ci/148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-amd64-ci/147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-armhf-ci/148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-i386-ci/147/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/aethercast-ci/148/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-01-21 11:13:32 +0000
+++ debian/control	2016-03-02 11:24:40 +0000
@@ -5,6 +5,7 @@
 XSBC-Original-Maintainer: Simon Fels <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
+               dh-apparmor,
                dbus,
                google-mock,
                libboost-dev,
 
=== modified file 'debian/rules'
--- debian/rules	2016-01-17 14:01:37 +0000
+++ debian/rules	2016-03-02 11:24:40 +0000
@@ -20,3 +20,7 @@
 
 override_dh_auto_test:
 	# disable
+
+override_dh_install:
+	dh_install
+	dh_apparmor -paethercast --profile-name=usr.sbin.dhcpd
 
=== modified file 'debian/usr.sbin.aethercast'
--- debian/usr.sbin.aethercast	2016-01-30 12:33:55 +0000
+++ debian/usr.sbin.aethercast	2016-03-02 11:24:40 +0000
@@ -1,11 +1,15 @@
 # vim:syntax=apparmor
 
-  # Allow aethercast to start dhcpd with its own configuration
-  # file it needs to provide DHCP for groups it manages through
-  # WiFi Direct. This need to stay as long as NetworkManager does
-  # not has support for WiFi Direct and aethercast is using that.
-  /etc/aethercast/dhcpd.conf r,
-  # In addition aethercast will also point dhcpd to a private
-  # lease/pid file
-  /{,var/}run/aethercast/dhcpd*.leases* lrw,
-  /{,var/}run/aethercast/dhcpd*.pid lrw,
+# Work around bug:
+# https://bugs.launchpad.net/ubuntu/+source/isc-dhcp/+bug/1186662
+capability dac_override,
+
+# Allow aethercast to start dhcpd with its own configuration
+# file. It needs to provide DHCP for groups it manages through
+# WiFi Direct. This needs to stay as long as NetworkManager does
+# not have support for WiFi Direct and aethercast is using that.
+/etc/aethercast/dhcpd.conf r,
+# In addition aethercast will also point dhcpd to a private
+# lease/pid file
+/{,var/}run/aethercast/dhcpd*.leases lrw,
+/{,var/}run/aethercast/dhcpd*.pid lrw,