-
Committer:
Scott Moser
-
Date:
2013-03-05 17:14:21 UTC
-
mfrom:
(78.1.6 isc-dhcp)
-
Revision ID:
smoser@ubuntu.com-20130305171421-o8j2oqq0ympjfq38
* Merge from Debian, remaining changes:
- Apparmor profiles for dhclient and dhcpd.
- Upstart jobs for isc-dhcp-server, isc-dhcp-server6, isc-dhcp-relay and
isc-dhcp-relay6. (LP: #944849)
- Separate default file for isc-dhcp-relay6. (LP: #944849)
- Apport hook for isc-dhcp-client and isc-dhcp-server.
- dhclient.conf: Set for IPv6 (dhcp6.*) (LP: #770324)
- If /etc/ltsp/dhcpd.conf exists, use that instead of /etc/dhcp/dhcpd.conf
- Drop isc-dhcp-server/new_auth_behavior question from high to medium
- Create user/group dhcpd (LP: #727837)
- Create /etc/dhcp/ddns-keys/ for DDNS updates (LP: #341817)
- Build with extra hardening and use --enable-paranoia to run dhcpd as user
(LP: #727837)
- Add IPv6 support to dhclient-script.linux.udeb
- Wait for /etc/resolv.conf to be writable in dhclient-script.linux.
(LP: #856984)
- Sanitize environment in dhclient-script.linux. (LP: #1045986)
- Don't call 'ip addr flush' as it breaks IPv6 networking. (LP: #1023174)
- debian/apparmor-profile.dhclient: update to add the new paths used by
NetworkManager for its conf and leases files; standardized under
/var/lib/NetworkManager.
- Remaining Ubuntu patches:
+ dhclient-fix-backoff
+ dhclient-more-debug (LP: #35265)
+ dhclient-safer-timeout (LP: #838968)
+ dhcpd.conf-subnet-examples (LP: #26661)
+ multi-ip-addr-per-if (LP: #717166)
+ onetry_retry_after_initial_success (LP: #974284)
+ revert-next-server
- Dropped Ubuntu patches:
+ dhclient-onetry-call-clientscript (now in Debian)
* Add InfiniBand support patches from RedHat.
* Update dhcpd apparmor profile for LPF. (LP: #1107686)
* Handle dhclient.conf left behind during a prior lenny->squeeze upgrade,
upgrade it now to avoid an unnecessary conffile prompt (closes: #698582).
- Thanks to Gregor Herrmann for the patch.
* Also, do not copy dhclient.conf from /etc/dhcp3 anymore (closes: #700363).