Merge lp:~brian-murray/ubuntu/oneiric/isc-dhcp/fix-for-787212 into lp:ubuntu/oneiric/isc-dhcp

[Brian Murray]

Creating a branch of the patch some added to bug 787212.

[Dave Walker (davewalker)]

Nice work Brian. I'm going to change the distro version mentioned in the debian/changelog entry to oneiric, as I believe that was the intention.

Uploading/Merging.

Thanks

review: Approve

=== modified file 'debian/apparmor-profile.dhcpd'
--- debian/apparmor-profile.dhcpd	2010-12-09 11:21:53 +0000
+++ debian/apparmor-profile.dhcpd	2011-06-03 21:38:31 +0000
@@ -1,5 +1,5 @@
 # vim:syntax=apparmor
-# Last Modified: Tue Feb 10 15:02:44 2009
+# Last Modified: Fri Jun 3 13:54:26 2011
 # Author: Jamie Strandboge <[e-mail]>
 
 #include <tunables/global>
@@ -17,29 +17,30 @@
   network inet raw,
   network packet packet,
   @{PROC}/[0-9]*/net/dev r,
+  @{PROC}/[0-9]*/net/{dev,if_inet6} r,
 
   /etc/hosts.allow r,
   /etc/hosts.deny r,
 
   /etc/dhcp/ r,
   /etc/dhcp/** r,
-  /etc/dhcpd.conf r,
-  /etc/dhcpd_ldap.conf r,
+  /etc/dhcpd{,6}.conf r,
+  /etc/dhcpd{,6}_ldap.conf r,
 
   /usr/sbin/dhcpd mr,
 
-  /var/lib/dhcp/dhcpd.leases* lrw,
+  /var/lib/dhcp/dhcpd{,6}.leases* lrw,
   /var/log/ r,
   /var/log/** rw,
-  /var/run/dhcp-server/dhcpd.pid w,
+  /var/run/dhcp-server/dhcpd{,6}.pid w,
 
   # LTSP. See:
   # http://www.ltsp.org/~sbalneav/LTSPManual.html
   # https://wiki.edubuntu.org/
   /etc/ltsp/ r,
   /etc/ltsp/** r,
-  /etc/dhcpd-k12ltsp.conf r,
-  /etc/dhcpd.leases* lrw,
+  /etc/dhcpd{,6}-k12ltsp.conf r,
+  /etc/dhcpd{,6}.leases* lrw,
   /ltsp/ r,
   /ltsp/** r,
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-05-30 13:30:57 +0000
+++ debian/changelog	2011-06-03 21:38:31 +0000
@@ -1,3 +1,10 @@
+isc-dhcp (4.1.1-P1-17ubuntu2) natty; urgency=low
+
+  * modify AppArmor profile for DHCP server to work with IPv6 thanks to
+    Launchpad user nikolas for the patch (LP: #787212)
+
+ -- Brian Murray <[e-mail]>  Fri, 03 Jun 2011 13:55:44 -0700
+
 isc-dhcp (4.1.1-P1-17ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable.  Remaining changes: