diff -u isc-dhcp-4.1.ESV-R4/debian/changelog isc-dhcp-4.1.ESV-R4/debian/changelog --- isc-dhcp-4.1.ESV-R4/debian/changelog +++ isc-dhcp-4.1.ESV-R4/debian/changelog @@ -1,3 +1,10 @@ +isc-dhcp (4.1.ESV-R4-0ubuntu5.7) precise; urgency=low + + * Allow dhcpd to read /etc/ldap/ldap.conf for isc-dhcp-server-ldap. + (LP: #1057358). Backported from Stéphane Graber's quantal patch. + + -- Dave Chiluk Thu, 31 Jan 2013 16:44:46 -0600 + isc-dhcp (4.1.ESV-R4-0ubuntu5.6) precise-proposed; urgency=low [ Scott Moser ] diff -u isc-dhcp-4.1.ESV-R4/debian/patches/00list isc-dhcp-4.1.ESV-R4/debian/patches/00list --- isc-dhcp-4.1.ESV-R4/debian/patches/00list +++ isc-dhcp-4.1.ESV-R4/debian/patches/00list @@ -27,6 +27,8 @@ # LP: #974284 onetry_retry_after_initial_success +dhcpd-ldap-apparmor.dpatch + #ldap backend for dhcp server (docs and code) #these get reverted during the build, so put non-ldap #patches earlier only in patch2: unchanged: --- isc-dhcp-4.1.ESV-R4.orig/debian/patches/dhcpd-ldap-apparmor.dpatch +++ isc-dhcp-4.1.ESV-R4/debian/patches/dhcpd-ldap-apparmor.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' isc-dhcp-4.1.ESV-R4~/debian/apparmor-profile.dhcpd isc-dhcp-4.1.ESV-R4/debian/apparmor-profile.dhcpd +--- isc-dhcp-4.1.ESV-R4~/debian/apparmor-profile.dhcpd 2013-01-31 16:39:20.000000000 -0600 ++++ isc-dhcp-4.1.ESV-R4/debian/apparmor-profile.dhcpd 2013-01-31 16:42:48.000000000 -0600 +@@ -34,6 +34,9 @@ + /var/log/** rw, + /{,var/}run/{,dhcp-server/}dhcpd{,6}.pid rw, + ++ # isc-dhcp-server-ldap ++ /etc/ldap/ldap.conf r, ++ + # LTSP. See: + # http://www.ltsp.org/~sbalneav/LTSPManual.html + # https://wiki.edubuntu.org/