diffstat of debian/ for ppp_2.4.5-5 ppp_2.4.5-5ubuntu1 debian/patches/load_ppp_generic_if_needed | 66 ++++++ ppp-2.4.5/debian/changelog | 313 ++++++++++++++++++++++++++++++ ppp-2.4.5/debian/control | 3 ppp-2.4.5/debian/patches/series | 2 ppp-2.4.5/debian/ppp.postinst | 5 ppp-2.4.5/debian/ppp.pppd-dns | 4 ppp-2.4.5/debian/rules | 4 7 files changed, 393 insertions(+), 4 deletions(-) diff -u ppp-2.4.5/debian/changelog ppp-2.4.5/debian/changelog --- ppp-2.4.5/debian/changelog +++ ppp-2.4.5/debian/changelog @@ -1,9 +1,39 @@ +ppp (2.4.5-5ubuntu1) natty; urgency=low + + * 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. + + -- Angel Abad Thu, 03 Feb 2011 13:16:46 +0100 + ppp (2.4.5-5) unstable; urgency=medium * Updated debconf translation: da. (Closes: #601791) -- Marco d'Itri Wed, 19 Jan 2011 23:24:16 +0100 +ppp (2.4.5-4ubuntu1) natty; urgency=low + + * 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. + + -- Matthias Klose Wed, 24 Nov 2010 18:12:47 +0100 + ppp (2.4.5-4) unstable; urgency=low * Make sure to actually rebuild pppd for the udeb instead of using the @@ -80,6 +110,102 @@ -- Christian Perrier Fri, 28 Nov 2008 18:36:26 +0100 +ppp (2.4.5~git20081126t100229-0ubuntu4) maverick; urgency=low + + * debian/patches/update_if_pppol2tp: Update include/linux/if_pppol2tp.h to + match current kernel definitions (LP: #600947). + + -- Colin Watson Fri, 09 Jul 2010 17:27:36 +0100 + +ppp (2.4.5~git20081126t100229-0ubuntu3) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Sun, 07 Mar 2010 01:01:51 +0100 + +ppp (2.4.5~git20081126t100229-0ubuntu2) jaunty; urgency=low + + * debian/rules: Start the init script in runlevels 1-5, it does not need to + start before gdm. + * debian/ppp.postinst: Remove old init script symlinks. + * debian/ppp.pppd-dns: Update LSB header. + + -- Scott James Remnant Fri, 20 Feb 2009 15:15:49 +0000 + +ppp (2.4.5~git20081126t100229-0ubuntu1) jaunty; urgency=low + + * new upstream snapshot 2.4.5pre gitXXXX + * debian/rules,debian/scripts/vars bump upstream version and + and tarball dir + * rebase debian patches that still apply + - debian/patches/008_pathnames.h.diff, + debian/patches/010_scripts_README.diff, + debian/patches/011_scripts_redialer.diff, + debian/patches/018_ip-up_option.diff, + debian/patches/atm_resolver_light, + debian/patches/chat_man, + debian/patches/cifdefroute.dif, + debian/patches/close_dev_ppp, + debian/patches/fix_linkpidfile, + debian/patches/fix_null_pppdb, + debian/patches/load_ppp_generic_if_needed, + debian/patches/no_crypt_hack, + debian/patches/no_crypt_hack_2.4.5, + debian/patches/ppp-2.3.11-oedod.dif, + debian/patches/ppp-2.4.2-stripMSdomain, + debian/patches/pppdump_use_zlib, + debian/patches/pppdump_z_no_deflate, + debian/patches/pppoatm_cleanup, + debian/patches/pppoe_readme, + debian/patches/readable_connerrs, + debian/patches/resolv.conf_no_log, + debian/patches/setevn_call_file, + debian/patches/syslog_local2, + debian/patches/zzz_config, + debian/patches/zzz_man_typos + * drop patches superseeded upstream + - debian/patches/fix_close_fd0 + - debian/patches/fix_mschapv2_ppp + - debian/patches/pppoatm_fix_mtu + - debian/patches/pppoe_cleanup + - debian/patches/zzzz_lp258801_fix_ppp_dns_1.patch + - debian/patches/zzzz_lp258801_fix_ppp_dns_2.patch + - debian/patches/zzzz_lp258801_fix_ppp_dns.patch + * add patches required for new codebase: + - no_crypt_hack_2.4.5: crypt is now also getting used in session.c + apply NO_CRYPT_HACK for -udeb support here too + + -- Alexander Sack Mon, 16 Feb 2009 11:57:28 +0100 + +ppp (2.4.4rel-10ubuntu2.8.10.1) intrepid-proposed; urgency=low + + * fix LP: #258801; Gets bogus DNS servers during PPP negotiation; we + apply two more patches from git (details in patch) + - add debian/patches/zzzz_lp258801_fix_ppp_dns_1.patch + - add debian/patches/zzzz_lp258801_fix_ppp_dns_2.patch + + -- Alexander Sack Wed, 19 Nov 2008 14:05:43 +0100 + +ppp (2.4.4rel-10ubuntu2) intrepid; urgency=low + + * fix LP: #258801; Gets bogus DNS servers during PPP negotiation; we apply + the patch from http://marc.info/?l=linux-ppp&m=119559914711075&w=2 + - add debian/patches/zzzz_lp258801_fix_ppp_dns.patch + + -- Alexander Sack Thu, 16 Oct 2008 03:17:37 +0200 + +ppp (2.4.4rel-10ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - "Perform ppp_on_boot migration from pppoe package." + - provide pppoe_on_boot file + - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel + module if needed + - /etc/ppp/options: default is noauth instead of auth. + + -- Michael Vogt Mon, 23 Jun 2008 14:04:47 +0200 + ppp (2.4.4rel-10) unstable; urgency=low * ppp-udeb: allow for preseeding of the netcfg/get_hostname template. @@ -116,6 +242,24 @@ -- Frans Pop Tue, 08 Apr 2008 16:53:04 +0200 +ppp (2.4.4rel-9ubuntu2) gutsy; urgency=low + + * Trigger rebuild for hppa + + -- LaMont Jones Thu, 04 Oct 2007 12:21:29 -0600 + +ppp (2.4.4rel-9ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - "Perform ppp_on_boot migration from pppoe package." + - provide pppoe_on_boot file + - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel + module if needed + - /etc/ppp/options: default is noauth instead of auth. + - maintainer field set to ubuntu + + -- Michael Vogt Tue, 15 May 2007 11:09:49 +0200 + ppp (2.4.4rel-9) unstable; urgency=low * ppp-udeb: quote username and password in pap/chap secrets since they @@ -189,6 +333,22 @@ -- Eddy Petrișor Mon, 29 Jan 2007 16:58:03 +0200 +ppp (2.4.4rel-4.1ubuntu2) feisty; urgency=low + + * /etc/ppp/options: default is noauth instead of auth. + + -- Ian Jackson Wed, 4 Apr 2007 16:46:49 +0100 + +ppp (2.4.4rel-4.1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - "Perform ppp_on_boot migration from pppoe package." + - provide pppoe_on_boot file + - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel + module if needed + + -- Michael Vogt Wed, 20 Dec 2006 12:23:42 +0100 + ppp (2.4.4rel-4.1) unstable; urgency=low * Non-maintainer upload with maintainer's consent. @@ -201,6 +361,16 @@ -- Arnaud Fontaine Thu, 14 Dec 2006 21:31:55 +0100 +ppp (2.4.4rel-4ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Remaining changes: + - "Perform ppp_on_boot migration from pppoe package." + - provide pppoe_on_boot file + - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel + module if needed + + -- Michael Vogt Fri, 24 Nov 2006 08:39:13 +0100 + ppp (2.4.4rel-4) unstable; urgency=low [ Eddy Petrișor ] @@ -254,6 +424,12 @@ -- Marco d'Itri Wed, 12 Jul 2006 18:26:01 +0200 +ppp (2.4.4rel-1ubuntu1) edgy; urgency=low + + * Merge to Debian unstable. + + -- Martin Pitt Mon, 10 Jul 2006 18:34:10 +0200 + ppp (2.4.4rel-1) unstable; urgency=high * New upstream release. Fixes: @@ -269,6 +445,36 @@ -- Marco d'Itri Sun, 9 Jul 2006 18:38:54 +0200 +ppp (2.4.4b1-1ubuntu4) edgy; urgency=low + + * SECURITY UPDATE: Potential privilege escalation. + * debian/patches/winbind-setuid-failure-check: + - Check for a failing setuid() call (which can happen if the user hits PAM + limits). Before, a failing setuid() call would execute the NTLM + authentication helper as root. + - CVE-2006-2194 + + -- Martin Pitt Wed, 5 Jul 2006 11:48:13 +0200 + +ppp (2.4.4b1-1ubuntu3) dapper; urgency=low + + * Move script to S55. + + -- Scott James Remnant Thu, 23 Feb 2006 15:30:22 +0000 + +ppp (2.4.4b1-1ubuntu2) dapper; urgency=low + + * Move pppd-dns script to S45. + + -- Scott James Remnant Mon, 30 Jan 2006 14:23:23 +0000 + +ppp (2.4.4b1-1ubuntu1) dapper; urgency=low + + * Synchronise with Debian unstable. + * Still keep the pppoe_on_boot stuff. + + -- Matthias Klose Thu, 15 Dec 2005 14:46:57 +0000 + ppp (2.4.4b1-1) unstable; urgency=low * New upstream release. Fixes: @@ -298,6 +504,12 @@ -- Marco d'Itri Sun, 4 Dec 2005 15:22:23 +0100 +ppp (2.4.3-20050321+2ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Adam Conrad Fri, 27 May 2005 15:47:55 +0000 + ppp (2.4.3-20050321+2) unstable; urgency=high * Added patch close_dev_ppp to fix pppd spinning on select() and using @@ -313,6 +525,20 @@ -- Marco d'Itri Wed, 4 May 2005 02:00:04 +0200 +ppp (2.4.3-20050321+1ubuntu2) breezy; urgency=low + + * Drop debian/patches/libpcap0.8, which has since been applied to + the upstream sources, and debian/patches/pcap, which is the + Debian patch to revert to libpcap0.7 (Closes Ubuntu bug #10033) + + -- Adam Conrad Fri, 22 Apr 2005 00:16:08 +0000 + +ppp (2.4.3-20050321+1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian, resolving merge conflicts. + + -- Adam Conrad Thu, 21 Apr 2005 08:53:53 +0000 + ppp (2.4.3-20050321+1) unstable; urgency=high * New upstream snapshot, with a fix for the persist configuration option. @@ -372,6 +598,12 @@ -- Marco d'Itri Thu, 24 Feb 2005 23:51:54 +0100 +ppp (2.4.2+20040428-6ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Michael Vogt Wed, 12 Jan 2005 10:00:49 +0100 + ppp (2.4.2+20040428-6) unstable; urgency=medium * Removed references to nscd from the 0000usepeerdns scripts. @@ -390,6 +622,27 @@ -- Marco d'Itri Thu, 30 Dec 2004 17:21:22 +0100 +ppp (2.4.2+20040428-5ubuntu3) hoary; urgency=low + + * Migrate to libpcap0.8 + - debian/patches/libpcap0.8 + - Build-Depend on libpcap0.8-dev rather than libpcap0.7-dev + + -- Matt Zimmerman Tue, 28 Dec 2004 13:44:43 -0800 + +ppp (2.4.2+20040428-5ubuntu2) hoary; urgency=low + + * Merge debian/ppp.init file. + * Remove patch applied in unstable (cbcp-check-packetlengths.diff). + + -- Matthias Klose Mon, 15 Nov 2004 15:22:11 +0000 + +ppp (2.4.2+20040428-5ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Tue, 09 Nov 2004 23:37:30 +0000 + ppp (2.4.2+20040428-5) unstable; urgency=medium * Removed patch pty_command_timeout. (Closes: #279929) @@ -432,6 +685,66 @@ -- Marco d'Itri Sun, 31 Oct 2004 16:02:19 +0100 +ppp (2.4.2+20040428-2ubuntu7) hoary; urgency=low + + * Security upload for hoary (see previous changelog for details). + + -- Martin Pitt Fri, 29 Oct 2004 09:02:37 +0200 + +ppp (2.4.2+20040428-2ubuntu6.1) warty-security; urgency=low + + * SECURITY UPDATE: fix potential buffer overflow and DOS (Warty bug #2808) + * added debian/patches/cbcp-check-packetlengths.diff to add proper packet + length and bounds checking to pppd/cbcp.c (taken from upstream CVS) + * References: + http://www.securityfocus.com/archive/1/379450 + + -- Martin Pitt Thu, 28 Oct 2004 14:48:17 +0200 + +ppp (2.4.2+20040428-2ubuntu6) warty; urgency=low + + * Small fix for ppp_on_boot migration; also fixes pointless warning in pon + (closes: Ubuntu#1977). + * Make really, really sure we get a /dev/ppp device by only loading + ppp_generic if /dev/ppp doesn't exist, and sleep for five seconds to work + around the udev race; move this to pppd, instead of pon, which also + guarantees that it's run as root (closes: Ubuntu#1980, #1981). + + -- Daniel Stone Sat, 2 Oct 2004 17:27:53 +1000 + +ppp (2.4.2+20040428-2ubuntu5) warty; urgency=low + + * If /etc/ppp_on_boot exists and is a symlink to /etc/ppp/ppp_on_boot.dsl, + which doesn't exist, then transition the symlink to pppoe_on_boot (closes: + Ubuntu#1153). + + -- Daniel Stone Sun, 26 Sep 2004 14:13:45 +1000 + +ppp (2.4.2+20040428-2ubuntu4) warty; urgency=low + + * Made pon load ppp_deflate (quietly), so /dev/ppp gets created (closes: + Ubuntu#1644). + + -- Daniel Stone Fri, 24 Sep 2004 14:12:06 +1000 + +ppp (2.4.2+20040428-2ubuntu3) warty; urgency=low + + * Add pppoe_on_boot, from pppoe's ppp_on_boot.dsl. + + -- Daniel Stone Thu, 23 Sep 2004 13:02:42 +1000 + +ppp (2.4.2+20040428-2ubuntu2) warty; urgency=low + + * Added versioned depend on lsb-base + + -- Nathaniel McCallum Fri, 3 Sep 2004 15:14:36 -0400 + +ppp (2.4.2+20040428-2ubuntu1) warty; urgency=low + + * debian/ppp.init: pretty initscript + + -- Nathaniel McCallum Fri, 3 Sep 2004 11:52:53 -0400 + ppp (2.4.2+20040428-2) unstable; urgency=medium * Temporarily removed patch ppp-2.4.2-libpcap.diff: switch back to diff -u ppp-2.4.5/debian/ppp.postinst ppp-2.4.5/debian/ppp.postinst --- ppp-2.4.5/debian/ppp.postinst +++ ppp-2.4.5/debian/ppp.postinst @@ -38,6 +38,11 @@ } +# Migrate init script +if dpkg --compare-versions "$2" lt "2.4.5~git20081126t100229-0ubuntu2"; then + update-rc.d -f pppd-dns remove >/dev/null +fi + case "$1" in configure) everything diff -u ppp-2.4.5/debian/control ppp-2.4.5/debian/control --- ppp-2.4.5/debian/control +++ ppp-2.4.5/debian/control @@ -1,7 +1,8 @@ Source: ppp Section: admin Priority: optional -Maintainer: Marco d'Itri +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Marco d'Itri Build-Depends: debhelper (>= 5), quilt (>= 0.40), libpcap0.8-dev, libpam0g-dev, zlib1g-dev Standards-Version: 3.9.1 diff -u ppp-2.4.5/debian/ppp.pppd-dns ppp-2.4.5/debian/ppp.pppd-dns --- ppp-2.4.5/debian/ppp.pppd-dns +++ ppp-2.4.5/debian/ppp.pppd-dns @@ -1,9 +1,9 @@ #!/bin/sh -e ### BEGIN INIT INFO # Provides: pppd-dns -# Required-Start: $local_fs +# Required-Start: $local_fs gdm # Required-Stop: -# Default-Start: S +# Default-Start: 1 2 3 4 5 # Default-Stop: # Short-Description: Restore resolv.conf if the system crashed. ### END INIT INFO diff -u ppp-2.4.5/debian/rules ppp-2.4.5/debian/rules --- ppp-2.4.5/debian/rules +++ ppp-2.4.5/debian/rules @@ -81,6 +81,8 @@ rm -rf $D/etc/ppp/*-secrets mv $D/usr/include/ $D-dev/usr/ + install -m 750 -o root -g dip extra/pppoe_on_boot $D/etc/ppp/ + install -m755 extra/pon extra/plog extra/poff $D/usr/bin/ cp extra/pon.completion $D/etc/bash_completion.d/pon @@ -109,7 +111,7 @@ dh_link dh_installlogrotate dh_installinit --init-script=pppd-dns --no-start \ - --update-rcd-params='start 38 S .' + --update-rcd-params='start 70 1 2 3 4 5 .' dh_installpam ifdef BUILD_UDEB diff -u ppp-2.4.5/debian/patches/series ppp-2.4.5/debian/patches/series --- ppp-2.4.5/debian/patches/series +++ ppp-2.4.5/debian/patches/series @@ -42,0 +43,2 @@ +# ubuntu +load_ppp_generic_if_needed --- ppp-2.4.5.orig/debian/patches/load_ppp_generic_if_needed +++ ppp-2.4.5/debian/patches/load_ppp_generic_if_needed @@ -0,0 +1,66 @@ +From 053fa32a9ccd0ac1fbbda50db7aff7fdae18652a Mon Sep 17 00:00:00 2001 +From: Alexander Sack +Date: Thu, 18 Dec 2008 05:33:13 +0100 +Subject: [PATCH] port: ppp-2.4.4rel/debian/patches/load_ppp_generic_if_needed + +--- + pppd/sys-linux.c | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 41 insertions(+), 0 deletions(-) + +--- a/pppd/sys-linux.c ++++ b/pppd/sys-linux.c +@@ -92,6 +92,7 @@ + #include + #include + #include ++#include + + /* This is in netdevice.h. However, this compile will fail miserably if + you attempt to include netdevice.h because it has so many references +@@ -2104,6 +2105,46 @@ + + if (kernel_version >= KVERSION(2,3,13)) { + error("Couldn't open the /dev/ppp device: %m"); ++ char modprobePath[PATH_MAX] = ""; ++ int status, p, count; ++ pid_t pid; ++ ++ fd = open("/proc/sys/kernel/modprobe", O_RDONLY); ++ if (fd >= 0) { ++ int count = read(fd, modprobePath, PATH_MAX - 1); ++ if (count < 1) ++ modprobePath[0] = 0; ++ else if (modprobePath[count - 1] == '\n') ++ modprobePath[count - 1] = 0; ++ close(fd); ++ } ++ ++ if (modprobePath[0] == 0) ++ strcpy(modprobePath, "/sbin/modprobe"); ++ ++ switch (pid = fork()) { ++ case 0: /* child */ ++ setenv("PATH", "/sbin", 1); ++ status = execl(modprobePath, "modprobe", "ppp_generic", NULL); ++ case -1: /* couldn't fork */ ++ errno = ENOENT; ++ default: /* parent */ ++ do ++ p = waitpid(pid, &status, 0); ++ while (p == -1 && count++ < 4); ++ ++ sleep (5); ++ ++ } ++ ++ if ((fd = open("/dev/ppp", O_RDWR)) >= 0) { ++ new_style_driver = 1; ++ driver_version = 2; ++ driver_modification = 4; ++ driver_patch = 0; ++ close(fd); ++ return 1; ++ } + if (errno == ENOENT) + no_ppp_msg = + "You need to create the /dev/ppp device node by\n"