Ubuntu
isc-dhcp package

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

  1. Oneiric (11.10)
  2. fix-for-787212
  3. Merge into oneiric
Proposed by Brian Murray
Status: Merged
Merged at revision: 25
Proposed branch: lp:~brian-murray/ubuntu/oneiric/isc-dhcp/fix-for-787212
Merge into: lp:ubuntu/oneiric/isc-dhcp
Diff against target: 62 lines (+15/-7)
2 files modified
debian/apparmor-profile.dhcpd (+8/-7)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/oneiric/isc-dhcp/fix-for-787212
Reviewer Review Type Date Requested Status
Dave Walker (community) Approve
Ubuntu branches Pending
Review via email: mp+63435@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/apparmor-profile.dhcpd'
2--- debian/apparmor-profile.dhcpd 2010-12-09 11:21:53 +0000
3+++ debian/apparmor-profile.dhcpd 2011-06-03 21:38:31 +0000
4@@ -1,5 +1,5 @@
5 # vim:syntax=apparmor
6-# Last Modified: Tue Feb 10 15:02:44 2009
7+# Last Modified: Fri Jun 3 13:54:26 2011
8 # Author: Jamie Strandboge <jamie@canonical.com>
9
10 #include <tunables/global>
11@@ -17,29 +17,30 @@
12 network inet raw,
13 network packet packet,
14 @{PROC}/[0-9]*/net/dev r,
15+ @{PROC}/[0-9]*/net/{dev,if_inet6} r,
16
17 /etc/hosts.allow r,
18 /etc/hosts.deny r,
19
20 /etc/dhcp/ r,
21 /etc/dhcp/** r,
22- /etc/dhcpd.conf r,
23- /etc/dhcpd_ldap.conf r,
24+ /etc/dhcpd{,6}.conf r,
25+ /etc/dhcpd{,6}_ldap.conf r,
26
27 /usr/sbin/dhcpd mr,
28
29- /var/lib/dhcp/dhcpd.leases* lrw,
30+ /var/lib/dhcp/dhcpd{,6}.leases* lrw,
31 /var/log/ r,
32 /var/log/** rw,
33- /var/run/dhcp-server/dhcpd.pid w,
34+ /var/run/dhcp-server/dhcpd{,6}.pid w,
35
36 # LTSP. See:
37 # http://www.ltsp.org/~sbalneav/LTSPManual.html
38 # https://wiki.edubuntu.org/
39 /etc/ltsp/ r,
40 /etc/ltsp/** r,
41- /etc/dhcpd-k12ltsp.conf r,
42- /etc/dhcpd.leases* lrw,
43+ /etc/dhcpd{,6}-k12ltsp.conf r,
44+ /etc/dhcpd{,6}.leases* lrw,
45 /ltsp/ r,
46 /ltsp/** r,
47
48
49=== modified file 'debian/changelog'
50--- debian/changelog 2011-05-30 13:30:57 +0000
51+++ debian/changelog 2011-06-03 21:38:31 +0000
52@@ -1,3 +1,10 @@
53+isc-dhcp (4.1.1-P1-17ubuntu2) natty; urgency=low
54+
55+ * modify AppArmor profile for DHCP server to work with IPv6 thanks to
56+ Launchpad user nikolas for the patch (LP: #787212)
57+
58+ -- Brian Murray <brian@ubuntu.com> Fri, 03 Jun 2011 13:55:44 -0700
59+
60 isc-dhcp (4.1.1-P1-17ubuntu1) oneiric; urgency=low
61
62 * Merge from debian unstable. Remaining changes:

Subscribers

People subscribed via source and target branches

to all changes: