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

Created by Brian Murray and last modified
Get this branch:
bzr branch lp:~brian-murray/ubuntu/oneiric/isc-dhcp/fix-for-787212
Only Brian Murray can upload to this branch. If you are Brian Murray please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Brian Murray
Status:
Development

Recent revisions

25. By Brian Murray

modify AppArmor profile for DHCP server to work with IPv6 thanks to
Launchpad user nikolas for the patch (LP: #787212)

24. By Marc Deslauriers

* Merge from debian unstable. Remaining changes:
  - Deroot server (Debian #308832).
  - Send hostname to DHCP server by default (LP #10239, Debian #151820).
  - dhclient-onetry-call-clientscript.dpatch: Call 'dhclient-script FAIL'
    when failing to get an address also when operating in oneshot mode
    (-1). This fixes avahi-autoipd invocation through dhcdbd.
  - dhcpd.conf-subnet-examples.dpatch: Give an example for subnet-mask in
    dhcpd.conf.
  - dhclient-more-debug.dpatch: Show the requested/offered client IP in
    log output, for better debugging.
  - debian/dhclient-script.linux: Wait for /etc/resolv.conf to become
    writable; this isn't the case when ifup is called from an Upstart job
    triggered by udev (Ubuntu-specific until Debian uses this rule, too).
    Rewritten for 4.1.1-P1-17 changes.
  - revert-next-server.dpatch: Revert the need of the next-server option
    in dhcpd.conf so it points to the own IP again for tftp if the option
    is not set (patch by Oliver Grawert; disputed upstream).
  - debian/isc-dhcp-server.init.d: Allow LTSP to override default
    configuration in /etc/ltsp/dhcpd.conf. Point that out in a header
    comment in debian/dhcpd.conf (Ubuntu-specific).
  - debian/isc-dhcp-server.config: Drop debconf question to medium
    (Ubuntu-specific).
  - Enable build hardening. Add hardening-wrapper build dependency
    (Ubuntu-specific).
  - Add enforcing AppArmor profile for DHCP client and server.
  - Install apport hooks.
  - debian/dhclient-script.linux: Fix regression in host_name option
    handling, so that it's always honored when /etc/hostname is not set.
  - dhclient-fix-backoff.dpatch,
    dhclient-initial-random-delay-option.dpatch: Speed up DHCP negotiation
    (Debian #509089).
  - Fix configure test for ber_init to work correctly with 'ld
    --no-add-needed'.
  - isc-dhcp-client Breaks: network-manager (<< 0.8.2~rc1), since earlier
    versions were patched in Ubuntu to hardcode assumptions for
    dhcp3-client.
  - debian/patches/multi-ip-addr-per-if.dpatch: Resolve issue of
    interfaces not being able to have more than one IP address assigned.
  - debian/isc-dhcp-client.links: fix symlink ordering for new ISC
    package
  - debian/rules: add call to dh_link to get package symlinks back

23. By Marc Deslauriers

* Merge from debian unstable. Remaining changes:
  - Deroot server (Debian #308832).
  - Send hostname to DHCP server by default (LP #10239, Debian #151820).
  - dhclient-onetry-call-clientscript.dpatch: Call 'dhclient-script FAIL'
    when failing to get an address also when operating in oneshot mode
    (-1). This fixes avahi-autoipd invocation through dhcdbd.
  - dhcpd.conf-subnet-examples.dpatch: Give an example for subnet-mask in
    dhcpd.conf.
  - dhclient-more-debug.dpatch: Show the requested/offered client IP in
    log output, for better debugging.
  - debian/dhclient-script.linux: Wait for /etc/resolv.conf to become
    writable; this isn't the case when ifup is called from an Upstart job
    triggered by udev (Ubuntu-specific until Debian uses this rule, too).
  - revert-next-server.dpatch: Revert the need of the next-server option
    in dhcpd.conf so it points to the own IP again for tftp if the option
    is not set (patch by Oliver Grawert; disputed upstream).
  - debian/isc-dhcp-server.init.d: Allow LTSP to override default
    configuration in /etc/ltsp/dhcpd.conf. Point that out in a header
    comment in debian/dhcpd.conf (Ubuntu-specific).
  - debian/isc-dhcp-server.config: Drop debconf question to medium
    (Ubuntu-specific).
  - Enable build hardening. Add hardening-wrapper build dependency
    (Ubuntu-specific).
  - Add enforcing AppArmor profile for DHCP client and server.
  - Install apport hooks.
  - debian/dhclient-script.linux: Fix regression in host_name option
    handling, so that it's always honored when /etc/hostname is not set.
  - dhclient-fix-backoff.dpatch,
    dhclient-initial-random-delay-option.dpatch: Speed up DHCP negotiation
    (Debian #509089).
  - Fix configure test for ber_init to work correctly with 'ld
    --no-add-needed'.
  - isc-dhcp-client Breaks: network-manager (<< 0.8.2~rc1), since earlier
    versions were patched in Ubuntu to hardcode assumptions for
    dhcp3-client.
  - debian/patches/multi-ip-addr-per-if.dpatch: Resolve issue of
    interfaces not being able to have more than one IP address assigned.
  - debian/isc-dhcp-client.links: fix symlink ordering for new ISC
    package
  - debian/rules: add call to dh_link to get package symlinks back

22. By Marc Deslauriers

* SECURITY UPDATE: arbitrary code execution via crafted hostname
  - Patch for CVE-2011-0997 was getting reverted during the build
    because of special quilt handling in debian/rules for the ldap
    patches.
  - debian/patches/00list: move CVE-2011-0997 patch before the ldap
    patches, and add comment.
  - CVE-2011-0997

21. By Jamie Strandboge

apparmor-profile.dhclient: update to also allow leases in /var/lib/dhcp3
(LP: #755724)

20. By Marc Deslauriers

* SECURITY UPDATE: arbitrary code execution via crafted hostname
  - debian/patches/CVE-2011-0997.dpatch: filter strings in
    client/dhclient.c, common/options.c.
  - CVE-2011-0997

19. By Dave Walker

debian/patches/multi-ip-addr-per-if.dpatch: Resolve issue of interfaces
not being able to have more than one IP address assigned. Patch courtesy
of Daniel Nurmi, Eucalyptus Systems. (LP: #717166)

18. By Kees Cook

debian/isc-dhcp-client.links: fix symlink ordering for new ISC package
(LP: #724556).

17. By Kees Cook

debian/rules: add call to dh_link to get package symlinks back
(Closes: #614992).

16. By Dustin Kirkland 

releasing version 4.1.1-P1-15ubuntu3

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/oneiric/isc-dhcp
This branch contains Public information 
Everyone can see this information.

Subscribers