lp:~cyphermox/ubuntu/vivid/ppp/merge-2.4.6

Created by Mathieu Trudel-Lapierre on 2014-11-05 and last modified on 2014-11-05
Get this branch:
bzr branch lp:~cyphermox/ubuntu/vivid/ppp/merge-2.4.6
Only Mathieu Trudel-Lapierre can upload to this branch. If you are Mathieu Trudel-Lapierre please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Mathieu Trudel-Lapierre
Status:
Development

Recent revisions

32. By Mathieu Trudel-Lapierre on 2014-11-05

* Merge with Debian unstable; remaining changes:
  - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel
    module if needed.
  - add EAP-TLS/MPPE support patch from Jan Just Keijser.
  - debian/control: add libssl-dev to Build-Depends for the EAP-TLS patch.
* debian/patches/ppp-2.4.5-eaptls-mppe-0.994.patch,
  debian/patches/ppp-2.4.6-eaptls-mppe-0.997.patch: updated the EAP-TLS/MPPE
  support patch to the latest version from its upstream (also refreshed it).
* debian/ppp.preinst: deal with the change in LSB headers start runlevels
  of pppd-dns due to dropping our changes (which are no longer necessary
  since resolvconf is installed in most systems and has been for a while);
  this should probably be kept until the next LTS.

31. By Mathieu Trudel-Lapierre on 2014-11-04

Merging shared upstream rev into target branch.

30. By Mathieu Trudel-Lapierre on 2014-11-04

Merging shared upstream rev into target branch.

29. By Dimitri John Ledkov on 2014-05-29

Drop gdm dependency from the pppd-dns script, to resolve failing to
configure ppp package without having gdm's init.d script enabled (and
thus gdm installed & configured).

28. By Pavel Plesov on 2013-01-22

add EAPTLS-MPPE 0.994 patch from http://www.nikhef.nl/~janjust/ppp/

27. By Adam Conrad on 2012-12-02

[ Ubuntu Merge-o-Matic ]
* Merge from Debian unstable. Remaining changes:
  - /etc/ppp/options: default is noauth instead of auth.
  - extra/pon: Perform ppp_on_boot migration from pppoe package.
  - debian/ppp.postinst: init script migration for version before
    2.4.5~git20081126t100229-0ubuntu2.
  - debian/ppp.pppd-dns: Update LSB header.
  - Provide pppoe_on_boot file.
  - Move pppd-dns script to S45.
  - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel
    module if needed.
  - Fix FTBFS with linux 3.5 headers.

26. By Tim Gardner on 2012-09-25

FTBS fix against linux 3.5 headers: Update debian/patches/update_if_pppol2tp
to reflect changes in Linux 3.5 includes.

25. By Angel Abad on 2011-02-03

* Merge from debian unstable. (LP: #712419) Remaining changes:
  - /etc/ppp/options: default is noauth instead of auth.
  - extra/pon: Perform ppp_on_boot migration from pppoe package.
  - debian/ppp.postinst: init script migration for version before
    2.4.5~git20081126t100229-0ubuntu2.
  - debian/ppp.pppd-dns: Update LSB header.
  - Provide pppoe_on_boot file.
  - Move pppd-dns script to S45.
  - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel
    module if needed.

24. By Matthias Klose on 2010-11-24

* Merge with Debian; remaining changes:
  - /etc/ppp/options: default is noauth instead of auth.
  - extra/pon: Perform ppp_on_boot migration from pppoe package.
  - debian/ppp.postinst: init script migration for version before
    2.4.5~git20081126t100229-0ubuntu2.
  - debian/ppp.pppd-dns: Update LSB header.
  - Provide pppoe_on_boot file.
  - Move pppd-dns script to S45.
  - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel
    module if needed.

23. By Colin Watson on 2010-07-09

releasing version 2.4.5~git20081126t100229-0ubuntu4

Branch metadata

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