diffstat of debian/ for ppp_2.4.1.uus-4 ppp_2.4.2+20040202-3osso7 README.Debian | 148 ---- README.STATIC-IP | 45 - README.win9x | 35 - changelog | 1015 ++++++++++---------------------- changelog.old | 677 +++++++++++++++++++++ compat | 1 conffiles | 6 control | 31 copyright | 22 dirs | 9 init | 50 - ip-down | 43 - ip-up | 44 - kernel.fix-2.0.30-2 | 46 - modules | 7 no_ppp_on_boot | 21 options | 348 ---------- options.ttyXX | 22 pap-secrets | 41 - patches-applied | 26 patches/001_udeb.diff | 22 patches/002_chat.c.diff | 11 patches/003_cbcp.diff | 20 patches/004_auth.c.diff | 11 patches/005_fsm.c.diff | 31 patches/006_ipcp.c.diff | 32 - patches/007_ipcp.h.diff | 13 patches/009_SETUP.diff | 11 patches/012_secure-card.diff | 32 - patches/013_scripts_ip-up.diff | 48 - patches/014_scripts_poff.diff | 29 patches/015_scripts_pon.diff | 12 patches/016_chat_manpage.diff | 36 - patches/017_memory_management.diff | 12 patches/018_ip-up_option.diff | 2 patches/020_IPPROTO_TCP_undefine.diff | 11 patches/021_setipaddr.diff | 33 - patches/022_lockfile-fix.diff | 26 patches/023_lcp-max-termintate.diff | 10 patches/024_pppd.8-persist-maxfail.diff | 13 patches/025_packet_count.diff | 23 patches/026_pppd.8-active-filter.diff | 14 patches/027_child_debugging.diff | 13 patches/057_pppoe-interface-change | 78 ++ patches/060_mschap_alignment_fix.diff | 35 + patches/cflags.patch | 80 ++ patches/cifdefroute.dif | 283 ++++++++ patches/fix_closed_fds | 34 + patches/no_crypt_hack | 45 + patches/ppp-2.3.11-oedod.dif | 172 +++++ patches/ppp-2.4.2-stripMSdomain | 35 + patches/pppdump-no-deflate | 12 patches/setevn_call_file | 24 patches/syslog_local2 | 12 plog | 7 po/POTFILES.in | 1 po/fr.po | 55 + po/ja.po | 55 + po/nl.po | 59 + po/templates.pot | 55 + po/tr.po | 46 + poff | 104 --- pon | 38 - pon.1 | 120 --- postinst | 106 --- postrm | 7 ppp-dev.dirs | 1 ppp-udeb.postinst | 92 ++ ppp-udeb.templates | 17 ppp.dirs | 10 ppp.init | 48 + ppp.links | 2 ppp.logrotate | 9 ppp.pam | 6 ppp.postinst | 63 + ppp.postrm | 34 + ppp.pppd-dns | 8 ppp.preinst | 26 ppp.prerm | 11 preinst | 26 prerm | 11 provider.chatscript | 19 provider.peer | 21 rules | 317 +++++---- scripts/Makefile | 11 scripts/archmap | 22 scripts/getglibcversion | 56 + scripts/lib | 200 ++++++ scripts/messages | 29 scripts/source.unpack | 32 + scripts/vars | 31 scripts/vars.build | 17 sys-build.mk | 167 +++++ update-source | 39 + 94 files changed, 3263 insertions(+), 2627 deletions(-) diff -Nru ppp-2.4.1.uus/debian/README.Debian ppp-2.4.2+20040202/debian/README.Debian --- ppp-2.4.1.uus/debian/README.Debian 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/README.Debian 2006-04-25 12:08:46.000000000 +0000 @@ -3,89 +3,22 @@ Table of contents: - + Upgrading from versions older than 2.4.1[.uus-3] - + Upgrading from versions older than 2.3.9 *important* - + Upgrading from versions older than 2.3.5-2 - + Upgrading from versions older than 2.3.1 - + PAM support (needed for inbound PAP) + Provided user space scripts + Outbound dialing setup + Inbound setup combined with mgetty + Permissions - + Demand dial-up links + Syslog facility level - + Not implemented - + Kernel 2.0.x update + + PPP over ATM plugin + + Logging of ip-up and ip-down + -- Christoph Lameter , 22 July 1997 + Phil Hands + Josip Rodin , 27 November 1999. + Marco d'Itri -Upgrading from versions older than 2.4.1[.uus-3]: -------------------------------------------------- - -PPP packet filtering has been enabled since 2.4.1.uus-2, which is available -by using the "active-filter" option. See pppd(8) for more information. -The CONFIG_PPP_FILTER option is required in the kernel. (If this is not -enabled, the following warning will be sent to the syslog, but ppp will -continue to function: - pppd[pid]: Couldn't set pass-filter in kernel: Invalid argument ) - -IPV6 support has also been enabled, for usage, see the pppd(8) manpage. - -Upgrading from versions older than 2.3.9: ------------------------------------------ - -Default value for number of redial attempts with `persist' option was -changed from infinity to 10, by introducing a new `maxfail' option. - -If you used the `persist' option in your pppd settings, you will have to -add `maxfail 0' to get the old behaviour back. - -(Possible) Rationale: some people had ISDN dial-on-demand routers that were -dialing but failing to authenticate. Because of the pppd setting to dial -infinitely, it happened about once a second, so after a month or two, the -phone bill was several thousand pounds! This is clearly unacceptable, so the -default was changed from infinity to 10 to prevent this and all similar cases. - -Upgrading from versions older than 2.3.5-2: -------------------------------------------- - -Debian package had included an incorrect example of /etc/ppp/pap-secrets -in the inbound connection section. The old wrong example was this: - -# Every regular user can use PPP and has to use passwords from /etc/passwd -* molec3 "" - -This was fixed in ppp package version 2.3.5-2, to: - -# Every regular user can use PPP and has to use passwords from /etc/passwd -* hostname "" * - -Note: the string "hostname" must be replaced with the output of `hostname` -on your system. It will be done by the post-installation scripts, but you -should check it's done nonetheless. - -Upgrading from versions older than 2.3.1: ------------------------------------------ - -The default setup in /etc/ppp/options is to turn authentication on. - -This may cause you not to be able to log into your ISP any more, if they do -not support PAP or CHAP authentication. All you need to do is set ``noauth'' -either on pppd's command line or in /etc/ppp/peers/provider, in order to switch -it off for this connection. - -[Don't just turn it off again in the options file, since it is better to deny - access by default for security reasons.] - -PAM support (needed for inbound PAP): -------------------------------------- - -pppd with PAM support for inbound PAP logins is now available in the -normal `ppp' package, marking the `ppp-pam' package obsolete. The -packaging system should automatically remove the old package on upgrade. - -Provided user space scripts: ----------------------------- +Provided user space scripts +~~~~~~~~~~~~~~~~~~~~~~~~~~~ Since release 2.3.1, the ppp package provides scripts to conveniently control PPP from user space. Note that the scripts only work with the proper setup in /etc/ppp. Edit the configuration files and test the @@ -103,9 +36,9 @@ Please read the manual page pon(1) for specific descriptions of these commands. -Outbound and inbound dialing setup: ------------------------------------ +Outbound and inbound dialing setup +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ pppd attempts to handle both inbound and outbound through one set of configuration files. The /etc/ppp/options file has been set up for the most common setups. @@ -114,9 +47,9 @@ parameters on the commandline. If you find a change that would be beneficial to all users, then please inform the package maintainer about it. -Outbound dialing setup: ------------------------ +Outbound dialing setup +~~~~~~~~~~~~~~~~~~~~~~ Edit the file /etc/chatscripts/provider and make sure it contains what you need to dial-up into your server and eventually start up PPP on the remote machine. I.e. replace strings in brackets with appropriate values @@ -137,15 +70,16 @@ You should then be able to start the PPP connection with pon. -If you want to have PPP on bootup then rename the file -/etc/ppp/no_ppp_on_boot to /etc/ppp/ppp_on_boot. If you wish to further -customize it, mark it executable and edit it (it's a shell script). +If you want to have PPP started at boot time then add something like this +to /etc/network/interfaces: -For more advanced usage of PPP outbound connections install pppconfig. +auto myisp +iface myisp inet ppp + provider dsl-provider -Inbound setup combined with mgetty: ------------------------------------ +Inbound setup combined with mgetty +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Note: for this to work you need to have mgetty version >= 0.99 with its AutoPPP feature turned on. @@ -175,30 +109,14 @@ (see /usr/share/doc/ppp/examples/scripts/*callback), and with mgetty's `callback' program (see callback(8) manual page). -Permissions: ------------- +Permissions +~~~~~~~~~~~ Access to PPPD is controlled via the membership in the "dip" group. -Demand dial-up links: ---------------------- - -Note: if you use an older kernel version (older 2.0.x), you need to patch -the kernel itself, in order to support demand dial-up with the patches for -PPP 2.3. - -Add the following options to /etc/ppp/peers/provider: - -demand idle 600 holdoff 20 - -to set up demand dialing. 600 seconds (=10 minutes) idle time disconnects. -20 seconds between attempts to connect. This setup implies the "persist" -option. You might also want to enable PPP on boot up so you won't have to -worry about the PPP connection at all. - -Syslog facility level: ----------------------- +Syslog facility level +~~~~~~~~~~~~~~~~~~~~~ The default level of LOG_DAEMON has been overridden (as described in the pppd(8) man page), to be LOG_LOCAL2. The intent being that local2 be sent to /var/log/ppp.log for use by plog, if you add the following line to your @@ -206,19 +124,15 @@ local2.* -/var/log/ppp.log -Not implemented: ----------------- -Password expiration was once implemented with a direct call to a -non-exported function in libshadow, but isn't anymore. Why are -they doing such things? +PPP over ATM plugin +~~~~~~~~~~~~~~~~~~~ +The ppp package does not explicitly depend on the libatm1 package. +This package needs to be installed for the pppoatm.so plugin to work. -Kernel 2.0.x update: --------------------- -As of version 2.3.1 the kernel stuff is broken for some old 2.0.x kernels. -See the file called "kernel.fix-2.0.30-2" in this directory. +Logging of ip-up and ip-down +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +If you want to enable logging of the ip-up and ip-down scripts output, +then create the file /var/log/ppp-ipupdown.log . - -- Christoph Lameter , 22 July 1997 - Phil Hands - Josip Rodin , 27 November 1999. diff -Nru ppp-2.4.1.uus/debian/README.STATIC-IP ppp-2.4.2+20040202/debian/README.STATIC-IP --- ppp-2.4.1.uus/debian/README.STATIC-IP 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/README.STATIC-IP 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -Static IP addresses support with mgetty/autoPPP ------------------------------------------------ - -Debian PPP package includes a variant of ppp-2.3.0-static.diff, a patch to -ppp-2.3.0 to support using static IP addresses with Mgetty and AutoPPP. It -does not affect normal dynamic assignments. There is no need to re-compile -the kernel. - -You should update the pap-secrets file to contain the entries of those users -you want to have static IP addresses. Typical entry might look like: - -#client server secret IP addresses - jdoe * realpswd 207.69.189.15 - * * "" * - -Also, inform your static IP users to include their IP when -connecting. E.g. run `pppd 207.69.189.15:` -Or for Windows folks, check the "Specify an IP address" option and -type in the IP. - -Note: The second line is what most folks will use to authenticate -users who will be dynamically assigned their addresses by -/dev/ttyXX. This along with the login option allows users to be PAP -authenticated against the /etc/passwd or /etc/shadow. If you enter each and -every user into your pap-secrets file and do not have the last line, -(wildcards line) you MUST place a "*" at the end of each users line. -Without it, the authentication will fail. For example: - -#client server secret IP addresses - jdoe * passwd 207.69.189.15 * - -This "*" at the end allows the patches to work properly without changing -the normal process. The IP address is normally assigned via the -/etc/ppp/options.ttyXX file. The patches do not interfere with this process -at all. The only thing different is when the user tells pppd he has his own -address, pppd will allow him to use it, if he and his address are -authenticated via the pap-secrets file. The only thing to remember, is tell -your static IP users to set the "correct" IP or they will be assigned the -normal dynamic address. (And of course that's not what we want :>) If you -have any questions.... - -While I tested this as many ways as our systems would allow, no warranty -is implied. They work well for us. - -Author: Jeff Myers diff -Nru ppp-2.4.1.uus/debian/README.win9x ppp-2.4.2+20040202/debian/README.win9x --- ppp-2.4.1.uus/debian/README.win9x 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/README.win9x 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -Short guide on how to run a Win9x connection with PPPD to Debian Linux ----------------------------------------------------------------------- - -1. Do not mess around with the Win9x configuration. - Do not manually configure DNS, scripts etc. - Do not switch on the terminal windows. - Accept all defaults or better leave it as it was at installation. - -2. You need to have a getty program that supports automatic PPP protocol - detection, such as mgetty (versions >= 0.99). - - Note: the mgetty shipped with Debian has to be set up to enable this - behaviour - look for "AutoPPP" in the login.config configuration file. - -3. Change the "ms-dns" lines in /etc/ppp/options, and review the complete - file for things you need to do. - -4. Make sure that your /etc/ppp/pap-secrets file is set up to allow users - mentioned in system passwords database (/etc/passwd) to establish PPP - connections using their normal password. - - Note: the pap-secrets file shipped with Debian pppd is set up to enable - this by default. - -5. On the Win9x box, in Dial-Up Networking folder, create a new connection, - and enter the phone number. Prior to connecting, enter the username and - password. - -Win9x should connect to your Linux PPPD without problems and automatically -configure IP addresses, the netmask and the DNS servers. You can immediately -start Netscape, Internet Explorer or any other TCP/IP tools. - --- Christoph Lameter , 27 September, 1996, - Josip Rodin , 27 November 1999, - Michael Beattie , 9 April 2001. diff -Nru ppp-2.4.1.uus/debian/changelog ppp-2.4.2+20040202/debian/changelog --- ppp-2.4.1.uus/debian/changelog 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/changelog 2006-04-25 13:30:36.000000000 +0000 @@ -1,3 +1,340 @@ +ppp (2.4.2+20040202-3osso7) unstable; urgency=low + + * Apply thumb code, patch from Leonid Moiseichuk. (closes: #27108) + + -- Kalle Valo Tue, 25 Apr 2006 16:30:36 +0300 + +ppp (2.4.2+20040202-3osso6) unstable; urgency=low + + * Fixed ppp.postinst and ppp.postrm to work with busybox. + + -- Kalle Valo Wed, 6 Apr 2005 13:47:49 +0300 + +ppp (2.4.2+20040202-3osso4) unstable; urgency=low + + * Remove dependency to PAM, patch from Ed Bartosh. + + -- Kalle Valo Tue, 2 Nov 2004 11:17:22 +0200 + +ppp (2.4.2+20040202-3osso3) unstable; urgency=low + + * Fix alignment issue for MS-CHAP and MS-CHAP-v2 authentications + + -- Kalle Valo Tue, 12 Oct 2004 18:29:14 +0300 + +ppp (2.4.2+20040202-3osso2) unstable; urgency=low + + * Don't build udeb and -dev packages, this time for real. Also the ppp + sources are now in CVS, so they don't get lost again. + + -- Kalle Valo Thu, 9 Sep 2004 15:06:03 +0300 + +ppp (2.4.2+20040202-3osso1) unstable; urgency=low + + * Sources for the original 2.4.2+20040202-3osso1 were lost and I try + copy all the changes to a new -3osso1. Let's see how this goes. + * Disabled udeb build. + * Disabled usage of libpcap and removed build dependency to it. + * Disabled IPv6. + * Disabled pppoatm. + + -- Kalle Valo Thu, 9 Sep 2004 12:35:45 +0300 + +ppp (2.4.2+20040202-3) unstable; urgency=medium + + * Fixed the dependencies of ppp-udeb/ppp-dev. (Closes: #243774) + * New debconf translation: tr. (Closes: #243684) + * Added ipv6-{up,down} scripts. (Closes: #243330) + + -- Marco d'Itri Thu, 15 Apr 2004 19:53:16 +0200 + +ppp (2.4.2+20040202-2) unstable; urgency=medium + + * Enabled the postinst script in ppp-udeb, now it should be almost + useful. + * Add a workaround to the 0000usepeerdns scripts to not fail if + /etc/resolv.conf does not exist. (Closes: #235583) + * Added new debconf translations: fr, nl, ja. + (Closes: #236726, #239458, #237176) + * Fixed *again* the $PID regexp in poff, to be compatible with mawk. + (Closes: #238667, #239766) + + -- Marco d'Itri Sun, 11 Apr 2004 16:22:24 +0200 + +ppp (2.4.2+20040202-1) unstable; urgency=medium + + * New upstream release, with updates from CVS. (Closes: #102876) + * Patches removed because they have been merged upstream: + 009_SETUP.diff 012_secure-card.diff 053_pppoe-fix-persist + 054_pppoe-no-dead-code 055_pppoe-update-3.5 056_pppoe-nas-tap + devnam_path disable_evil_slprintf_r makefiles_use_copts + parisc_eagain_fix peerdns-env-always ppp-2.4.0-ttyperms.dif + pppd.8-filters warning_ipv6cp. + * Removed patch 005_fsm.c.diff, the upstream author thinks it violates + RFC1661. + * Removed patch 006_ipcp.c.diff, it appears to be useless. + * Fixed the $PID regexp in poff. (Closes: #219442, #225443) + * Use mv -f in 0000usepeerdns. (Closes: #225792) + * Added debian/po/. (Closes: #233758) + * New patch fix_closed_fds: make sure that fd numbers 0, 1 and 2 are not + used for a socket. (Closes: #235192) + + -- Marco d'Itri Sun, 29 Feb 2004 18:54:34 +0100 + +ppp (2.4.2+20031127-2) unstable; urgency=medium + + * New upstream snapshot, only documentation changes. + * New patch pppoe-nas-tap: make the pppoe plugin accept nas and tap + devices too, from Carlos Fonseca. (Closes: #221759) + * New patch pppoe-interface-up: make the pppoe plugin set the interface up. + (Closes: #222558) + * Do not make 0000usepeerdns-up fail if resolv.conf is empty. + (Closes: #221121) + * Removed patch use_system_logwtmp: it breaks utmp updates. + (Closes: #222261) + * Resurrected ppp.udeb. + * Removed patch: ppp-2.4.1-MSCHAPv2-fix.patch (was applied to dead code). + * New patch: ppp-2.4.2-stripMSdomain (I ported the old patch to the new + CHAP code). + * New patch: no_crypt_hack, because the d-i libc does not have crypt(3). + * Clean up the APM script. (Closes: #222008, #222436) + * New patch: parisc_eagain_fix to fix the EAGAIN != EWOULDBLOCK bug on + parisc, by James Bottomley. (Closes: #224982) + + -- Marco d'Itri Thu, 4 Dec 2003 11:54:35 +0100 + +ppp (2.4.2+20031002-4) unstable; urgency=medium + + * Deprecate /etc/ppp/ppp_on_boot in favour of ifupdown. + * Added /etc/apm/event.d/ppp to support APM. (Closes: #217821) + * Remove the logrotate entry for ppp.log, as syslog daemons manage + logging by themselves. (Closes: #216786, #217190) + * Add documentation about setting the default route. (Closes: #85426) + + -- Marco d'Itri Thu, 30 Oct 2003 21:04:15 +0100 + +ppp (2.4.2+20031002-3) unstable; urgency=medium + + * New patch 043_pppoatm-no-modprobe: do not run modprobe inside pppd. + * Removed the run-parts --report option from ip-{up,down} because it + caused it to wait for childs. (Closes: #214473) + * Suggests: libatm1. (Closes: #215874) + * Allow / in the poff parameter. (Closes: #215972) + * New example file per-linkname, from Eyal Rozenberg. + + -- Marco d'Itri Sat, 18 Oct 2003 12:34:26 +0200 + +ppp (2.4.2+20031002-2) unstable; urgency=medium + + * Fixed poff regexp. (Closes: #214051) + + -- Marco d'Itri Mon, 6 Oct 2003 20:21:10 +0200 + +ppp (2.4.2+20031002-1) unstable; urgency=low + + * Fresh CVS checkout. + * Removed the part of 040_pppoatm.diff which added a remove_option + member to struct protent in pppd.h. This has no apparent meaning + and breaks many other users of protent, like IPCP. + Debugged by Benjamin Heuer. (Closes: #213352) + * Conflict with incompatible versions of pppdcapiplugin. (Closes: #213217) + + -- Marco d'Itri Tue, 30 Sep 2003 23:06:12 +0200 + +ppp (2.4.2+20030811-6) unstable; urgency=low + + * Fix run-parts call in ip-{up,down}. (Closes: #213059) + * Removed ppp.udeb because it's apparently useless. + * New patch 042_pppoatm-libatm-workaround: work around a bug in + libatm1-dev which caused libatm.a to be statically linked (see #213146). + Now libatm1 needs to be installed if this plugin is used. + * Some obsolete information has been removed from README.Debian. + + -- Marco d'Itri Sun, 28 Sep 2003 19:48:32 +0200 + +ppp (2.4.2+20030811-5) unstable; urgency=low + + * Fix usage of ps in poff. (Closes: #58896) + * Add an example configuration file for the pppoe plugin. + * New patch pppoe-no-dead-code: disable some dead code in the pppoe plugin. + * Close the bugs fixed in the releases uploaded to experimental. + (Closes: #101616, #157214, #173546, #183221, #197489, #61717, #155668) + (Closes: #148156, #133809, #137964, #52913, #81511, #100665, #171137) + (Closes: #75797, #211485, #162163, #209146) + + -- Marco d'Itri Sat, 27 Sep 2003 16:05:49 +0200 + +ppp (2.4.2+20030811-4) experimental; urgency=low + + * New patch peerdns-env-always: always set $DNS1 and $DNS2 if name + server addresses are received with IPCP. (Closes: #209146) + * New patch pppoe-fix-persist: fixes the persist option, but watch + for side effects. + * Improved the parsing of the device name when / is a ramdisk. + (Closes: #162163) + * Build-Depend on a newer debhelper. (Closes: #211485) + * Renamed the pppoatm* patches because DBS is sensible to $LC_COLLATE. + * Updated the pppoe plugin with a fix from rp-pppoe 3.5. + + -- Marco d'Itri Sat, 20 Sep 2003 18:00:44 +0200 + +ppp (2.4.2+20030811-3) experimental; urgency=low + + * Add --report and $@ to the run-parts command line in ip-{up,down}. + (Suggestions from Dan Jacobson, Closes: #209133) + * Move /etc/ppp/options.ttyXX to /usr/share/doc/ppp/, it's documentation. + (Closes: #209275) + * Remove from postinst some compatibility code introduced in 2.3b3-2, + 2.3.5-2 and 2.3.6-1. + * Change the serial device permissions only when really needed. + Patch ppp-2.4.0-ttyperms.dif from the SuSE package. + (Closes: #22284, #36789, #51974, #62567, #74789) + * Use the system logwtmp() function. From the Red Hat and SuSE packages. + * Add the pppoatm-disconnection patch. From the Mandrake package. + * Add an example active-filter from the SuSE package. + * Add ppp-2.4.1-stripMSdomain.patch and ppp-2.4.1-MSCHAPv2-fix.patch + from the SuSE package. They say that these patches are described at + http://www.heise.de/ct/Redaktion/ps/pptp.html, but I don't know german. + I also don't use MSCHAP or MPPE, so I do not know if they will work. + Please report any success or insuccess of MPPE and related features. + * Add ppp-2.3.11-oedod.dif from the SuSE package to fix dial on demand + with sync PPP. (Closes: #75797) + + -- Marco d'Itri Sun, 14 Sep 2003 12:48:02 +0200 + +ppp (2.4.2+20030811-2) experimental; urgency=low + + * I'm the new maintainer. + * Fix FTBFS bug on S/390. + * Add a copy of chap-secrets to install. (#207417) + * Fix a little pon bug. (#207442) + * Clarify the active-filter description in pppd(8). (#207023) + * Make some files readable again by group dip. (#207407) + * Link pppoatm.so with libresolv. PPP over ATM has been reported to work. + + -- Marco d'Itri Wed, 27 Aug 2003 15:30:16 +0200 + +ppp (2.4.2+20030811-1) experimental; urgency=low + + * New CVS snapshot. (Closes: #171137) + New features: + - MPPE (Closes: #52913, #81511, #100665) + - kernel space PPPoE (Closes: #133809, #137964) + - CBCP (Closes: #148156) + - CHAP hooks for plugins (Closes: #155668) + - misc fixes (Closes: #61717) + * The following patches have been merged upstream: + 002_chat.c.diff 003_cbcp.diff 004_auth.c.diff 016_chat_manpage.diff + 017_memory_management.diff 020_IPPROTO_TCP_undefine.diff + 021_setipaddr.diff 022_lockfile-fix.diff 023_lcp-max-termintate.diff + 024_pppd.8-persist-maxfail.diff 025_packet_count.diff + 026_pppd.8-active-filter.diff 027_child_debugging.diff + 028_options_segv.diff 029_chap_plugin.diff 030_more_minor_warnings.diff + 031_ipv6cp-use-persistent.diff 032_flush_fd.diff etc_networks pppd.8 + pppiocdetach (?) reset-sigpipe (?) + * Added the PPP over ATM patch from + http://linux-usb.sourceforge.net/SpeedTouch/. Untested! + (Closes: #101616, #157214, #173546, #183221, #197489) + + -- Marco d'Itri Sun, 24 Aug 2003 13:40:16 +0200 + +ppp (2.4.1.uus2-3) unstable; urgency=low + + * Fix error in postinst. (Closes: #206978) + + -- Marco d'Itri Sun, 24 Aug 2003 13:23:01 +0200 + +ppp (2.4.1.uus2-2) unstable; urgency=low + + * New co-maintainer. (Closes: #180720) + * Switch to DBS. + * PAM configuration updated to the new style. + * Stop deleting /etc/ppp/* on purge, this is evil. (Closes: #202680) + * Kill pppd at K86 instead of K14. (Closes: #200639) + * Add a generic chatscript for PAP/CHAP sites. (Closes: #182107) + * Add a newline at the end of /etc/pam.d/ppp. (Closes: #182103) + * Add two ip-{up,down} scripts to support usepeerdns and the resolvconf + package. (Closes: #187756, #203243) + * Add a patch from Herbert Xu to fix the PPPIOCDETACH bug. This is + not the same bug of "Inappropriate ioctl for device(25)". + (Closes: #172317, #175480) + * 2.0 kernels are not supported by debian, remove kernel.fix-2.0.30-2. + (Closes: #171200) + * Add bash completion script. (Closes: #170771) + * Restore SIGPIPE for childs (Herbert Xu). (Closes: #169697) + * Fix the holdoff option (Herbert Xu). (Closes: #128875, #169694) + * Add a logrotate file. (Closes: #162895) + * Make pon print an error message if the user is not in the dip group. + (Closes: #156672) + * Improve the ability of poff of finding the right process. + (Closes: #160169) + * Remove deflate support from pppdump, just to be sure. (Closes: #144368) + * Use poff -a at shutdown time. (Closes: #140587) + * Add the popp example script from Tomas Pospisek. (Closes: #130716) + * Clarify pon(1). (Closes: #126656) + * Fix the code which reads /etc/networks/ (Closes: #125697) + * Add support for /var/log/ppp-ipupdown.log. (Closes: #152398) + * Add support for /etc/ppp/ip-{up,down}.local. (Closes: #85173, #119878) + * Create a new ppp-dev package for headers. (Closes: #101618) + * Add an example script from Brian May which implements exponential + redialing retries. (Closes: #56963, #140587, #205046) + * Add example scripts to support per-user ip-{up,down}.d directories. + (Closes: #46896, #60250) + * Export the call options as an environment variable. (Closes: #51880) + * Restore support for the 'quick' argument to pon. + * Add the cifdefroute.dif patch (from the SuSE ppp package). + (Closes: #93936) + + -- Marco d'Itri Thu, 21 Aug 2003 17:33:21 +0200 + +ppp (2.4.1.uus-5) unstable; urgency=low + + * Officially taking over the package. + + * Applied patch to stop pppd hanging on exit. + Closes: #33997 + + * Made the appropriate copyright notice change regarding the new BSD license. + Closes: #123831 + + * Fixed the download location in the copyright file. + Closes: #144348, #160116 + + * Added documentation for unit parameter for pppd.8. + Closes: #169385 + + * Change permissions on /etc/ppp to 0755. + Closes: #169258, #169259 + + * Check for /dev/.devfsd before checking for /dev/ppp + + -- Russell Coker Sun, 24 Nov 2002 12:58:00 +0100 + +ppp (2.4.1.uus-4.3) unstable; urgency=low + + * NMU with permission. + * Fix for numeric out of bounds giving a SEGV. + Closes: #34180 + * Back-port some plugin interfaces from ppp 2.4.2 for Portslave. + + -- Russell Coker Sat, 14 Sep 2002 08:46:00 +0200 + +ppp (2.4.1.uus-4.2) unstable; urgency=low + + * NMU + * Simple rebuild to deal with libpcap0->libpcap0.7 transition. + Closes: #156183 + + -- LaMont Jones Wed, 14 Aug 2002 21:45:43 -0600 + +ppp (2.4.1.uus-4.1) unstable; urgency=low + + * Non maintainer upload + * Rebuilt with new libpcap to remove dependency on libpcap0, which I + got removed from unstable by accident. Sorry about this... + + -- Torsten Landschoff Sat, 10 Aug 2002 11:37:27 +0200 + ppp (2.4.1.uus-4) unstable; urgency=low * Use MAKEDEV in postinst, not mknod. (Closes: #122574) @@ -45,681 +382,3 @@ just removing selected files within. (Closes: #107910) -- Michael Beattie Sat, 29 Sep 2001 23:15:44 +1200 - -ppp (2.4.1-4) unstable; urgency=medium - - * Fixed lockfile handling for devfs. (Closes: #103794) - * Added dependency on procps. (Closes: #104066) - * Added patch to count packets on linux. (Closes: #104276) - * Added patch for more memory management fixes (Closes: #104275) - - -- Michael Beattie Sat, 21 Jul 2001 18:11:53 +1200 - -ppp (2.4.1-3) unstable; urgency=low - - * Removed signal handling patch. causes breakage on many (almost all) - configurations different to Daniel's (holdoff 0, persist). Bug reopened. - * Added patch from Russell Coker to add option to specify ip-up script. - (Closes: #101587) - * Added patch (slightly modified) from Russell Coker that fixes compile - time warning. Not overly worrying, but what the hell. (Closes: #101584) - * Added patch from Russell Coker to make setipaddr() available for - portslave (Closes: #101830) - * Modified utils.c to correctly build a lockfile when using devfs. - (Closes: #101372, #101754) - * Added Spanish debconf Template. Thanks to Carlos Valdivia. - (Closes: #102636) - * Correctly check f->maxtermtransmits in fsm.c so that lcp-max-terminate - is honoured. (Closes: #98728) - * Added reference to maxfail option from persist description in manpage. - (Closes: #102313) - - -- Michael Beattie Thu, 5 Jul 2001 00:04:54 +1200 - -ppp (2.4.1-2) unstable; urgency=low - - * Using fixed debhelper, update-modules now only gets called if it is - actally available. (Closes: #94682) - * Removed start-stop-daemon call in prerm, dh_installinit does this now. - * removed suidunregister calls in postrm (oops) - * Added pppoe patch, we can now use kernel mode pppoe :> - Paul says he's - working on a better patch for 2.4.2, but I want pppoe for my own - purposes... go figure. (Closes: #88844) - * Added patch from Daniel Ginsburg for signal handling bug. - (Closes: #100028) - - -- Michael Beattie Sat, 16 Jun 2001 06:24:35 +1200 - -ppp (2.4.1-1) unstable; urgency=low - - * New upstream release - * get-up-to-date upload, before trying to squash a lot of the annoying bugs - against ppp. - * Added build dependency on debhelper. Closes: #68692, #68751 - * Creating udeb for debian-installer. Thanks to David Whedon. - Closes: #79864 - * check for location of kill in poff, to account for occasional brokeness - of procps. Joey Hess suggested a simple "kill", and let PATH do the - rest, but I feel that may break in some cases. Closes: #82771 - * Added Swedish, German, French, Dutch and Portuguese templates for debconf. - Thanks to André Dahlqvist, Joerg Rieger, Thomas Morin, Ivo Timmermans, - and Carlos Laviola. Closes: #83281, #84264, #83797, #92534, #93220 - * Fixed Bad characters in chat manpage. Closes: #75921 - * Added Patch to fix memory leak. Closes: #93371 - * Stopped using suidmanager. - - -- Michael Beattie Tue, 8 Aug 2000 23:13:58 +1200 - -ppp (2.4.0f-1) unstable; urgency=low - - * New upstream release - * New version Closes: #23784 - * Fixed postinst paper bag bug. Closes: #68673, #68682, #68668, #68684 - (I love it when people dont look to see if a bug is already reported.) - * Removed PATH definition from /etc/init.d/ppp. Closes: #66171 - * modified plog to also grep for 'chat[' if tailing syslog. - - -- Michael Beattie Mon, 7 Aug 2000 17:10:50 +1200 - -ppp (2.4.0b4-1) unstable; urgency=low - - * New upstream release - * New maintainer - * Added postinst section to create /dev/ppp. Closes: #65086 - * Added patches to pon from Josip Rodin to allow extra parameters to - pppd. also uses /etc/ppp/ppp_on_boot if present and executable. - Closes: #66778 - * Updated pon.1 to reflect above. Thanks Josip. - * Tidied Debian patches. Closes: #63678 - * Moved to doogie's dbs package format. - * Acknowledged NMU Patches. Again, thanks Josip. Closes: #58216, #60356 - * Adjusted plog to tail syslog, if ppp.log exists, but is zero-length - * Made pppd world readable. Closes: #60014 - - -- Michael Beattie Fri, 28 Jul 2000 20:37:14 +1200 - -ppp (2.3.11-1.4) frozen unstable; urgency=low - - * NMU, fixed usage of dpkg --compare-versions. $2 in the install scripts - is empty if this is the first time ppp is installed. This caused some - spurious output (not sure if it caused a failure or not, but it is - definitely broken). - - -- Ben Collins Thu, 30 Mar 2000 08:45:17 -0500 - -ppp (2.3.11-1.3) frozen unstable; urgency=low - - * Conditionalized suidunregister call in preinst, closes: 60330. - [several merged important bugs] - - -- Josip Rodin Tue, 14 Mar 2000 13:13:57 +0100 - -ppp (2.3.11-1.2) frozen unstable; urgency=low - - * Non-maintainer upload, approved by the maintainer. - * Remove the suidregister mess caused by file diversions in old packages - in preinst, closes: #57933. - * Don't ship {chap,pap}-secrets or `provider' chatscript/peer file as - conffiles, but as examples. Everybody needs to modify these files to - use them, so dpkg conffile prompt gets to be annoying. Instead, if these - files don't already exist in their regular locations, install these - examples in postinst, and remove them in postrm on purge, closes: #58170. - * Fixed a couple of typos in docs/comments, and explicitely tightened - some permissions. Updated the copyrights and licenses (yuck! yuck! yuck!). - * Default value for number of redial attempts with persist option was - changed from 0 to 10 upstream by introducing a new `maxfail' option. - It won't be reverted because it can cause unpredictable results, so - a note (with rationale) was added: in README.Debian, and in postinst - through debconf or if debconf doesn't exist, through normal cat/read, - closes: #51588. (added Suggests: debconf to control file for that) - * Added the following commented out options with descriptions to the - options file: maxfail, nopersist, persist, demand, idle, holdoff, - connect-delay. - * Partially fixed bug #48478 in plog, by making it tail /var/log/syslog, - grepping for ' pppd\[', if /var/log/ppp.log is not found. Maybe it - should print out a warning message about local2, not sure. Added a note - in plog(1) about the local2.*\t-/var/log/ppp.log in /etc/syslog.conf. - * If they exist, chown root.adm and chmod 640 ppp.log and ppp-connect-errors - files in /var/log, with postinst, just in case (the former file will be - set up that way by sysklogd's daily cron). - - -- Josip Rodin Wed, 16 Feb 2000 14:25:22 +0100 - -ppp (2.3.11-1.1) frozen unstable; urgency=medium - - * Non-maintainer upload. - * Made preinst script properly remove diversions and diverted files - from both older versions of ppp-pam, closes: #50723, #38732, #57855. - * Init script now runs poff to stop and/or restart properly, - closes: #56962, #39494. - * Marked /etc/chatscripts as a suid directory, root.dip 2750, - closes: #53493. - * Used most of the ideas from Petr Slansky for a - customizable ppp_on_boot file, while maintaining compatibility with - people's old non-runnable ppp_on_boot files, closes: #45424. - * Cleaned up, updated and/or renamed most of the documentation and - examples, closes: #47570, #57853 (first part). - * Added missing .TP near the `nomagic' description in pppd(8), - closes: #52925 (note: the IPv6 thing might still be wrong, didn't test). - * Increased chat REPORT buffer, with patch from the bug report, - closes: #57467. - * Added a Replaces: on ppp-pam, so dpkg can ditch it properly - (Conflicts+Replaces), the second part of second part of #57853. :) - * Added check whether $1 is remove or purge in postrm, the third part - of #57853. - * Changed s/tail $*/exec tail "$@"/ in plog, and added the exec in pon. - * Fixed some minor errors in the pon(1) manual page, added files' - descriptions. - * Added Build-Depends: libpam0g-dev, updated for Policy 3.1.1. - Used tmp directory abstraction in the rules file. Removed several - cruft files from debian/. - * Noting bugs fixed in 2.3.11-1, by Phil: - + new upstream version closes: #57062. - + ppp-pam merge back into ppp, as the base system now includes PAM, - closes: #48237. - + marked /etc/pam.d/ppp as conffile, closes: #48387 (that report - doesn't seem to exist...?). - - -- Josip Rodin Sat, 12 Feb 2000 00:15:43 +0100 - -ppp (2.3.11-1) frozen unstable; urgency=medium - - * New upstream release - * get rid of ppp/ppp-pam split now that PAM is in base - * fix spelling of debian/ppp-pam.conffiles. Doh! (closes: 48387) - * while I have a feeling that several of the bugs reported against - ppp are fixed by this upstream, I've not had time to confirm it, - so it may be best to wait for favourable reports, or an NMU, since - I'm off on holiday later today and won't be able to do any more - for a week. - - -- Philip Hands Fri, 11 Feb 2000 04:06:44 +0000 - -ppp (2.3.10-2) unstable; urgency=low - - * apply patch from Ben Collins (closes: #38639, #37869) - * add dependency ppp-pam --> libpam-modules (closes: #47563) - - -- Philip Hands Mon, 25 Oct 1999 14:38:41 +0100 - -ppp (2.3.10-1) unstable; urgency=low - - * New upstream release - - -- Philip Hands Mon, 11 Oct 1999 23:49:14 +0100 - -ppp (2.3.9-1) unstable; urgency=low - - * New upstream release (closes: #42030) - * applied upstream ppp-2.3.9-patch1 - * remove bash-isms from debian/rules (closes: #43262) - * change all references to /dev/cua* to /dev/ttyS* (closes: #43487) - * add a version dependency on sysvinit (closes: #41233) - * handle non-existent {pap,chap}-secrets (closes: #40884, #36859) - * /etc/pam.d/ppp now uses pam_unix.o ** NEEDS TESTING ** (closes: #39230) - - -- Philip Hands Sat, 28 Aug 1999 22:22:36 +0100 - -ppp (2.3.8-1) unstable; urgency=low - - * New upstream release - * revert to upstream pppstats code. Hopefully (closes: #39091) - * make sure /etc/ppp ends up belonging to root.dip - (closes: #39116, #39558, #39060, #38833, #38824, #38823, #38775, #38682, - #40717) - * stop postinst from editing /etc/syslog.conf (closes: #38769) - * postinst no longer worries if ``provider'' files don't exist - (closes: #38768) - * patch pppd/fsm.c to stop LCP terminate requests when lcp-max-terminate - is 0 (closes: #23734) - * add cbcp support - - -- Philip Hands Wed, 30 Jun 1999 21:10:53 +0100 - -ppp (2.3.7-4) unstable; urgency=low - - * make use of debhelper's new ability to suidregister directories - * fixed poff's ps|grep call (closes: #35661, #38418) - * dh_suidregister bug now fixed (closes: #35673, #35718, #37708) - * change chgrp dip's to chown root.dip's in rules, to get round some - dh_suidregister/fakeroot weirdness - - And from an NMU by Christian Kurz - * Applied patch from Torsten Landschoff (closes: #35064, #35180, - #35817, #35857, #36557) - * Applied patch from Harmut Koptein (closes: #38289) - - -- Philip Hands Sun, 30 May 1999 10:40:34 +0100 - -ppp (2.3.7-3) unstable; urgency=low - - * New pon.1 man page from Othmar Pasteka. - * set perms on etc/ppp (and some others) in postinst - this _really_ (closes: #35348) - - -- Philip Hands Mon, 5 Apr 1999 10:36:17 +0100 - -ppp (2.3.7-2) unstable; urgency=low - - * set flags to 1 for hide_password in upap.c, so it actually gets set. - * remove Christian's bogus preinst - - Changes for 2.3.7-1, which was broken, so was not published: - * New upstream release - - Christian Kurz's changes for 2.3.6-1.1: - * ppp-manual rewritten (closes: #14133) - * upstream release of chat fixed (closes: #16267) - * routing is set up correct (closes: #17287) - * poff allows to specifiy the process to kill (closes: #17410) - * ppp now works with the newest kernels (closes: #20091, #29964) - * ppp should suggest pppconfig is obsolete, because both are base files - (closes: #20143) - * ppp won't install is solved (closes: #20708) - * ppp based on the new upstream release (closes: #22243, #26429 #21921, #22064) - * provider-example changed (closes #18475) - * changed the location of connect-errors (closes: #15483) - * rewrote the redialer-script (closes: #26230) - * fixed permissions of /etc/ppp (closes: #27246) - * use the new pon.1 man page which was written by Othmar Pasteka - * /etc/ppp/options doesn't get overriden (closes: #17543) - * static-ip patch included (closes: #22497) - * pon command works (closes: #22963) - * messages appear now in the logfile (closes: #23868) - * disconnect sequence is correct (closes: #24584) - * upgrading of ppp now works (closes: #25397) - * ip-up/down race condition is removed (closes: #30935) - * poff can be run by the same person as pon (closes #33773) - * ip-up and ip-down won't be executed simultaneously (closes: #34377) - * new poff script (closes: #34927) - * /etc/ppp/options corrected (closes: #29647) - * ppp.log-permission are correct and the logfile is cycled (closes: #25901) - - -- Philip Hands Sat, 3 Apr 1999 16:49:26 +0100 - -ppp (2.3.6-1) unstable; urgency=low - - * New upstream release - * switch to debhelper - * prevent passwords apearing in syslog messages (closes: #20818, #21213, #31218) - * use pon.1 man page written by othmar@tron.priv.at (closes: #19967) - * use John Hasler's revised poff (closes: #25365, #30435, #32365) - * make init.d script use rc?.d number of 14 (closes: #28212) - * add example scripts from Yann Dirson (closes: #16836) - * reduce logging in chat, unless ``verbose'' is set (closes: #24017) - * mention pap-secrets fixup in README.debian (closes: #16905) - * create dummy upstream Changelog (closes: #20187) - * set ppp-pam's priority to optional (closes: #21125) - - -- Philip Hands Mon, 22 Mar 1999 16:00:01 +0000 - -ppp (2.3.5-2) frozen unstable; urgency=low - - * Apply patch from linux-ppp, via Eloy A. Paris, that allows IPX over PPP - * fix default login line in pap-secrets (closes: #23508) - * get rid of cron.daily, since syslogd's cron.weekly is dealing with the - log aging (closes: #22059) - - -- Philip Hands Mon, 15 Jun 1998 17:28:39 +0100 - -ppp (2.3.5-1) frozen unstable; urgency=low - - * make /etc/chatscripts and /etc/ppp/peers SGID (closes: #22501) - * use new poff from steveh@eecs.umich.edu (closes: #22391, #22322, #20994) - - -- Philip Hands Tue, 26 May 1998 10:18:13 +0100 - -ppp (2.3.5-0.1) frozen unstable; urgency=low - - * New upstream bugfix release. - * Non-maintainer release. - - -- Joel Klecker Wed, 13 May 1998 19:36:57 -0700 - -ppp (2.3.3-5) unstable; urgency=low - - * add options to poff, to allow alternative signals to be sent - (closes: #18618) - * rebuild to get rid of spurious diff contents (possible dpkg-dev bug ?) - (closes: #18824) - * add /usr/doc/ppp-pam symlink to point at ppp's docs (closes: #19393) - - -- Philip Hands Mon, 16 Mar 1998 12:01:32 +0000 - -ppp (2.3.3-4) unstable; urgency=low - - * reset logging after PAM grabs it, and make utmp/wtmp happen again - (closes: #18544) - - -- Philip Hands Tue, 24 Feb 1998 11:38:28 +0000 - -ppp (2.3.3-3) unstable; urgency=medium - - * use --quiet in init.d script (closes: #18226) - * fix unchecked prompting in postinst (closes: #12623) - * PAM logins now work (used Cristian Gafton 's patch - which seems to be for a later version of PAM, but worked anyway after - a minor tweak). - * use the /etc/pam.d/ppp file from redhat as well. - - -- Philip Hands Mon, 23 Feb 1998 23:45:16 +0000 - -ppp (2.3.3-2) unstable; urgency=low - - * make ip-(up|down) executable (closes: #11449, #16113) - * put /etc/pam.d/ppp in ppp-pam (closes: #16111) - * add console messages to /etc/init.d/ppp (closes: #16629) - * add IPPARAM to ip-(up|down) (closes: #16695) - * improve comments in ip-(up|down) (closes: #17126) - - -- Philip Hands Tue, 10 Feb 1998 23:47:37 +0000 - -ppp (2.3.3-1) unstable; urgency=low - - * New upstream release - - -- Philip Hands Fri, 6 Feb 1998 12:13:33 +0000 - -ppp (2.3.2-3) unstable; urgency=low - - * automate the version dependency in ppp-pam - - -- Philip Hands Thu, 18 Dec 1997 17:14:34 +0000 - -ppp (2.3.2-2) unstable; urgency=low - - * add creation of ppp-pam .deb - * ppp-pam: use libpam0g and add /etc/pam.d/ppp - * add use of run-parts ip-{up,down}.d - - -- Philip Hands Sun, 14 Dec 1997 21:12:58 +0000 - -ppp (2.3.2-1) unstable; urgency=low - - * New upstream release - * get rid of dependence on libpam (closes: #15665) - * applied ms-chap patch from Kent Robotti - - -- Philip Hands Sat, 6 Dec 1997 19:28:42 +0000 - -ppp (2.3.1-6) unstable; urgency=low - - * Fix feeble typo in postinst - - -- Philip Hands Thu, 6 Nov 1997 00:23:09 +0000 - -ppp (2.3.1-5) unstable; urgency=low - - * fix /tmp/$$ security hole in postinst (#11781) - * stop postinst trying to chmod non-existent files (#14519,#14279) - * fix permissions on /usr/include/net/slcompress.h (#14557) - - -- Philip Hands Wed, 5 Nov 1997 12:38:48 +0000 - -ppp (2.3.1-4) unstable; urgency=low - - * unpatch pppstats so that it gets compiled OK with libc6 - - -- Philip Hands Wed, 5 Nov 1997 11:45:10 +0000 - -ppp (2.3.1-3) unstable; urgency=medium - - * re-enable setting of serial port speed (disabled in error) - * fix permissions on /etc/chatscripts (#14166) - * tidy up poff (#14209) - - -- Philip Hands Wed, 29 Oct 1997 00:35:32 +0000 - -ppp (2.3.1-2) unstable; urgency=medium - - * Set Maintainer: to me. - * Add IPX support, and disable it in options - - -- Philip Hands Fri, 25 Jul 1997 03:24:04 +0100 - -ppp (2.3.1-1) experimental; urgency=low - - * Non-Maintainer release: I think it is necessary to get this stuff working soon - and the experimental version still has my maintainer name. - * Updated to "non-beta" release which was advertised as tested (Joke! Joke!). - * Included patch to fix the ppp kernel sourcecode so that it compiles. - * Warning: TCP stalls in a regular fashion. f.e. on an SMTP connection. - If someone wants to fix things. Beats me. - * demand dialing requires kernel ppp sourcecode update or newer kernel (than - available on July 23,1997) - * Shadow password expiration disabled due to - use of non-exported function of the shadow library. - * pppstats does not compile due to incompatibility with kernel 2.0.30 - kernel symbols. - * pppd source patches so that chat-scripts do not stall. - * STATIC IP patches applied - * poff: Do not rely on pid file to kill pppd - * plog: Allow options to be passed on to "tail". - - -- Christoph Lameter Tue, 22 Jul 1997 23:19:23 -0700 - -ppp (2.3b3-3) experimental; urgency=low - - * All changes done to the regular ppp package revisions applied to the - experimental one. - * PAM support - * High baudrate Support - * Shadow support - - -- Christoph Lameter Sat, 5 Apr 1997 21:30:55 -0800 - -ppp (2.3b3-2) experimental; urgency=low - - * ppp compiled with newest debmake and thus suidmanager support - * pppstats does not compile not included - * Note: ppp 2.3b3 is experimental and limited. Will stay in experimental. - Only an upstream release fixing the gaps can make ppp 2.3 advance into - unstable. Bug reports wanted. - * Remove /etc/ppp.chatscript and /etc/ppp.options_out - instead use /etc/ppp/peers/provider and /etc/charscripts/provider - according to new upstream ppp security scheme (about which I am kind of - puzzled right now). - * Modified scripts / init.d according to new security scheme. - * postinst converts from old setup scheme and makes dialup scripts + - options file more secure. - * Permissions on binary were screwed up in -1 release. - - -- Christoph Lameter Thu, 21 Nov 1996 21:32:35 -0800 - -ppp (2.3b3-1) experimental; urgency=low - - * pppd made only executable by group dip - * Upstream upgrade to BETA - - -- Christoph Lameter Fri, 8 Nov 1996 15:13:45 -0800 - -ppp (2.2.0f-17) unstable; urgency=low - - * pppd is not stopped and started on upgrade (only happened with ppp on bootup enabled) - - -- Christoph Lameter Tue, 5 Nov 1996 06:56:35 -0800 - -ppp (2.2.0f-16) unstable; urgency=low - - * chatscript aborts on no dialtone - * stripped pppstats - - -- Christoph Lameter Thu, 24 Oct 1996 10:11:07 -0700 - -ppp (2.2.0f-15) unstable; urgency=low - - * debmake 0.91 applied to ppp - * debmake takes over the /etc/init.d and the postrm stuff. - - -- Christoph Lameter Mon, 21 Oct 1996 18:58:19 -0800 - -ppp (2.2.0f-14) unstable; urgency=low - - * debmake problem with install scripts - - -- Christoph Lameter Thu, 17 Oct 1996 07:20:20 -0800 - -ppp (2.2.0f-13) unstable; urgency=low - - * Added \q after the password in ppp.chatscript - - -- Christoph Lameter Mon, 14 Oct 1996 17:59:45 -0800 - -ppp (2.2.0f-12) unstable; urgency=low - - * Added persist option to default configuration file ppp.options_out - to have pppd keep on dialing until connection is established. - * Added restarting of logging daemons to cron.daily script - - -- Christoph Lameter Sat, 12 Oct 1996 09:00:00 -0800 - -ppp (2.2.0f-11) unstable; urgency=medium - - * Postinst also customizes /etc/ppp/options.ttyXX - * Changed the bad example in /etc/ppp/options.ttyXX. - * Added log rotation - * Fixed persist option in pppd so that it waits 10 seconds before - reconnecting. Otherwise the reconnect attempt fails. - * Do not abort pppd on script failure with the persist option on. - * Added manpages for pon,poff,plog - - -- Christoph Lameter Mon, 7 Oct 1996 09:00:00 -0800 - -ppp (2.2.0f-10) unstable; urgency=medium - - * Tested the automatic-ppp-on-boot function - * Fixed bug in /etc/init.d/ppp (was not compatible with pon) - - -- Christoph Lameter Sun, 6 Oct 1996 09:00:00 -0800 - -ppp (2.2.0f-9) unstable; urgency=medium - - * Convenience scripts ( pon, poff, plog ) to control/monitor link - * Links were not activated in the last change - * Syslog output redirected to a separate file in /var/log/ppp.log - * Updated Documentation in README.debian - * Corrected changelog - * Finally got through to using ppp/mgetty on my home system and - found some inconveniences in the config files. - * moved /etc/ppp/chatscript to /etc/ppp.chatscript since /etc/ppp is not - to be accessed from userspace. - * New configuration file /etc/ppp.options_out for outbound options to - be able to handle mixed (inbound/outbound) usage. - I am not yet satisfied with the mixed setups such as I have at home. - - -- Christoph Lameter Sat, 5 Oct 1996 09:00:00 -0800 - -ppp (2.2.0f-8) unstable; urgency=low - - * links for /etc/init.d/ppp installed again - * pppd will come up on startup if /etc/ppp/ppp_on_boot exists - - -- Christoph Lameter Wed, 2 Oct 1996 09:00:00 -0800 - -ppp (2.2.0f-7) unstable; urgency=low - - * fixed a couple of bugs in postinst script. - * pppd now stripped - * etc/rc.d links for /etc/init.d/ppp not installed anymore - * /etc/init.d revised - - -- Christoph Lameter Wed, 2 Oct 1996 09:00:00 -0800 - -ppp (2.2.0f-6) unstable; urgency=low - - * pppstats program was not included - - -- Christoph Lameter Sun, 29 Sep 1996 09:00:00 -0800 - -ppp (2.2.0f-5) unstable; urgency=low - - * Updated standards - * Updated Documentation in /etc/ppp/options - - -- Christoph Lameter Fri, 27 Sep 1996 09:00:00 -0800 - -ppp (2.2.0f-4) unstable; urgency=low - - * Added example file for options.ttyXX - * Renamed to ppp to merge isp-ppp with ppp - * New maintainer for ppp package - * pppd runs setsuid - - -- Christoph Lameter Wed, 25 Sep 1996 09:00:00 -0800 - -isp-ppp (2.2.0f-2) unstable;urgency=low - - * Added "Conflicts: ppp" to control -isp-ppp (2.2.0f-1) unstable;urgency=low - - * Added pap-secrets file for mgetty integration - * Reworked control - - -- Christoph Lameter Fri, 6 Sep 1996 09:00:00 -0800 - -isp-ppp (2.2.0f-0) unstable;urgency=low - - * Added patch to fix trumpet winsock problems - * Update to standards 2.1.0.0 - * Named package isp-ppp to be able to release alternate pppd into debian - distribution - * pppd installed suid for regular dialup people who want to activate pppd - - -- Christoph Lameter Fri, 6 Sep 1996 09:00:00 -0800 - -Thu Jul 25 22:47:37 PDT 1996 Christoph Lameter - - * Added remote DNS and WINS configuration ability to pppd - ( See comments in /etc/ppp/options) - * Build on top of ppp of Alvar - -Sun Jul 7 17:01:22 BST 1996 Alvar Bray - * Setup to build/install pppstats utility. - * Modified to build on any archticture, Thanks due to - Yambo . - * Version 2.2.0f-3 released. - -Sun May 26 14:28:39 BST 1996 Alvar Bray - * Applied patches from Marek Michalkiewicz - to suport shadow - passwords. - * Added Architecture and priority fields to debian.control. - * Version 2.2.0f-2 released. - -Wed May 1 19:54:15 BST 1996 Alvar Bray - * Updated to upstream version 2.2.0f. - * Changed version to 2.2.0f-1. - -Sat Mar 23 09:39:49 GMT 1996 Alvar Bray - * Modified runlevel change start/kill links. - * Removed symlink /usr/include/net/route.h - * Revision 3 released. - -Tue Jan 30 23:14:51 GMT 1996 Alvar Bray - * used a documemented version of the options file from - source by Jim Knoble - * Removed /etc/ppp/ppp-connect script - * Added /etc/ppp/chatscript called by the options file - * Added empty ip-up and ip-down scripts. - -Sun Jan 28 22:34:09 GMT 1996 Alvar Bray - * Upgraded to version ppp-2.2.0e using CVS - * Renamed package ppp-2.2.0e - -Wed Nov 22 15:31:15 GMT 1995 Alvar Bray - * Rebuilt using elf format - added libc5 dependency. - * Made purge remove all ppp files (bug #1827) - * Added missing kernel header stubs to /usr/include/net - (bug #1795) - * Removed reference to /etc/init.d/functions in - /etc/init.d/ppp (bug #1725) - * Added dependency on netbase (bug #1443) - * New README (bug#1059) - * New source using ppp-2.2.0.c from - sunsite.unc.edu:/pub/Linux/system/Network/serial - -Ian Murdock - * added Debian GNU/Linux package maintenance system files - * changed Makefile variables in chat and pppd directories - - diff -Nru ppp-2.4.1.uus/debian/changelog.old ppp-2.4.2+20040202/debian/changelog.old --- ppp-2.4.1.uus/debian/changelog.old 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/changelog.old 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,677 @@ +ppp (2.4.1-4) unstable; urgency=medium + + * Fixed lockfile handling for devfs. (Closes: #103794) + * Added dependency on procps. (Closes: #104066) + * Added patch to count packets on linux. (Closes: #104276) + * Added patch for more memory management fixes (Closes: #104275) + + -- Michael Beattie Sat, 21 Jul 2001 18:11:53 +1200 + +ppp (2.4.1-3) unstable; urgency=low + + * Removed signal handling patch. causes breakage on many (almost all) + configurations different to Daniel's (holdoff 0, persist). Bug reopened. + * Added patch from Russell Coker to add option to specify ip-up script. + (Closes: #101587) + * Added patch (slightly modified) from Russell Coker that fixes compile + time warning. Not overly worrying, but what the hell. (Closes: #101584) + * Added patch from Russell Coker to make setipaddr() available for + portslave (Closes: #101830) + * Modified utils.c to correctly build a lockfile when using devfs. + (Closes: #101372, #101754) + * Added Spanish debconf Template. Thanks to Carlos Valdivia. + (Closes: #102636) + * Correctly check f->maxtermtransmits in fsm.c so that lcp-max-terminate + is honoured. (Closes: #98728) + * Added reference to maxfail option from persist description in manpage. + (Closes: #102313) + + -- Michael Beattie Thu, 5 Jul 2001 00:04:54 +1200 + +ppp (2.4.1-2) unstable; urgency=low + + * Using fixed debhelper, update-modules now only gets called if it is + actally available. (Closes: #94682) + * Removed start-stop-daemon call in prerm, dh_installinit does this now. + * removed suidunregister calls in postrm (oops) + * Added pppoe patch, we can now use kernel mode pppoe :> - Paul says he's + working on a better patch for 2.4.2, but I want pppoe for my own + purposes... go figure. (Closes: #88844) + * Added patch from Daniel Ginsburg for signal handling bug. + (Closes: #100028) + + -- Michael Beattie Sat, 16 Jun 2001 06:24:35 +1200 + +ppp (2.4.1-1) unstable; urgency=low + + * New upstream release + * get-up-to-date upload, before trying to squash a lot of the annoying bugs + against ppp. + * Added build dependency on debhelper. Closes: #68692, #68751 + * Creating udeb for debian-installer. Thanks to David Whedon. + Closes: #79864 + * check for location of kill in poff, to account for occasional brokeness + of procps. Joey Hess suggested a simple "kill", and let PATH do the + rest, but I feel that may break in some cases. Closes: #82771 + * Added Swedish, German, French, Dutch and Portuguese templates for debconf. + Thanks to André Dahlqvist, Joerg Rieger, Thomas Morin, Ivo Timmermans, + and Carlos Laviola. Closes: #83281, #84264, #83797, #92534, #93220 + * Fixed Bad characters in chat manpage. Closes: #75921 + * Added Patch to fix memory leak. Closes: #93371 + * Stopped using suidmanager. + + -- Michael Beattie Tue, 8 Aug 2000 23:13:58 +1200 + +ppp (2.4.0f-1) unstable; urgency=low + + * New upstream release + * New version Closes: #23784 + * Fixed postinst paper bag bug. Closes: #68673, #68682, #68668, #68684 + (I love it when people dont look to see if a bug is already reported.) + * Removed PATH definition from /etc/init.d/ppp. Closes: #66171 + * modified plog to also grep for 'chat[' if tailing syslog. + + -- Michael Beattie Mon, 7 Aug 2000 17:10:50 +1200 + +ppp (2.4.0b4-1) unstable; urgency=low + + * New upstream release + * New maintainer + * Added postinst section to create /dev/ppp. Closes: #65086 + * Added patches to pon from Josip Rodin to allow extra parameters to + pppd. also uses /etc/ppp/ppp_on_boot if present and executable. + Closes: #66778 + * Updated pon.1 to reflect above. Thanks Josip. + * Tidied Debian patches. Closes: #63678 + * Moved to doogie's dbs package format. + * Acknowledged NMU Patches. Again, thanks Josip. Closes: #58216, #60356 + * Adjusted plog to tail syslog, if ppp.log exists, but is zero-length + * Made pppd world readable. Closes: #60014 + + -- Michael Beattie Fri, 28 Jul 2000 20:37:14 +1200 + +ppp (2.3.11-1.4) frozen unstable; urgency=low + + * NMU, fixed usage of dpkg --compare-versions. $2 in the install scripts + is empty if this is the first time ppp is installed. This caused some + spurious output (not sure if it caused a failure or not, but it is + definitely broken). + + -- Ben Collins Thu, 30 Mar 2000 08:45:17 -0500 + +ppp (2.3.11-1.3) frozen unstable; urgency=low + + * Conditionalized suidunregister call in preinst, closes: 60330. + [several merged important bugs] + + -- Josip Rodin Tue, 14 Mar 2000 13:13:57 +0100 + +ppp (2.3.11-1.2) frozen unstable; urgency=low + + * Non-maintainer upload, approved by the maintainer. + * Remove the suidregister mess caused by file diversions in old packages + in preinst, closes: #57933. + * Don't ship {chap,pap}-secrets or `provider' chatscript/peer file as + conffiles, but as examples. Everybody needs to modify these files to + use them, so dpkg conffile prompt gets to be annoying. Instead, if these + files don't already exist in their regular locations, install these + examples in postinst, and remove them in postrm on purge, closes: #58170. + * Fixed a couple of typos in docs/comments, and explicitely tightened + some permissions. Updated the copyrights and licenses (yuck! yuck! yuck!). + * Default value for number of redial attempts with persist option was + changed from 0 to 10 upstream by introducing a new `maxfail' option. + It won't be reverted because it can cause unpredictable results, so + a note (with rationale) was added: in README.Debian, and in postinst + through debconf or if debconf doesn't exist, through normal cat/read, + closes: #51588. (added Suggests: debconf to control file for that) + * Added the following commented out options with descriptions to the + options file: maxfail, nopersist, persist, demand, idle, holdoff, + connect-delay. + * Partially fixed bug #48478 in plog, by making it tail /var/log/syslog, + grepping for ' pppd\[', if /var/log/ppp.log is not found. Maybe it + should print out a warning message about local2, not sure. Added a note + in plog(1) about the local2.*\t-/var/log/ppp.log in /etc/syslog.conf. + * If they exist, chown root.adm and chmod 640 ppp.log and ppp-connect-errors + files in /var/log, with postinst, just in case (the former file will be + set up that way by sysklogd's daily cron). + + -- Josip Rodin Wed, 16 Feb 2000 14:25:22 +0100 + +ppp (2.3.11-1.1) frozen unstable; urgency=medium + + * Non-maintainer upload. + * Made preinst script properly remove diversions and diverted files + from both older versions of ppp-pam, closes: #50723, #38732, #57855. + * Init script now runs poff to stop and/or restart properly, + closes: #56962, #39494. + * Marked /etc/chatscripts as a suid directory, root.dip 2750, + closes: #53493. + * Used most of the ideas from Petr Slansky for a + customizable ppp_on_boot file, while maintaining compatibility with + people's old non-runnable ppp_on_boot files, closes: #45424. + * Cleaned up, updated and/or renamed most of the documentation and + examples, closes: #47570, #57853 (first part). + * Added missing .TP near the `nomagic' description in pppd(8), + closes: #52925 (note: the IPv6 thing might still be wrong, didn't test). + * Increased chat REPORT buffer, with patch from the bug report, + closes: #57467. + * Added a Replaces: on ppp-pam, so dpkg can ditch it properly + (Conflicts+Replaces), the second part of second part of #57853. :) + * Added check whether $1 is remove or purge in postrm, the third part + of #57853. + * Changed s/tail $*/exec tail "$@"/ in plog, and added the exec in pon. + * Fixed some minor errors in the pon(1) manual page, added files' + descriptions. + * Added Build-Depends: libpam0g-dev, updated for Policy 3.1.1. + Used tmp directory abstraction in the rules file. Removed several + cruft files from debian/. + * Noting bugs fixed in 2.3.11-1, by Phil: + + new upstream version closes: #57062. + + ppp-pam merge back into ppp, as the base system now includes PAM, + closes: #48237. + + marked /etc/pam.d/ppp as conffile, closes: #48387 (that report + doesn't seem to exist...?). + + -- Josip Rodin Sat, 12 Feb 2000 00:15:43 +0100 + +ppp (2.3.11-1) frozen unstable; urgency=medium + + * New upstream release + * get rid of ppp/ppp-pam split now that PAM is in base + * fix spelling of debian/ppp-pam.conffiles. Doh! (closes: 48387) + * while I have a feeling that several of the bugs reported against + ppp are fixed by this upstream, I've not had time to confirm it, + so it may be best to wait for favourable reports, or an NMU, since + I'm off on holiday later today and won't be able to do any more + for a week. + + -- Philip Hands Fri, 11 Feb 2000 04:06:44 +0000 + +ppp (2.3.10-2) unstable; urgency=low + + * apply patch from Ben Collins (closes: #38639, #37869) + * add dependency ppp-pam --> libpam-modules (closes: #47563) + + -- Philip Hands Mon, 25 Oct 1999 14:38:41 +0100 + +ppp (2.3.10-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Mon, 11 Oct 1999 23:49:14 +0100 + +ppp (2.3.9-1) unstable; urgency=low + + * New upstream release (closes: #42030) + * applied upstream ppp-2.3.9-patch1 + * remove bash-isms from debian/rules (closes: #43262) + * change all references to /dev/cua* to /dev/ttyS* (closes: #43487) + * add a version dependency on sysvinit (closes: #41233) + * handle non-existent {pap,chap}-secrets (closes: #40884, #36859) + * /etc/pam.d/ppp now uses pam_unix.o ** NEEDS TESTING ** (closes: #39230) + + -- Philip Hands Sat, 28 Aug 1999 22:22:36 +0100 + +ppp (2.3.8-1) unstable; urgency=low + + * New upstream release + * revert to upstream pppstats code. Hopefully (closes: #39091) + * make sure /etc/ppp ends up belonging to root.dip + (closes: #39116, #39558, #39060, #38833, #38824, #38823, #38775, #38682, + #40717) + * stop postinst from editing /etc/syslog.conf (closes: #38769) + * postinst no longer worries if ``provider'' files don't exist + (closes: #38768) + * patch pppd/fsm.c to stop LCP terminate requests when lcp-max-terminate + is 0 (closes: #23734) + * add cbcp support + + -- Philip Hands Wed, 30 Jun 1999 21:10:53 +0100 + +ppp (2.3.7-4) unstable; urgency=low + + * make use of debhelper's new ability to suidregister directories + * fixed poff's ps|grep call (closes: #35661, #38418) + * dh_suidregister bug now fixed (closes: #35673, #35718, #37708) + * change chgrp dip's to chown root.dip's in rules, to get round some + dh_suidregister/fakeroot weirdness + + And from an NMU by Christian Kurz + * Applied patch from Torsten Landschoff (closes: #35064, #35180, + #35817, #35857, #36557) + * Applied patch from Harmut Koptein (closes: #38289) + + -- Philip Hands Sun, 30 May 1999 10:40:34 +0100 + +ppp (2.3.7-3) unstable; urgency=low + + * New pon.1 man page from Othmar Pasteka. + * set perms on etc/ppp (and some others) in postinst + this _really_ (closes: #35348) + + -- Philip Hands Mon, 5 Apr 1999 10:36:17 +0100 + +ppp (2.3.7-2) unstable; urgency=low + + * set flags to 1 for hide_password in upap.c, so it actually gets set. + * remove Christian's bogus preinst + + Changes for 2.3.7-1, which was broken, so was not published: + * New upstream release + + Christian Kurz's changes for 2.3.6-1.1: + * ppp-manual rewritten (closes: #14133) + * upstream release of chat fixed (closes: #16267) + * routing is set up correct (closes: #17287) + * poff allows to specifiy the process to kill (closes: #17410) + * ppp now works with the newest kernels (closes: #20091, #29964) + * ppp should suggest pppconfig is obsolete, because both are base files + (closes: #20143) + * ppp won't install is solved (closes: #20708) + * ppp based on the new upstream release (closes: #22243, #26429 #21921, #22064) + * provider-example changed (closes #18475) + * changed the location of connect-errors (closes: #15483) + * rewrote the redialer-script (closes: #26230) + * fixed permissions of /etc/ppp (closes: #27246) + * use the new pon.1 man page which was written by Othmar Pasteka + * /etc/ppp/options doesn't get overriden (closes: #17543) + * static-ip patch included (closes: #22497) + * pon command works (closes: #22963) + * messages appear now in the logfile (closes: #23868) + * disconnect sequence is correct (closes: #24584) + * upgrading of ppp now works (closes: #25397) + * ip-up/down race condition is removed (closes: #30935) + * poff can be run by the same person as pon (closes #33773) + * ip-up and ip-down won't be executed simultaneously (closes: #34377) + * new poff script (closes: #34927) + * /etc/ppp/options corrected (closes: #29647) + * ppp.log-permission are correct and the logfile is cycled (closes: #25901) + + -- Philip Hands Sat, 3 Apr 1999 16:49:26 +0100 + +ppp (2.3.6-1) unstable; urgency=low + + * New upstream release + * switch to debhelper + * prevent passwords apearing in syslog messages (closes: #20818, #21213, #31218) + * use pon.1 man page written by othmar@tron.priv.at (closes: #19967) + * use John Hasler's revised poff (closes: #25365, #30435, #32365) + * make init.d script use rc?.d number of 14 (closes: #28212) + * add example scripts from Yann Dirson (closes: #16836) + * reduce logging in chat, unless ``verbose'' is set (closes: #24017) + * mention pap-secrets fixup in README.debian (closes: #16905) + * create dummy upstream Changelog (closes: #20187) + * set ppp-pam's priority to optional (closes: #21125) + + -- Philip Hands Mon, 22 Mar 1999 16:00:01 +0000 + +ppp (2.3.5-2) frozen unstable; urgency=low + + * Apply patch from linux-ppp, via Eloy A. Paris, that allows IPX over PPP + * fix default login line in pap-secrets (closes: #23508) + * get rid of cron.daily, since syslogd's cron.weekly is dealing with the + log aging (closes: #22059) + + -- Philip Hands Mon, 15 Jun 1998 17:28:39 +0100 + +ppp (2.3.5-1) frozen unstable; urgency=low + + * make /etc/chatscripts and /etc/ppp/peers SGID (closes: #22501) + * use new poff from steveh@eecs.umich.edu (closes: #22391, #22322, #20994) + + -- Philip Hands Tue, 26 May 1998 10:18:13 +0100 + +ppp (2.3.5-0.1) frozen unstable; urgency=low + + * New upstream bugfix release. + * Non-maintainer release. + + -- Joel Klecker Wed, 13 May 1998 19:36:57 -0700 + +ppp (2.3.3-5) unstable; urgency=low + + * add options to poff, to allow alternative signals to be sent + (closes: #18618) + * rebuild to get rid of spurious diff contents (possible dpkg-dev bug ?) + (closes: #18824) + * add /usr/doc/ppp-pam symlink to point at ppp's docs (closes: #19393) + + -- Philip Hands Mon, 16 Mar 1998 12:01:32 +0000 + +ppp (2.3.3-4) unstable; urgency=low + + * reset logging after PAM grabs it, and make utmp/wtmp happen again + (closes: #18544) + + -- Philip Hands Tue, 24 Feb 1998 11:38:28 +0000 + +ppp (2.3.3-3) unstable; urgency=medium + + * use --quiet in init.d script (closes: #18226) + * fix unchecked prompting in postinst (closes: #12623) + * PAM logins now work (used Cristian Gafton 's patch + which seems to be for a later version of PAM, but worked anyway after + a minor tweak). + * use the /etc/pam.d/ppp file from redhat as well. + + -- Philip Hands Mon, 23 Feb 1998 23:45:16 +0000 + +ppp (2.3.3-2) unstable; urgency=low + + * make ip-(up|down) executable (closes: #11449, #16113) + * put /etc/pam.d/ppp in ppp-pam (closes: #16111) + * add console messages to /etc/init.d/ppp (closes: #16629) + * add IPPARAM to ip-(up|down) (closes: #16695) + * improve comments in ip-(up|down) (closes: #17126) + + -- Philip Hands Tue, 10 Feb 1998 23:47:37 +0000 + +ppp (2.3.3-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Fri, 6 Feb 1998 12:13:33 +0000 + +ppp (2.3.2-3) unstable; urgency=low + + * automate the version dependency in ppp-pam + + -- Philip Hands Thu, 18 Dec 1997 17:14:34 +0000 + +ppp (2.3.2-2) unstable; urgency=low + + * add creation of ppp-pam .deb + * ppp-pam: use libpam0g and add /etc/pam.d/ppp + * add use of run-parts ip-{up,down}.d + + -- Philip Hands Sun, 14 Dec 1997 21:12:58 +0000 + +ppp (2.3.2-1) unstable; urgency=low + + * New upstream release + * get rid of dependence on libpam (closes: #15665) + * applied ms-chap patch from Kent Robotti + + -- Philip Hands Sat, 6 Dec 1997 19:28:42 +0000 + +ppp (2.3.1-6) unstable; urgency=low + + * Fix feeble typo in postinst + + -- Philip Hands Thu, 6 Nov 1997 00:23:09 +0000 + +ppp (2.3.1-5) unstable; urgency=low + + * fix /tmp/$$ security hole in postinst (#11781) + * stop postinst trying to chmod non-existent files (#14519,#14279) + * fix permissions on /usr/include/net/slcompress.h (#14557) + + -- Philip Hands Wed, 5 Nov 1997 12:38:48 +0000 + +ppp (2.3.1-4) unstable; urgency=low + + * unpatch pppstats so that it gets compiled OK with libc6 + + -- Philip Hands Wed, 5 Nov 1997 11:45:10 +0000 + +ppp (2.3.1-3) unstable; urgency=medium + + * re-enable setting of serial port speed (disabled in error) + * fix permissions on /etc/chatscripts (#14166) + * tidy up poff (#14209) + + -- Philip Hands Wed, 29 Oct 1997 00:35:32 +0000 + +ppp (2.3.1-2) unstable; urgency=medium + + * Set Maintainer: to me. + * Add IPX support, and disable it in options + + -- Philip Hands Fri, 25 Jul 1997 03:24:04 +0100 + +ppp (2.3.1-1) experimental; urgency=low + + * Non-Maintainer release: I think it is necessary to get this stuff working soon + and the experimental version still has my maintainer name. + * Updated to "non-beta" release which was advertised as tested (Joke! Joke!). + * Included patch to fix the ppp kernel sourcecode so that it compiles. + * Warning: TCP stalls in a regular fashion. f.e. on an SMTP connection. + If someone wants to fix things. Beats me. + * demand dialing requires kernel ppp sourcecode update or newer kernel (than + available on July 23,1997) + * Shadow password expiration disabled due to + use of non-exported function of the shadow library. + * pppstats does not compile due to incompatibility with kernel 2.0.30 + kernel symbols. + * pppd source patches so that chat-scripts do not stall. + * STATIC IP patches applied + * poff: Do not rely on pid file to kill pppd + * plog: Allow options to be passed on to "tail". + + -- Christoph Lameter Tue, 22 Jul 1997 23:19:23 -0700 + +ppp (2.3b3-3) experimental; urgency=low + + * All changes done to the regular ppp package revisions applied to the + experimental one. + * PAM support + * High baudrate Support + * Shadow support + + -- Christoph Lameter Sat, 5 Apr 1997 21:30:55 -0800 + +ppp (2.3b3-2) experimental; urgency=low + + * ppp compiled with newest debmake and thus suidmanager support + * pppstats does not compile not included + * Note: ppp 2.3b3 is experimental and limited. Will stay in experimental. + Only an upstream release fixing the gaps can make ppp 2.3 advance into + unstable. Bug reports wanted. + * Remove /etc/ppp.chatscript and /etc/ppp.options_out + instead use /etc/ppp/peers/provider and /etc/charscripts/provider + according to new upstream ppp security scheme (about which I am kind of + puzzled right now). + * Modified scripts / init.d according to new security scheme. + * postinst converts from old setup scheme and makes dialup scripts + + options file more secure. + * Permissions on binary were screwed up in -1 release. + + -- Christoph Lameter Thu, 21 Nov 1996 21:32:35 -0800 + +ppp (2.3b3-1) experimental; urgency=low + + * pppd made only executable by group dip + * Upstream upgrade to BETA + + -- Christoph Lameter Fri, 8 Nov 1996 15:13:45 -0800 + +ppp (2.2.0f-17) unstable; urgency=low + + * pppd is not stopped and started on upgrade (only happened with ppp on bootup enabled) + + -- Christoph Lameter Tue, 5 Nov 1996 06:56:35 -0800 + +ppp (2.2.0f-16) unstable; urgency=low + + * chatscript aborts on no dialtone + * stripped pppstats + + -- Christoph Lameter Thu, 24 Oct 1996 10:11:07 -0700 + +ppp (2.2.0f-15) unstable; urgency=low + + * debmake 0.91 applied to ppp + * debmake takes over the /etc/init.d and the postrm stuff. + + -- Christoph Lameter Mon, 21 Oct 1996 18:58:19 -0800 + +ppp (2.2.0f-14) unstable; urgency=low + + * debmake problem with install scripts + + -- Christoph Lameter Thu, 17 Oct 1996 07:20:20 -0800 + +ppp (2.2.0f-13) unstable; urgency=low + + * Added \q after the password in ppp.chatscript + + -- Christoph Lameter Mon, 14 Oct 1996 17:59:45 -0800 + +ppp (2.2.0f-12) unstable; urgency=low + + * Added persist option to default configuration file ppp.options_out + to have pppd keep on dialing until connection is established. + * Added restarting of logging daemons to cron.daily script + + -- Christoph Lameter Sat, 12 Oct 1996 09:00:00 -0800 + +ppp (2.2.0f-11) unstable; urgency=medium + + * Postinst also customizes /etc/ppp/options.ttyXX + * Changed the bad example in /etc/ppp/options.ttyXX. + * Added log rotation + * Fixed persist option in pppd so that it waits 10 seconds before + reconnecting. Otherwise the reconnect attempt fails. + * Do not abort pppd on script failure with the persist option on. + * Added manpages for pon,poff,plog + + -- Christoph Lameter Mon, 7 Oct 1996 09:00:00 -0800 + +ppp (2.2.0f-10) unstable; urgency=medium + + * Tested the automatic-ppp-on-boot function + * Fixed bug in /etc/init.d/ppp (was not compatible with pon) + + -- Christoph Lameter Sun, 6 Oct 1996 09:00:00 -0800 + +ppp (2.2.0f-9) unstable; urgency=medium + + * Convenience scripts ( pon, poff, plog ) to control/monitor link + * Links were not activated in the last change + * Syslog output redirected to a separate file in /var/log/ppp.log + * Updated Documentation in README.debian + * Corrected changelog + * Finally got through to using ppp/mgetty on my home system and + found some inconveniences in the config files. + * moved /etc/ppp/chatscript to /etc/ppp.chatscript since /etc/ppp is not + to be accessed from userspace. + * New configuration file /etc/ppp.options_out for outbound options to + be able to handle mixed (inbound/outbound) usage. + I am not yet satisfied with the mixed setups such as I have at home. + + -- Christoph Lameter Sat, 5 Oct 1996 09:00:00 -0800 + +ppp (2.2.0f-8) unstable; urgency=low + + * links for /etc/init.d/ppp installed again + * pppd will come up on startup if /etc/ppp/ppp_on_boot exists + + -- Christoph Lameter Wed, 2 Oct 1996 09:00:00 -0800 + +ppp (2.2.0f-7) unstable; urgency=low + + * fixed a couple of bugs in postinst script. + * pppd now stripped + * etc/rc.d links for /etc/init.d/ppp not installed anymore + * /etc/init.d revised + + -- Christoph Lameter Wed, 2 Oct 1996 09:00:00 -0800 + +ppp (2.2.0f-6) unstable; urgency=low + + * pppstats program was not included + + -- Christoph Lameter Sun, 29 Sep 1996 09:00:00 -0800 + +ppp (2.2.0f-5) unstable; urgency=low + + * Updated standards + * Updated Documentation in /etc/ppp/options + + -- Christoph Lameter Fri, 27 Sep 1996 09:00:00 -0800 + +ppp (2.2.0f-4) unstable; urgency=low + + * Added example file for options.ttyXX + * Renamed to ppp to merge isp-ppp with ppp + * New maintainer for ppp package + * pppd runs setsuid + + -- Christoph Lameter Wed, 25 Sep 1996 09:00:00 -0800 + +isp-ppp (2.2.0f-2) unstable;urgency=low + + * Added "Conflicts: ppp" to control +isp-ppp (2.2.0f-1) unstable;urgency=low + + * Added pap-secrets file for mgetty integration + * Reworked control + + -- Christoph Lameter Fri, 6 Sep 1996 09:00:00 -0800 + +isp-ppp (2.2.0f-0) unstable;urgency=low + + * Added patch to fix trumpet winsock problems + * Update to standards 2.1.0.0 + * Named package isp-ppp to be able to release alternate pppd into debian + distribution + * pppd installed suid for regular dialup people who want to activate pppd + + -- Christoph Lameter Fri, 6 Sep 1996 09:00:00 -0800 + +Thu Jul 25 22:47:37 PDT 1996 Christoph Lameter + + * Added remote DNS and WINS configuration ability to pppd + ( See comments in /etc/ppp/options) + * Build on top of ppp of Alvar + +Sun Jul 7 17:01:22 BST 1996 Alvar Bray + * Setup to build/install pppstats utility. + * Modified to build on any archticture, Thanks due to + Yambo . + * Version 2.2.0f-3 released. + +Sun May 26 14:28:39 BST 1996 Alvar Bray + * Applied patches from Marek Michalkiewicz + to suport shadow + passwords. + * Added Architecture and priority fields to debian.control. + * Version 2.2.0f-2 released. + +Wed May 1 19:54:15 BST 1996 Alvar Bray + * Updated to upstream version 2.2.0f. + * Changed version to 2.2.0f-1. + +Sat Mar 23 09:39:49 GMT 1996 Alvar Bray + * Modified runlevel change start/kill links. + * Removed symlink /usr/include/net/route.h + * Revision 3 released. + +Tue Jan 30 23:14:51 GMT 1996 Alvar Bray + * used a documemented version of the options file from + source by Jim Knoble + * Removed /etc/ppp/ppp-connect script + * Added /etc/ppp/chatscript called by the options file + * Added empty ip-up and ip-down scripts. + +Sun Jan 28 22:34:09 GMT 1996 Alvar Bray + * Upgraded to version ppp-2.2.0e using CVS + * Renamed package ppp-2.2.0e + +Wed Nov 22 15:31:15 GMT 1995 Alvar Bray + * Rebuilt using elf format - added libc5 dependency. + * Made purge remove all ppp files (bug #1827) + * Added missing kernel header stubs to /usr/include/net + (bug #1795) + * Removed reference to /etc/init.d/functions in + /etc/init.d/ppp (bug #1725) + * Added dependency on netbase (bug #1443) + * New README (bug#1059) + * New source using ppp-2.2.0.c from + sunsite.unc.edu:/pub/Linux/system/Network/serial + +Ian Murdock + * added Debian GNU/Linux package maintenance system files + * changed Makefile variables in chat and pppd directories + + diff -Nru ppp-2.4.1.uus/debian/compat ppp-2.4.2+20040202/debian/compat --- ppp-2.4.1.uus/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/compat 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1 @@ +4 diff -Nru ppp-2.4.1.uus/debian/conffiles ppp-2.4.2+20040202/debian/conffiles --- ppp-2.4.1.uus/debian/conffiles 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/conffiles 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -/etc/pam.d/ppp -/etc/init.d/ppp -/etc/ppp/options -/etc/ppp/no_ppp_on_boot -/etc/ppp/ip-up -/etc/ppp/ip-down diff -Nru ppp-2.4.1.uus/debian/control ppp-2.4.2+20040202/debian/control --- ppp-2.4.1.uus/debian/control 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/control 2006-04-25 12:08:46.000000000 +0000 @@ -1,39 +1,20 @@ Source: ppp Section: base Priority: optional -Maintainer: Michael Beattie -Build-Depends: libpam0g-dev, libpcap-dev, debhelper (>> 3.0.0) -Standards-Version: 3.5.6.0 +Maintainer: Marco d'Itri +Build-Depends: debhelper (>> 4.1.17) +Standards-Version: 3.6.1 Package: ppp Section: base Architecture: any -Depends: ${shlibs:Depends}, libpam-modules, netbase, sysvinit (>= 2.75-4), procps, makedev (>= 2.3.1-56) -Conflicts: ppp-pam, ppp-udeb +Depends: ${shlibs:Depends}, netbase, procps, makedev (>= 2.3.1-56) +Conflicts: ppp-pam, ppp-udeb, pppdcapiplugin (<= 1:3.2pre3-4) Replaces: ppp-pam, ppp-udeb -Suggests: debconf -Description: Point-to-Point Protocol (PPP) daemon. +Description: Point-to-Point Protocol (PPP) daemon The Point-to-Point Protocol (PPP) provides a standard way to transmit datagrams over a serial link, as well as a standard way for the machines at either end of the link (the "peers") to negotiate various optional characteristics of the link. Using PPP, a serial link can be used to transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections between the peers. - . - This package contains pppd with PAM support built-in, so `ppp-pam' - package is obsolete. - -Package: ppp-udeb -Section: debian-installer -Architecture: any -Depends: ${shlibs:Depends} -Description: Point-to-Point Protocol (PPP) daemon. - The Point-to-Point Protocol (PPP) provides a standard way to transmit - datagrams over a serial link, as well as a standard way for the machines - at either end of the link (the "peers") to negotiate various optional - characteristics of the link. Using PPP, a serial link can be used to - transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections - between the peers. - . - ppp-udeb is a minimal ppp package used by the debian-installer. - diff -Nru ppp-2.4.1.uus/debian/copyright ppp-2.4.2+20040202/debian/copyright --- ppp-2.4.1.uus/debian/copyright 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/copyright 2006-04-25 12:08:46.000000000 +0000 @@ -1,16 +1,14 @@ This is the Debian GNU/Linux prepackaged version of pppd. This package was previously maintained by Ian Murdock , -Alvar Bray , Christoph Lameter , and -Philip Hands . +Alvar Bray , Christoph Lameter , +Philip Hands , Michael Beattie and +Russell Coker . -Today it is maintained by Michael Beattie . +It is currently maintained by Marco d'Itri . Original sources were obtained from: - ftp://ftp.linuxcare.com.au/pub/ppp/ - -Previous versions obtained from: - ftp://cs.anu.edu.au/pub/software/ppp/ + rsync://ppp.samba.org/ftp/unpacked/ppp/ The options file was originally obtained from: ftp://sunsite.unc.edu/pub/Linux/system/Network/serial/pppopt.tgz @@ -162,6 +160,10 @@ The pppdump program is Copyright (C) 1999 Paul Mackerras. All rights reserved. Licensed under the GNU GPL version 2 or later. +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL'. + + pppdump/zlib.c is: Copyright (C) 1995-1996 Jean-loup Gailly and Mark Adler @@ -224,11 +226,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff -Nru ppp-2.4.1.uus/debian/dirs ppp-2.4.2+20040202/debian/dirs --- ppp-2.4.1.uus/debian/dirs 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -etc/ppp/peers -etc/chatscripts -etc/ppp/ip-up.d -etc/ppp/ip-down.d -etc/pam.d -usr/bin -usr/share/man/man1 -usr/share/ppp -usr/include/net diff -Nru ppp-2.4.1.uus/debian/init ppp-2.4.2+20040202/debian/init --- ppp-2.4.1.uus/debian/init 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/init 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/ppp: start or stop PPP link. -# -# If you want PPP started on boot time (most dialup systems won't need it) -# rename the /etc/ppp/no_ppp_on_boot file to /etc/ppp/ppp_on_boot, and -# follow the instructions in the comments in that file. - -test -x /usr/sbin/pppd -a -f /etc/ppp/ppp_on_boot || exit 0 -if [ -x /etc/ppp/ppp_on_boot ]; then RUNFILE=1; fi - -case "$1" in - start) - echo -n "Starting up PPP link: pppd" - if [ "$RUNFILE" = "1" ]; then - /etc/ppp/ppp_on_boot - else - pppd call provider - fi - echo "." - ;; - stop) - echo -n "Shutting down PPP link: pppd" - if [ "$RUNFILE" = "1" ]; then - poff - else - poff provider - fi - echo "." - ;; - restart|force-reload) - echo -n "Restarting PPP link: pppd" - if [ "$RUNFILE" = "1" ]; then - poff - sleep 5 - /etc/ppp/ppp_on_boot - else - poff provider - sleep 5 - pppd call provider - fi - echo "." - ;; - *) - echo "Usage: /etc/init.d/ppp {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff -Nru ppp-2.4.1.uus/debian/ip-down ppp-2.4.2+20040202/debian/ip-down --- ppp-2.4.1.uus/debian/ip-down 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ip-down 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -#!/bin/sh -# -# $Id: ip-down,v 1.2 1998/02/10 21:21:55 phil Exp $ -# -# This script is run by the pppd _after_ the link is brought down. -# It uses run-parts to run scripts in /etc/ppp/ip-down.d, so to delete -# routes, unset IP addresses etc. you should create script(s) there. -# -# Be aware that other packages may include /etc/ppp/ip-down.d scripts (named -# after that package), so choose local script names with that in mind. -# -# This script is called with the following arguments: -# Arg Name Example -# $1 Interface name ppp0 -# $2 The tty ttyS1 -# $3 The link speed 38400 -# $4 Local IP number 12.34.56.78 -# $5 Peer IP number 12.34.56.99 -# $6 Optional ``ipparam'' value foo - -# The environment is cleared before executing this script -# so the path must be reset -PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin -export PATH -# These variables are for the use of the scripts run by run-parts -PPP_IFACE="$1" -PPP_TTY="$2" -PPP_SPEED="$3" -PPP_LOCAL="$4" -PPP_REMOTE="$5" -PPP_IPPARAM="$6" -export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM - -# as an additional convenience, $PPP_TTYNAME is set to the tty name, -# stripped of /dev/ (if present) for easier matching. -PPP_TTYNAME=`/usr/bin/basename "$2"` -export PPP_TTYNAME - -# Main Script starts here - -run-parts /etc/ppp/ip-down.d - -# last line diff -Nru ppp-2.4.1.uus/debian/ip-up ppp-2.4.2+20040202/debian/ip-up --- ppp-2.4.1.uus/debian/ip-up 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ip-up 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -#!/bin/sh -# -# $Id: ip-up,v 1.2 1998/02/10 21:25:34 phil Exp $ -# -# This script is run by the pppd after the link is established. -# It uses run-parts to run scripts in /etc/ppp/ip-up.d, so to add routes, -# set IP address, run the mailq etc. you should create script(s) there. -# -# Be aware that other packages may include /etc/ppp/ip-up.d scripts (named -# after that package), so choose local script names with that in mind. -# -# This script is called with the following arguments: -# Arg Name Example -# $1 Interface name ppp0 -# $2 The tty ttyS1 -# $3 The link speed 38400 -# $4 Local IP number 12.34.56.78 -# $5 Peer IP number 12.34.56.99 -# $6 Optional ``ipparam'' value foo - -# The environment is cleared before executing this script -# so the path must be reset -PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin -export PATH -# These variables are for the use of the scripts run by run-parts -PPP_IFACE="$1" -PPP_TTY="$2" -PPP_SPEED="$3" -PPP_LOCAL="$4" -PPP_REMOTE="$5" -PPP_IPPARAM="$6" -export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM - - -# as an additional convenience, $PPP_TTYNAME is set to the tty name, -# stripped of /dev/ (if present) for easier matching. -PPP_TTYNAME=`/usr/bin/basename "$2"` -export PPP_TTYNAME - -# Main Script starts here - -run-parts /etc/ppp/ip-up.d - -# last line diff -Nru ppp-2.4.1.uus/debian/kernel.fix-2.0.30-2 ppp-2.4.2+20040202/debian/kernel.fix-2.0.30-2 --- ppp-2.4.1.uus/debian/kernel.fix-2.0.30-2 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/kernel.fix-2.0.30-2 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ - -From lma@varesearch.com Wed Jul 23 20:40:33 1997 -Date: Wed, 23 Jul 1997 14:56:14 -0700 -From: "Larry M. Augustin" -To: clameter@miriam.fuller.edu -Cc: linux-kernel@vger.rutgers.edu, davem@jenolan.rutgers.edu, - longyear@netcom.com, callahan@maths.ox.ac.uk -Subject: Re: ppp 2.3.1 patch for Linux 2.1.4x+ - - -This reminds me, I had to modify ppp.c from ppp-2.3.1 to make it work -with kernel 2.0.31-pre2. Here is the patch to the ppp.c distributed -with 2.3.1. I'm not sure if any of this should be in 2.0.31 or not. - -Larry - - ---- ppp.c Sun Jul 13 20:50:50 1997 -+++ /usr/src/linux/drivers/net/ppp.c Mon Jul 21 10:59:54 1997 -@@ -455,7 +455,7 @@ - dev->rebuild_header = ppp_dev_rebuild; - #endif - -- dev->hard_header_len = PPP_HARD_HDR_LEN; -+ dev->hard_header_len = PPP_HDRLEN; - - /* device INFO */ - dev->mtu = PPP_MTU; -@@ -2196,6 +2196,7 @@ - struct ppp *ppp = tty2ppp (tty); - __u8 *new_data; - int proto; -+ int error; - - /* - * Verify the pointers. -@@ -2231,7 +2232,8 @@ - /* - * Retrieve the user's buffer - */ -- if (copy_from_user (new_data, data, count)) { -+ COPY_FROM_USER (error, new_data, data, count); -+ if (error != 0) { - kfree (new_data); - return -EFAULT; - } diff -Nru ppp-2.4.1.uus/debian/modules ppp-2.4.2+20040202/debian/modules --- ppp-2.4.1.uus/debian/modules 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/modules 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -alias /dev/ppp ppp_generic -alias char-major-108 ppp_generic -alias tty-ldisc-3 ppp_async -alias tty-ldisc-14 ppp_synctty -alias ppp-compress-21 bsd_comp -alias ppp-compress-24 ppp_deflate -alias ppp-compress-26 ppp_deflate diff -Nru ppp-2.4.1.uus/debian/no_ppp_on_boot ppp-2.4.2+20040202/debian/no_ppp_on_boot --- ppp-2.4.1.uus/debian/no_ppp_on_boot 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/no_ppp_on_boot 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -###!/bin/sh -# -# Rename this file to ppp_on_boot and pppd will be fired up as -# soon as the system comes up, connecting to `provider'. -# -# If you also make this file executable, and replace the first line -# with just "#!/bin/sh", the commands below will be executed instead. -# - -# The location of the ppp daemon itself (shouldn't need to be changed) -PPPD=/usr/sbin/pppd - -# The default provider to connect to -$PPPD call provider - -# Additional connections, which would just use settings from -# /etc/ppp/options. -#$PPPD ttyS0 -#$PPPD ttyS1 -#$PPPD ttyS2 -#$PPPD ttyS3 diff -Nru ppp-2.4.1.uus/debian/options ppp-2.4.2+20040202/debian/options --- ppp-2.4.1.uus/debian/options 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/options 1970-01-01 00:00:00.000000000 +0000 @@ -1,348 +0,0 @@ -# /etc/ppp/options -# -# Originally created by Jim Knoble -# Modified for Debian by alvar Bray -# Modified for PPP Server setup by Christoph Lameter -# -# To quickly see what options are active in this file, use this command: -# egrep -v '#|^ *$' /etc/ppp/options - -# Specify which DNS Servers the incoming Win95 or WinNT Connection should use -# Two Servers can be remotely configured -# ms-dns 192.168.1.1 -# ms-dns 192.168.1.2 - -# Specify which WINS Servers the incoming connection Win95 or WinNT should use -# ms-wins 192.168.1.50 -# ms-wins 192.168.1.51 - -# Run the executable or shell command specified after pppd has -# terminated the link. This script could, for example, issue commands -# to the modem to cause it to hang up if hardware modem control signals -# were not available. -#disconnect "chat -- \d+++\d\c OK ath0 OK" - -# async character map -- 32-bit hex; each bit is a character -# that needs to be escaped for pppd to receive it. 0x00000001 -# represents '\x01', and 0x80000000 represents '\x1f'. -asyncmap 0 - -# Require the peer to authenticate itself before allowing network -# packets to be sent or received. -# Please do not disable this setting. It is expected to be standard in -# future releases of pppd. Use the call option (see manpage) to disable -# authentication for specific peers. -auth - -# Use hardware flow control (i.e. RTS/CTS) to control the flow of data -# on the serial port. -crtscts - -# Use software flow control (i.e. XON/XOFF) to control the flow of data -# on the serial port. -#xonxoff - -# Specifies that certain characters should be escaped on transmission -# (regardless of whether the peer requests them to be escaped with its -# async control character map). The characters to be escaped are -# specified as a list of hex numbers separated by commas. Note that -# almost any character can be specified for the escape option, unlike -# the asyncmap option which only allows control characters to be -# specified. The characters which may not be escaped are those with hex -# values 0x20 - 0x3f or 0x5e. -#escape 11,13,ff - -# Don't use the modem control lines. -#local - -# Specifies that pppd should use a UUCP-style lock on the serial device -# to ensure exclusive access to the device. -lock - -# Don't show the passwords when logging the contents of PAP packets. -# This is the default. -hide-password - -# When logging the contents of PAP packets, this option causes pppd to -# show the password string in the log message. -#show-password - -# Use the modem control lines. On Ultrix, this option implies hardware -# flow control, as for the crtscts option. (This option is not fully -# implemented.) -modem - -# Set the MRU [Maximum Receive Unit] value to for negotiation. pppd -# will ask the peer to send packets of no more than bytes. The -# minimum MRU value is 128. The default MRU value is 1500. A value of -# 296 is recommended for slow links (40 bytes for TCP/IP header + 256 -# bytes of data). -#mru 542 - -# Set the interface netmask to , a 32 bit netmask in "decimal dot" -# notation (e.g. 255.255.255.0). -#netmask 255.255.255.0 - -# Disables the default behaviour when no local IP address is specified, -# which is to determine (if possible) the local IP address from the -# hostname. With this option, the peer will have to supply the local IP -# address during IPCP negotiation (unless it specified explicitly on the -# command line or in an options file). -#noipdefault - -# Enables the "passive" option in the LCP. With this option, pppd will -# attempt to initiate a connection; if no reply is received from the -# peer, pppd will then just wait passively for a valid LCP packet from -# the peer (instead of exiting, as it does without this option). -#passive - -# With this option, pppd will not transmit LCP packets to initiate a -# connection until a valid LCP packet is received from the peer (as for -# the "passive" option with old versions of pppd). -#silent - -# Don't request or allow negotiation of any options for LCP and IPCP -# (use default values). -#-all - -# Disable Address/Control compression negotiation (use default, i.e. -# address/control field disabled). -#-ac - -# Disable asyncmap negotiation (use the default asyncmap, i.e. escape -# all control characters). -#-am - -# Don't fork to become a background process (otherwise pppd will do so -# if a serial device is specified). -#-detach - -# Disable IP address negotiation (with this option, the remote IP -# address must be specified with an option on the command line or in -# an options file). -#-ip - -# Disable IPCP negotiation and IP communication. This option should -# only be required if the peer is buggy and gets confused by requests -# from pppd for IPCP negotiation. -#noip - -# Disable magic number negotiation. With this option, pppd cannot -# detect a looped-back line. -#-mn - -# Disable MRU [Maximum Receive Unit] negotiation (use default, i.e. -# 1500). -#-mru - -# Disable protocol field compression negotiation (use default, i.e. -# protocol field compression disabled). -#-pc - -# Require the peer to authenticate itself using PAP. -#+pap - -# Don't agree to authenticate using PAP. -#-pap - -# Require the peer to authenticate itself using CHAP [Cryptographic -# Handshake Authentication Protocol] authentication. -#+chap - -# Don't agree to authenticate using CHAP. -#-chap - -# Disable negotiation of Van Jacobson style IP header compression (use -# default, i.e. no compression). -#-vj - -# Increase debugging level (same as -d). If this option is given, pppd -# will log the contents of all control packets sent or received in a -# readable form. The packets are logged through syslog with facility -# daemon and level debug. This information can be directed to a file by -# setting up /etc/syslog.conf appropriately (see syslog.conf(5)). (If -# pppd is compiled with extra debugging enabled, it will log messages -# using facility local2 instead of daemon). -#debug - -# Append the domain name to the local host name for authentication -# purposes. For example, if gethostname() returns the name porsche, -# but the fully qualified domain name is porsche.Quotron.COM, you would -# use the domain option to set the domain name to Quotron.COM. -#domain - -# Enable debugging code in the kernel-level PPP driver. The argument n -# is a number which is the sum of the following values: 1 to enable -# general debug messages, 2 to request that the contents of received -# packets be printed, and 4 to request that the contents of transmitted -# packets be printed. -#kdebug n - -# Set the MTU [Maximum Transmit Unit] value to . Unless the peer -# requests a smaller value via MRU negotiation, pppd will request that -# the kernel networking code send data packets of no more than n bytes -# through the PPP network interface. -#mtu - -# Set the name of the local system for authentication purposes to . -# This is a privileged option. With this option, pppd will use lines in the -# secrets files which have as the second field when looking for a -# secret to use in authenticating the peer. In addition, unless overridden -# with the user option, will be used as the name to send to the peer -# when authenticating the local system to the peer. (Note that pppd does -# not append the domain name to .) -#name - -# Enforce the use of the hostname as the name of the local system for -# authentication purposes (overrides the name option). -#usehostname - -# Set the assumed name of the remote system for authentication purposes -# to . -#remotename - -# Add an entry to this system's ARP [Address Resolution Protocol] -# table with the IP address of the peer and the Ethernet address of this -# system. -proxyarp - -# Use the system password database for authenticating the peer using -# PAP. Note: mgetty already provides this option. If this is specified -# then dialin from users using a script under Linux to fire up ppp wont work. -# login - -# If this option is given, pppd will send an LCP echo-request frame to the -# peer every n seconds. Normally the peer should respond to the echo-request -# by sending an echo-reply. This option can be used with the -# lcp-echo-failure option to detect that the peer is no longer connected. -lcp-echo-interval 30 - -# If this option is given, pppd will presume the peer to be dead if n -# LCP echo-requests are sent without receiving a valid LCP echo-reply. -# If this happens, pppd will terminate the connection. Use of this -# option requires a non-zero value for the lcp-echo-interval parameter. -# This option can be used to enable pppd to terminate after the physical -# connection has been broken (e.g., the modem has hung up) in -# situations where no hardware modem control lines are available. -lcp-echo-failure 4 - -# Set the LCP restart interval (retransmission timeout) to seconds -# (default 3). -#lcp-restart - -# Set the maximum number of LCP terminate-request transmissions to -# (default 3). -#lcp-max-terminate - -# Set the maximum number of LCP configure-request transmissions to -# (default 10). -#lcp-max-configure - -# Set the maximum number of LCP configure-NAKs returned before starting -# to send configure-Rejects instead to (default 10). -#lcp-max-failure - -# Set the IPCP restart interval (retransmission timeout) to -# seconds (default 3). -#ipcp-restart - -# Set the maximum number of IPCP terminate-request transmissions to -# (default 3). -#ipcp-max-terminate - -# Set the maximum number of IPCP configure-request transmissions to -# (default 10). -#ipcp-max-configure - -# Set the maximum number of IPCP configure-NAKs returned before starting -# to send configure-Rejects instead to (default 10). -#ipcp-max-failure - -# Set the PAP restart interval (retransmission timeout) to seconds -# (default 3). -#pap-restart - -# Set the maximum number of PAP authenticate-request transmissions to -# (default 10). -#pap-max-authreq - -# Set the maximum time that pppd will wait for the peer to authenticate -# itself with PAP to seconds (0 means no limit). -#pap-timeout - -# Set the CHAP restart interval (retransmission timeout for -# challenges) to seconds (default 3). -#chap-restart - -# Set the maximum number of CHAP challenge transmissions to -# (default 10). -#chap-max-challenge - -# If this option is given, pppd will rechallenge the peer every -# seconds. -#chap-interval - -# With this option, pppd will accept the peer's idea of our local IP -# address, even if the local IP address was specified in an option. -#ipcp-accept-local - -# With this option, pppd will accept the peer's idea of its (remote) IP -# address, even if the remote IP address was specified in an option. -#ipcp-accept-remote - -# Disable the IPXCP and IPX protocols. -# To let pppd pass IPX packets comment this out --- you'll probably also -# want to install ipxripd, and have the Internal IPX Network option enabled -# in your kernel. /usr/doc/HOWTO/IPX-HOWTO.gz contains more info. -noipx - -# Exit once a connection has been made and terminated. This is the default, -# unless the `persist' or `demand' option has been specified. -#nopersist - -# Do not exit after a connection is terminated; instead try to reopen -# the connection. -#persist - -# Terminate after n consecutive failed connection attempts. -# A value of 0 means no limit. The default value is 10. -#maxfail - -# Initiate the link only on demand, i.e. when data traffic is present. -# With this option, the remote IP address must be specified by the user on -# the command line or in an options file. Pppd will initially configure -# the interface and enable it for IP traffic without connecting to the peer. -# When traffic is available, pppd will connect to the peer and perform -# negotiation, authentication, etc. When this is completed, pppd will -# commence passing data packets (i.e., IP packets) across the link. -#demand - -# Specifies that pppd should disconnect if the link is idle for seconds. -# The link is idle when no data packets (i.e. IP packets) are being sent or -# received. Note: it is not advisable to use this option with the persist -# option without the demand option. If the active-filter option is given, -# data packets which are rejected by the specified activity filter also -# count as the link being idle. -#idle - -# Specifies how many seconds to wait before re-initiating the link after -# it terminates. This option only has any effect if the persist or demand -# option is used. The holdoff period is not applied if the link was -# terminated because it was idle. -#holdoff - -# Wait for up n milliseconds after the connect script finishes for a valid -# PPP packet from the peer. At the end of this time, or when a valid PPP -# packet is received from the peer, pppd will commence negotiation by -# sending its first LCP packet. The default value is 1000 (1 second). -# This wait period only applies if the connect or pty option is used. -#connect-delay - -# Packet filtering: for more information, see pppd(8) -# Any packets matching the filter expression will be interpreted as link -# activity, and will cause a "demand" connection to be activated, and reset -# the idle connection timer. (idle option) -# The filter expression is akin to that of tcpdump(1) -#active-filter - -# ------ diff -Nru ppp-2.4.1.uus/debian/options.ttyXX ppp-2.4.2+20040202/debian/options.ttyXX --- ppp-2.4.1.uus/debian/options.ttyXX 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/options.ttyXX 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# If you need to set up multiple serial lines differently, then copy this -# file to options. for each with a modem on it. -# -# Example: -# options.ttyS1 for the second serial port (a.k.a. COM2) -# -# Edit the following line so that the first IP address mentioned is the is -# the IP address or name of your host, while the second is the IP address -# or name of the remote machine. - -hostname:remotepeername -# 192.168.0.1:192.168.0.2 - -# You may also put additional settings in each file, just like in the -# general options file. For example: -# -# noauth -# debug -# defaultroute -# mtu 296 -# -# Read pppd(8) for more information. diff -Nru ppp-2.4.1.uus/debian/pap-secrets ppp-2.4.2+20040202/debian/pap-secrets --- ppp-2.4.1.uus/debian/pap-secrets 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/pap-secrets 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -# -# /etc/ppp/pap-secrets -# -# This is a pap-secrets file to be used with the AUTO_PPP function of -# mgetty. mgetty-0.99 is preconfigured to startup pppd with the login option -# which will cause pppd to consult /etc/passwd (and /etc/shadow in turn) -# after a user has passed this file. Don't be disturbed therfore by the fact -# that this file defines logins with any password for users. /etc/passwd -# (again, /etc/shadow, too) will catch passwd mismatches. -# -# This file should block ALL users that should not be able to do AUTO_PPP. -# AUTO_PPP bypasses the usual login program so its necessary to list all -# system userids with regular passwords here. -# -# ATTENTION: The definitions here can allow users to login without a -# password if you don't use the login option of pppd! The mgetty Debian -# package already provides this option; make sure you don't change that. - -# INBOUND connections - -# Every regular user can use PPP and has to use passwords from /etc/passwd -* hostname "" * - -# UserIDs that cannot use PPP at all. Check your /etc/passwd and add any -# other accounts that should not be able to use pppd! -guest hostname "*" - -master hostname "*" - -root hostname "*" - -support hostname "*" - -stats hostname "*" - - -# OUTBOUND connections - -# Here you should add your userid password to connect to your providers via -# PAP. The * means that the password is to be used for ANY host you connect -# to. Thus you do not have to worry about the foreign machine name. Just -# replace password with your password. -# If you have different providers with different passwords then you better -# remove the following line. - -hostname * password diff -Nru ppp-2.4.1.uus/debian/patches/001_udeb.diff ppp-2.4.2+20040202/debian/patches/001_udeb.diff --- ppp-2.4.1.uus/debian/patches/001_udeb.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/001_udeb.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ ---- ppp-2.4.0b4.orig/chat/Makefile.linux -+++ ppp-2.4.0b4/chat/Makefile.linux -@@ -6,7 +6,7 @@ - CDEF4= -DFNDELAY=O_NDELAY # Old name value - CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) - --CFLAGS= -O2 -g -pipe $(CDEFS) -+CFLAGS= $(UDEB_CFLAGS) -O2 -g -pipe $(CDEFS) - - INSTALL= install - ---- ppp-2.4.0b4.orig/pppd/Makefile.linux -+++ ppp-2.4.0b4/pppd/Makefile.linux -@@ -58,7 +58,7 @@ - - COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP - --CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) -+CFLAGS= $(UDEB_CFLAGS) $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) - - ifdef CHAPMS - CFLAGS += -DCHAPMS=1 diff -Nru ppp-2.4.1.uus/debian/patches/002_chat.c.diff ppp-2.4.2+20040202/debian/patches/002_chat.c.diff --- ppp-2.4.1.uus/debian/patches/002_chat.c.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/002_chat.c.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- ppp-2.4.0b4.orig/chat/chat.c -+++ ppp-2.4.0b4/chat/chat.c -@@ -203,7 +203,7 @@ - int clear_abort_next = 0; - - char *report_string[MAX_REPORTS] ; --char report_buffer[50] ; -+char report_buffer[256] ; - int n_reports = 0, report_next = 0, report_gathering = 0 ; - int clear_report_next = 0; - diff -Nru ppp-2.4.1.uus/debian/patches/003_cbcp.diff ppp-2.4.2+20040202/debian/patches/003_cbcp.diff --- ppp-2.4.1.uus/debian/patches/003_cbcp.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/003_cbcp.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ ---- ppp-2.4.0b4.orig/pppd/Makefile.linux -+++ ppp-2.4.0b4/pppd/Makefile.linux -@@ -15,7 +15,7 @@ - MANPAGES = pppd.8 - PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o \ - auth.o options.o demand.o utils.o sys-linux.o ipxcp.o multilink.o \ -- tdb.o tty.o -+ tdb.o tty.o cbcp.o - - all: pppd - -@@ -56,7 +56,7 @@ - - INCLUDE_DIRS= -I../include - --COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP -+COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP -DCBCP_SUPPORT - - CFLAGS= $(UDEB_CFLAGS) $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) - diff -Nru ppp-2.4.1.uus/debian/patches/004_auth.c.diff ppp-2.4.2+20040202/debian/patches/004_auth.c.diff --- ppp-2.4.1.uus/debian/patches/004_auth.c.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/004_auth.c.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- ppp-2.4.0b4.orig/pppd/auth.c -+++ ppp-2.4.0b4/pppd/auth.c -@@ -1120,7 +1120,7 @@ - if (pam_error == PAM_SUCCESS && !PAM_error) { - pam_error = pam_acct_mgmt (pamh, PAM_SILENT); - if (pam_error == PAM_SUCCESS) -- pam_open_session (pamh, PAM_SILENT); -+ pam_error = pam_open_session (pamh, PAM_SILENT); - } - - *msg = (char *) pam_strerror (pamh, pam_error); diff -Nru ppp-2.4.1.uus/debian/patches/005_fsm.c.diff ppp-2.4.2+20040202/debian/patches/005_fsm.c.diff --- ppp-2.4.1.uus/debian/patches/005_fsm.c.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/005_fsm.c.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ ---- ppp-2.4.0b4.orig/pppd/fsm.c -+++ ppp-2.4.0b4/pppd/fsm.c -@@ -213,13 +213,21 @@ - (*f->callbacks->down)(f); /* Inform upper layers we're down */ - - /* Init restart counter, send Terminate-Request */ -- f->retransmits = f->maxtermtransmits; -- fsm_sdata(f, TERMREQ, f->reqid = ++f->id, -- (u_char *) f->term_reason, f->term_reason_len); -- TIMEOUT(fsm_timeout, f, f->timeouttime); -- --f->retransmits; -- -- f->state = CLOSING; -+ if (f->retransmits > 0) { -+ fsm_sdata(f, TERMREQ, f->reqid = ++f->id, -+ (u_char *) f->term_reason, f->term_reason_len); -+ TIMEOUT(fsm_timeout, f, f->timeouttime); -+ --f->retransmits; -+ -+ f->state = CLOSING; -+ } else { -+ /* -+ * Term requests disabled at the user's discretion. -+ */ -+ f->state = CLOSED; -+ if( f->callbacks->finished ) -+ (*f->callbacks->finished)(f); -+ } - break; - } - } diff -Nru ppp-2.4.1.uus/debian/patches/006_ipcp.c.diff ppp-2.4.2+20040202/debian/patches/006_ipcp.c.diff --- ppp-2.4.1.uus/debian/patches/006_ipcp.c.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/006_ipcp.c.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ ---- ppp-2.4.0b4.orig/pppd/ipcp.c -+++ ppp-2.4.0b4/pppd/ipcp.c -@@ -241,6 +241,13 @@ - #define CILEN_ADDR 6 /* new-style single address option */ - #define CILEN_ADDRS 10 /* old-style dual address option */ - -+/* -+ * Added to allow static and dynamic ips(s) -+ * Hold the static address from pap-secrets -+ */ -+u_int32_t staticaddr; -+/******************************************/ -+ - - #define CODENAME(x) ((x) == CONFACK ? "ACK" : \ - (x) == CONFNAK ? "NAK" : "REJ") -@@ -1263,6 +1270,15 @@ - orc = CONFNAK; - if (!reject_if_disagree) { - DECPTR(sizeof(u_int32_t), p); -+ -+ /* -+ * Added to allow static and dynamic ip(s) -+ * Are they asking for their static ip from pap-secrets? -+ */ -+ if(ciaddr1 !=0 && ciaddr1 == staticaddr) -+ wo->hisaddr = staticaddr; /* Let them use the static ip */ -+ /*******************************************/ -+ - tl = ntohl(wo->hisaddr); - PUTLONG(tl, p); - } diff -Nru ppp-2.4.1.uus/debian/patches/007_ipcp.h.diff ppp-2.4.2+20040202/debian/patches/007_ipcp.h.diff --- ppp-2.4.1.uus/debian/patches/007_ipcp.h.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/007_ipcp.h.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ ---- ppp-2.4.0b4.orig/pppd/ipcp.h -+++ ppp-2.4.0b4/pppd/ipcp.h -@@ -70,4 +70,10 @@ - - char *ip_ntoa __P((u_int32_t)); - -+/* Added to allow static and dynamic ip(s). -+ * Holds the static ip from pap-secrets -+ */ -+u_int32_t staticaddr; -+/******************************************/ -+ - extern struct protent ipcp_protent; diff -Nru ppp-2.4.1.uus/debian/patches/009_SETUP.diff ppp-2.4.2+20040202/debian/patches/009_SETUP.diff --- ppp-2.4.1.uus/debian/patches/009_SETUP.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/009_SETUP.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- ppp-2.4.0b4.orig/SETUP -+++ ppp-2.4.0b4/SETUP -@@ -21,7 +21,7 @@ - that you will be dialling. For example, suppose the file is called - /etc/ppp/peers/isp. This file would contain something like this: - --cua0 # modem is connected to /dev/cua0 -+ttyS0 # modem is connected to /dev/ttyS0 - 38400 # run the serial port at 38400 baud - crtscts # use hardware flow control - noauth # don't require the ISP to authenticate itself diff -Nru ppp-2.4.1.uus/debian/patches/012_secure-card.diff ppp-2.4.2+20040202/debian/patches/012_secure-card.diff --- ppp-2.4.1.uus/debian/patches/012_secure-card.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/012_secure-card.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ ---- ppp-2.4.0b4.orig/scripts/secure-card -+++ ppp-2.4.0b4/scripts/secure-card -@@ -1,4 +1,4 @@ --#!/usr/local/bin/expect -f -+#!/usr/bin/expect -f - # - # This script was written by Jim Isaacson . It is - # designed to work as a script to use the SecureCARD(tm) device. This -@@ -17,14 +17,14 @@ - - send_user "hello, starting ppp\n" - --system "stty 19200 -echoe -echo raw < /dev/cua3 > /dev/cua3" -+system "stty 19200 -echoe -echo raw < /dev/ttyS3 > /dev/ttyS3" - - # - # These are the parameters for the program. - # - set user Pxxxxxx - set password xxxxxxx --set modem /dev/cua3 -+set modem /dev/ttyS3 - set dialup - set timeout 60 - -@@ -107,5 +107,5 @@ - } - } - --overlay -0 $spawn_id -1 $spawn_id pppd /dev/cua3 19200 192.111.187.215: \ -+overlay -0 $spawn_id -1 $spawn_id pppd /dev/ttyS3 19200 192.111.187.215: \ - crtscts modem defaultroute debug diff -Nru ppp-2.4.1.uus/debian/patches/013_scripts_ip-up.diff ppp-2.4.2+20040202/debian/patches/013_scripts_ip-up.diff --- ppp-2.4.1.uus/debian/patches/013_scripts_ip-up.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/013_scripts_ip-up.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ ---- ppp-2.4.0b4.orig/scripts/ip-up -+++ ppp-2.4.0b4/scripts/ip-up -@@ -0,0 +1,45 @@ -+#!/bin/sh -+# -+# $Id: ip-up,v 1.1 1997/12/16 11:37:26 phil Exp $ -+# -+# This script is run by the pppd after the link is established. -+# It should be used to add routes, set IP address, run the mailq -+# etc. -+# -+# This script is called with the following arguments: -+# Arg Name Example -+# $1 Interface name ppp0 -+# $2 The tty ttyS1 -+# $3 The link speed 38400 -+# $4 Local IP number 12.34.56.78 -+# $5 Peer IP number 12.34.56.99 -+ -+# The environment is cleared before executing this script -+# so the path must be reset -+PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin -+export PATH -+# These variables are for the use of the scripts run by run-parts -+PPP_IFACE="$1" -+PPP_TTY="$2" -+PPP_SPEED="$3" -+PPP_LOCAL="$4" -+PPP_REMOTE="$5" -+export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE -+ -+# as an additional convienince, $PPP_TTYNAME is set to the tty name, -+# stripped of /dev/ (if present) for easier matching. -+PPP_TTYNAME=`/usr/bin/basename "$2"` -+export PPP_TTYNAME -+ -+# Main Script starts here -+ -+run-parts /etc/ppp/ip-up.d -+ -+# if pon was called with the "quick" arg, stop ppp now -+if [ -r /var/run/ppp-quick ] -+then -+ wait -+ /usr/bin/poff -+fi -+ -+# last line diff -Nru ppp-2.4.1.uus/debian/patches/014_scripts_poff.diff ppp-2.4.2+20040202/debian/patches/014_scripts_poff.diff --- ppp-2.4.1.uus/debian/patches/014_scripts_poff.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/014_scripts_poff.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ ---- ppp-2.4.0b4.orig/scripts/poff -+++ ppp-2.4.0b4/scripts/poff -@@ -0,0 +1,26 @@ -+#!/bin/sh -+ -+# Lets see how many pppds are running.... -+set -- `cat /var/run/ppp*.pid 2>/dev/null` -+ -+case $# in -+ 0) # pppd only creates a pid file once ppp is up, so let's try killing pppd -+ # on the assumption that we've not got that far yet. -+ killall pppd -+ ;; -+ 1) # If only one was running then it can be killed (apparently killall -+ # caused problems for some, so lets try killing the pid from the file) -+ kill $1 -+ ;; -+ *) # More than one! Aieehh.. Dont know which one to kill. -+ echo "More than one pppd running. None stopped" -+ exit 1 -+ ;; -+esac -+ -+if [ -r /var/run/ppp-quick ] -+then -+ rm -f /var/run/ppp-quick -+fi -+ -+exit 0 diff -Nru ppp-2.4.1.uus/debian/patches/015_scripts_pon.diff ppp-2.4.2+20040202/debian/patches/015_scripts_pon.diff --- ppp-2.4.1.uus/debian/patches/015_scripts_pon.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/015_scripts_pon.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ ---- ppp-2.4.0b4.orig/scripts/pon -+++ ppp-2.4.0b4/scripts/pon -@@ -0,0 +1,9 @@ -+#!/bin/sh -+ -+if [ "$1" = "quick" ] -+then -+ touch /var/run/ppp-quick -+ shift -+fi -+ -+/usr/sbin/pppd call ${1:-provider} diff -Nru ppp-2.4.1.uus/debian/patches/016_chat_manpage.diff ppp-2.4.2+20040202/debian/patches/016_chat_manpage.diff --- ppp-2.4.1.uus/debian/patches/016_chat_manpage.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/016_chat_manpage.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ ---- ppp-2.4.0.orig/chat/chat.8 Mon Sep 6 17:10:23 1999 -+++ ppp-2.4.0/chat/chat.8 Sun Feb 25 17:11:27 2001 -@@ -154,7 +154,7 @@ - .IP - # Now wait for the prompt and send logout string - .br --\'# ' logout -+\&'# ' logout - .LP - - .SH SENDING DATA FROM A FILE -@@ -216,7 +216,7 @@ - .br - SAY "Dialling your ISP...\\n" - .br --\'' ATDT5551212 -+\&'' ATDT5551212 - .br - TIMEOUT 120 - .br -@@ -326,13 +326,13 @@ - .br - CONNECT \\c - .br --\'Callback login:' call_back_ID -+\&'Callback login:' call_back_ID - .br - HANGUP OFF - .br - ABORT "Bad Login" - .br --\'Callback Password:' Call_back_password -+\&'Callback Password:' Call_back_password - .br - TIMEOUT 120 - .br diff -Nru ppp-2.4.1.uus/debian/patches/017_memory_management.diff ppp-2.4.2+20040202/debian/patches/017_memory_management.diff --- ppp-2.4.1.uus/debian/patches/017_memory_management.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/017_memory_management.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ ---- ppp-2.4.1.orig/pppd/main.c Tue Mar 13 06:56:19 2001 -+++ ppp-2.4.1/pppd/main.c Tue Jul 10 07:47:28 2001 -@@ -1779,6 +1779,9 @@ - if (tdb_store(pppdb, key, dbuf, TDB_REPLACE)) - error("tdb_store failed: %s", tdb_error(pppdb)); - -+ if (vbuf) -+ free(vbuf); -+ - } - - /* diff -Nru ppp-2.4.1.uus/debian/patches/018_ip-up_option.diff ppp-2.4.2+20040202/debian/patches/018_ip-up_option.diff --- ppp-2.4.1.uus/debian/patches/018_ip-up_option.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/018_ip-up_option.diff 2006-04-25 12:08:45.000000000 +0000 @@ -44,9 +44,9 @@ + strlcpy(path_ipup, "/etc/ppp/ip-up", sizeof(path_ipup)); + strlcpy(path_ipdown, "/etc/ppp/ip-down", sizeof(path_ipup)); + + link_stats_valid = 0; new_phase(PHASE_INITIALIZE); - /* --- ppp-2.4.1/pppd/options.c Tue Mar 13 06:56:19 2001 +++ ppp-2.4.1-new/pppd/options.c Tue Jun 19 15:38:32 2001 diff -Nru ppp-2.4.1.uus/debian/patches/020_IPPROTO_TCP_undefine.diff ppp-2.4.2+20040202/debian/patches/020_IPPROTO_TCP_undefine.diff --- ppp-2.4.1.uus/debian/patches/020_IPPROTO_TCP_undefine.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/020_IPPROTO_TCP_undefine.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- ppp-2.4.1.orig/pppd/ipcp.c Wed Jul 4 21:49:07 2001 -+++ ppp-2.4.1/pppd/ipcp.c Wed Jul 4 21:48:46 2001 -@@ -2028,7 +2028,7 @@ - */ - #define IP_HDRLEN 20 /* bytes */ - #define IP_OFFMASK 0x1fff --#define IPPROTO_TCP 6 -+/* in /usr/include/netinet/in.h #define IPPROTO_TCP 6 */ - #define TCP_HDRLEN 20 - #define TH_FIN 0x01 - diff -Nru ppp-2.4.1.uus/debian/patches/021_setipaddr.diff ppp-2.4.2+20040202/debian/patches/021_setipaddr.diff --- ppp-2.4.1.uus/debian/patches/021_setipaddr.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/021_setipaddr.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ ---- ppp-2.4.1/pppd/ipcp.c Thu Mar 8 06:11:12 2001 -+++ ppp-2.4.1-new/pppd/ipcp.c Tue Jun 19 15:49:59 2001 -@@ -109,7 +109,8 @@ - static int setdnsaddr __P((char **)); - static int setwinsaddr __P((char **)); - static int setnetmask __P((char **)); --static int setipaddr __P((char *, char **, int)); -+/* setipaddr() must not be static, otherwise you can't connect with portslave */ -+int setipaddr __P((char *, char **, int)); - static void printipaddr __P((option_t *, void (*)(void *, char *,...),void *)); - - static option_t ipcp_option_list[] = { -@@ -375,7 +376,7 @@ - * If doit is 0, the call is to check whether this option is - * potentially an IP address specification. - */ --static int -+int - setipaddr(arg, argv, doit) - char *arg; - char **argv; - ---- ppp-2.4.1/pppd/pppd.h Tue Mar 13 06:54:37 2001 -+++ ppp-2.4.1-new/pppd/pppd.h Tue Jun 19 15:47:34 2001 -@@ -572,6 +572,7 @@ - char *get_first_ethernet __P((void)); - - /* Procedures exported from options.c */ -+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */ - int parse_args __P((int argc, char **argv)); - /* Parse options from arguments given */ - int options_from_file __P((char *filename, int must_exist, int check_prot, - diff -Nru ppp-2.4.1.uus/debian/patches/022_lockfile-fix.diff ppp-2.4.2+20040202/debian/patches/022_lockfile-fix.diff --- ppp-2.4.1.uus/debian/patches/022_lockfile-fix.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/022_lockfile-fix.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -diff -ruN -x Makefile.in -x configure -x *~ ppp-2.4.1.orig/pppd/utils.c ppp-2.4.1/pppd/utils.c ---- ppp-2.4.1.orig/pppd/utils.c Fri Mar 16 15:28:05 2001 -+++ ppp-2.4.1/pppd/utils.c Thu Jul 12 20:26:31 2001 -@@ -819,9 +819,20 @@ - major(sbuf.st_rdev), minor(sbuf.st_rdev)); - #else - char *p; -+ char lockdev[MAXPATHLEN]; -+ -+ if ((p = strstr(dev, "dev/")) != NULL) { -+ dev = p + 4; -+ strncpy(lockdev, dev, MAXPATHLEN-1); -+ lockdev[MAXPATHLEN-1] = 0; -+ while ((p = strrchr(lockdev, '/')) != NULL) { -+ *p = '_'; -+ } -+ dev = lockdev; -+ } else -+ if ((p = strrchr(dev, '/')) != NULL) -+ dev = p + 1; - -- if ((p = strrchr(dev, '/')) != NULL) -- dev = p + 1; - slprintf(lock_file, sizeof(lock_file), "%s/LCK..%s", LOCK_DIR, dev); - #endif - diff -Nru ppp-2.4.1.uus/debian/patches/023_lcp-max-termintate.diff ppp-2.4.2+20040202/debian/patches/023_lcp-max-termintate.diff --- ppp-2.4.1.uus/debian/patches/023_lcp-max-termintate.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/023_lcp-max-termintate.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ ---- ppp-2.4.1.orig/pppd/fsm.c Wed Jul 4 23:34:27 2001 -+++ ppp-2.4.1/pppd/fsm.c Wed Jul 4 23:34:12 2001 -@@ -213,6 +213,7 @@ - (*f->callbacks->down)(f); /* Inform upper layers we're down */ - - /* Init restart counter, send Terminate-Request */ -+ f->retransmits = f->maxtermtransmits; - if (f->retransmits > 0) { - fsm_sdata(f, TERMREQ, f->reqid = ++f->id, - (u_char *) f->term_reason, f->term_reason_len); diff -Nru ppp-2.4.1.uus/debian/patches/024_pppd.8-persist-maxfail.diff ppp-2.4.2+20040202/debian/patches/024_pppd.8-persist-maxfail.diff --- ppp-2.4.1.uus/debian/patches/024_pppd.8-persist-maxfail.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/024_pppd.8-persist-maxfail.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -# the manpage is slightly unclear here. ---- ppp-2.4.1.orig/pppd/pppd.8 Tue Mar 13 18:54:37 2001 -+++ ppp-2.4.1/pppd/pppd.8 Thu Jul 5 00:02:09 2001 -@@ -790,7 +790,8 @@ - .TP - .B persist - Do not exit after a connection is terminated; instead try to reopen --the connection. -+the connection. The \fBmaxfail\fR option still has an effect on -+persistent connections. - .TP - .B plugin \fIfilename - Load the shared library object file \fIfilename\fR as a plugin. This diff -Nru ppp-2.4.1.uus/debian/patches/025_packet_count.diff ppp-2.4.2+20040202/debian/patches/025_packet_count.diff --- ppp-2.4.1.uus/debian/patches/025_packet_count.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/025_packet_count.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# um.... -# foo ---- ppp-2.4.1.orig/pppd/pppd.h Tue Mar 13 06:54:37 2001 -+++ ppp-2.4.1/pppd/pppd.h Mon Jul 9 17:44:28 2001 -@@ -147,6 +147,8 @@ - struct pppd_stats { - unsigned int bytes_in; - unsigned int bytes_out; -+ unsigned int packets_in; -+ unsigned int packets_out; - }; - - /* Used for storing a sequence of words. Usually malloced. */ ---- ppp-2.4.1.org/pppd/sys-linux.c Tue Mar 13 06:54:41 2001 -+++ ppp-2.4.1/pppd/sys-linux.c Mon Jul 9 17:44:28 2001 -@@ -1236,6 +1236,8 @@ - } - stats->bytes_in = req.stats.p.ppp_ibytes; - stats->bytes_out = req.stats.p.ppp_obytes; -+ stats->packets_in = req.stats.p.ppp_ipackets; -+ stats->packets_out = req.stats.p.ppp_opackets; - return 1; - } diff -Nru ppp-2.4.1.uus/debian/patches/026_pppd.8-active-filter.diff ppp-2.4.2+20040202/debian/patches/026_pppd.8-active-filter.diff --- ppp-2.4.1.uus/debian/patches/026_pppd.8-active-filter.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/026_pppd.8-active-filter.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# the manpage is slightly unclear here. ---- ppp-2.4.1.orig/pppd/pppd.8 Tue Mar 13 18:54:37 2001 -+++ ppp-2.4.1/pppd/pppd.8 Wed Nov 7 20:31:44 2001 -@@ -190,9 +190,7 @@ - except that qualifiers which are inappropriate for a PPP link, such as - \fBether\fR and \fBarp\fR, are not permitted. Generally the filter - expression should be enclosed in single-quotes to prevent whitespace --in the expression from being interpreted by the shell. This option --is currently only available under NetBSD, and then only --if both the kernel and pppd were compiled with PPP_FILTER defined. -+in the expression from being interpreted by the shell. - .TP - .B allow-ip \fIaddress(es) - Allow peers to use the given IP address or subnet without diff -Nru ppp-2.4.1.uus/debian/patches/027_child_debugging.diff ppp-2.4.2+20040202/debian/patches/027_child_debugging.diff --- ppp-2.4.1.uus/debian/patches/027_child_debugging.diff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/027_child_debugging.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ ---- ppp-2.4.0/pppd/main.c.reap Thu Jul 6 07:17:02 2000 -+++ ppp-2.4.0/pppd/main.c Thu Nov 9 17:41:30 2000 -@@ -1579,7 +1579,8 @@ - (chp? chp->prog: "??"), pid, WTERMSIG(status)); - } else if (debug) - dbglog("Script %s finished (pid %d), status = 0x%x", -- (chp? chp->prog: "??"), pid, status); -+ (chp? chp->prog: "??"), pid, -+ WIFEXITED(status) ? WEXITSTATUS(status) : status); - if (chp && chp->done) - (*chp->done)(chp->arg); - if (chp) - diff -Nru ppp-2.4.1.uus/debian/patches/057_pppoe-interface-change ppp-2.4.2+20040202/debian/patches/057_pppoe-interface-change --- ppp-2.4.1.uus/debian/patches/057_pppoe-interface-change 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/057_pppoe-interface-change 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,78 @@ +--- ppp/pppd/plugins/rp-pppoe/plugin.c.orig 2003-04-07 02:09:05.000000000 +0200 ++++ ppp/pppd/plugins/rp-pppoe/plugin.c 2003-12-03 22:15:07.000000000 +0100 +@@ -114,6 +114,57 @@ + return 1; + } + ++/* from */ ++#define IFF_UP 0x1 ++#define IFF_RUNNING 0x40 ++ ++static short ifrflags_old; ++ ++static int interface_change(const char* ifname, int up) ++{ ++ int fd; ++ struct ifreq ifr; ++ ++ if (!up && ifrflags_old != 0) { ++ return 0; ++ } ++ ++ fd = socket(AF_INET, SOCK_DGRAM, 0); ++ if (fd < 0) { ++ warn("socket(AF_INET, SOCK_DGRAM, 0): %s", strerror(errno)); ++ return -1; ++ } ++ ++ strncpy(ifr.ifr_name, ifname, IFNAMSIZ); ++ if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { ++ warn("%s: unknown interface: %s", ifname, strerror(errno)); ++ return -1; ++ } ++ strncpy(ifr.ifr_name, ifname, IFNAMSIZ); ++ if (up) { ++ ifrflags_old = ifr.ifr_flags & (IFF_UP | IFF_RUNNING); ++ ifr.ifr_flags |= (IFF_UP | IFF_RUNNING); ++ } else { ++ ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING); ++ } ++ if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) { ++ warn("SIOCSIFFLAGS: %s", strerror(errno)); ++ return -1; ++ } ++ close(fd); ++ return 0; ++} ++ ++static int interface_up (const char *ifname) ++{ ++ return interface_change(ifname,1); ++} ++ ++static int interface_down (const char* ifname) ++{ ++ return interface_change(ifname,0); ++} ++ + /********************************************************************** + * %FUNCTION: PPPOEConnectDevice + * %ARGUMENTS: +@@ -142,6 +193,8 @@ + conn->peerEth[i] = (unsigned char) mac[i]; + } + } else { ++ if (interface_up(conn->ifName) < 0) ++ return -1; + discovery(conn); + if (conn->discoveryState != STATE_SESSION) { + fatal("Unable to complete PPPoE Discovery"); +@@ -243,6 +296,8 @@ + return; + } + close(conn->sessionSocket); ++ if (interface_down(conn->ifName) < 0) ++ warn("We brought %s up but failed to take it down",conn->ifName); + } + + static void diff -Nru ppp-2.4.1.uus/debian/patches/060_mschap_alignment_fix.diff ppp-2.4.2+20040202/debian/patches/060_mschap_alignment_fix.diff --- ppp-2.4.1.uus/debian/patches/060_mschap_alignment_fix.diff 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/060_mschap_alignment_fix.diff 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,35 @@ +--- ppp.orig/pppd/chap_ms.c 2003-07-10 21:00:26.000000000 +0300 ++++ ppp.fixed/pppd/chap_ms.c 2004-10-12 18:19:32.029033768 +0300 +@@ -314,9 +314,13 @@ + unsigned char *challenge, char *secret, int secret_len, + unsigned char *private) + { ++ MS_ChapResponse resp; ++ + challenge++; /* skip length, should be 8 */ + *response++ = MS_CHAP_RESPONSE_LEN; +- ChapMS(challenge, secret, secret_len, (MS_ChapResponse *) response); ++ ChapMS(challenge, secret, secret_len, (MS_ChapResponse *) &resp); ++ ++ BCOPY(&resp, response, MS_CHAP_RESPONSE_LEN); + } + + static void +@@ -324,12 +328,16 @@ + unsigned char *challenge, char *secret, int secret_len, + unsigned char *private) + { ++ MS_Chap2Response resp; ++ + challenge++; /* skip length, should be 16 */ + *response++ = MS_CHAP2_RESPONSE_LEN; + ChapMS2(challenge, mschap2_peer_challenge, our_name, + secret, secret_len, +- (MS_Chap2Response *) response, private, ++ &resp, private, + MS_CHAP2_AUTHENTICATEE); ++ ++ BCOPY(&resp, response, MS_CHAP2_RESPONSE_LEN); + } + + static int diff -Nru ppp-2.4.1.uus/debian/patches/cflags.patch ppp-2.4.2+20040202/debian/patches/cflags.patch --- ppp-2.4.1.uus/debian/patches/cflags.patch 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/cflags.patch 2006-04-25 12:14:43.000000000 +0000 @@ -0,0 +1,80 @@ +diff -Naur ppp.old/chat/Makefile.linux ppp.new/chat/Makefile.linux +--- ppp.old/chat/Makefile.linux 2006-04-20 13:04:48.000000000 +0300 ++++ ppp.new/chat/Makefile.linux 2006-04-20 13:06:00.000000000 +0300 +@@ -7,7 +7,7 @@ + CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) + + COPTS= -O2 -g -pipe $(CDEFS) +-CFLAGS= $(COPTS) $(CDEFS) ++CFLAGS += $(COPTS) $(CDEFS) + + INSTALL= install + +diff -Naur ppp.old/pppd/Makefile.linux ppp.new/pppd/Makefile.linux +--- ppp.old/pppd/Makefile.linux 2006-04-20 13:04:48.000000000 +0300 ++++ ppp.new/pppd/Makefile.linux 2006-04-20 13:07:17.000000000 +0300 +@@ -78,7 +78,7 @@ + + COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP + +-CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) ++CFLAGS += $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) + + ifdef CHAPMS + CFLAGS += -DCHAPMS=1 +diff -Naur ppp.old/pppd/plugins/Makefile.linux ppp.new/pppd/plugins/Makefile.linux +--- ppp.old/pppd/plugins/Makefile.linux 2006-04-20 13:04:48.000000000 +0300 ++++ ppp.new/pppd/plugins/Makefile.linux 2006-04-20 13:07:40.000000000 +0300 +@@ -1,6 +1,6 @@ + CC = gcc + COPTS = -O2 -g +-CFLAGS = $(COPTS) -I.. -I../../include -fPIC ++CFLAGS += $(COPTS) -I.. -I../../include -fPIC + LDFLAGS = -shared + INSTALL = install -o root + +diff -Naur ppp.old/pppd/plugins/radius/Makefile.linux ppp.new/pppd/plugins/radius/Makefile.linux +--- ppp.old/pppd/plugins/radius/Makefile.linux 2006-04-20 13:04:48.000000000 +0300 ++++ ppp.new/pppd/plugins/radius/Makefile.linux 2006-04-20 13:08:17.000000000 +0300 +@@ -5,7 +5,7 @@ + + MANDIR=/usr/man + PLUGIN=radius.so radattr.so radrealms.so +-CFLAGS=-I../.. -I../../../include -Iradiusclient/include -O2 ++CFLAGS += -I../.. -I../../../include -Iradiusclient/include -O2 + + # Uncomment the next line to include support for Microsoft's + # MS-CHAP authentication protocol. +diff -Naur ppp.old/pppd/plugins/rp-pppoe/Makefile.linux ppp.new/pppd/plugins/rp-pppoe/Makefile.linux +--- ppp.old/pppd/plugins/rp-pppoe/Makefile.linux 2006-04-20 13:04:48.000000000 +0300 ++++ ppp.new/pppd/plugins/rp-pppoe/Makefile.linux 2006-04-20 13:07:55.000000000 +0300 +@@ -17,7 +17,7 @@ + VERSION=3.3 + + COPTS=-O2 -g +-CFLAGS=$(COPTS) -I../../../include/linux ++CFLAGS += $(COPTS) -I../../../include/linux + all: rp-pppoe.so + + rp-pppoe.so: libplugin.a plugin.o +diff -Naur ppp.old/pppdump/Makefile.linux ppp.new/pppdump/Makefile.linux +--- ppp.old/pppdump/Makefile.linux 2006-04-20 13:04:48.000000000 +0300 ++++ ppp.new/pppdump/Makefile.linux 2006-04-20 13:06:57.000000000 +0300 +@@ -1,4 +1,4 @@ +-CFLAGS= -O -I../include/net ++CFLAGS += -O -I../include/net + OBJS = pppdump.o bsd-comp.o deflate.o zlib.o + + INSTALL= install +diff -Naur ppp.old/pppstats/Makefile.linux ppp.new/pppstats/Makefile.linux +--- ppp.old/pppstats/Makefile.linux 2006-04-20 13:04:48.000000000 +0300 ++++ ppp.new/pppstats/Makefile.linux 2006-04-20 13:06:44.000000000 +0300 +@@ -13,7 +13,7 @@ + + INSTALL= install -o root -g daemon + +-CFLAGS = $(COPTS) $(COMPILE_FLAGS) ++CFLAGS += $(COPTS) $(COMPILE_FLAGS) + + all: pppstats + diff -Nru ppp-2.4.1.uus/debian/patches/cifdefroute.dif ppp-2.4.2+20040202/debian/patches/cifdefroute.dif --- ppp-2.4.1.uus/debian/patches/cifdefroute.dif 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/cifdefroute.dif 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,283 @@ +--- ppp/pppd/ipcp.c Wed May 31 17:20:41 2000 ++++ ppp/pppd/ipcp.c Wed May 31 17:27:19 2000 +@@ -145,7 +145,17 @@ + { "-defaultroute", o_bool, &ipcp_allowoptions[0].default_route, + "disable defaultroute option", OPT_A2COPY, + &ipcp_wantoptions[0].default_route }, + ++#ifdef __linux__ ++ { "replacedefaultroute", o_bool, ++ &ipcp_wantoptions[0].replace_default_route, ++ "Replace default route", 1 ++ }, ++ { "noreplacedefaultroute", o_bool, ++ &ipcp_allowoptions[0].replace_default_route, ++ "Never replace default route", OPT_A2COPY, ++ &ipcp_wantoptions[0].replace_default_route }, ++#endif + { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp, + "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp }, + { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp, +@@ -195,7 +205,7 @@ + ip_active_pkt + }; + +-static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t)); ++static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t, bool)); + static void ipcp_script __P((char *)); /* Run an up/down script */ + static void ipcp_script_done __P((void *)); + +@@ -1344,7 +1354,12 @@ + if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE)) + return 0; + if (wo->default_route) ++#ifndef __linux__ + if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr)) ++#else ++ if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr, ++ wo->replace_default_route)) ++#endif + default_route_set[u] = 1; + if (wo->proxy_arp) + if (sifproxyarp(u, wo->hisaddr)) +@@ -1420,7 +1435,8 @@ + */ + if (demand) { + if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) { +- ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr); ++ ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr, ++ wo->replace_default_route); + if (go->ouraddr != wo->ouraddr) { + warn("Local IP address changed to %I", go->ouraddr); + script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr)); +@@ -1445,7 +1461,12 @@ + + /* assign a default route through the interface if required */ + if (ipcp_wantoptions[f->unit].default_route) ++#ifndef __linux__ + if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr)) ++#else ++ if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr, ++ wo->replace_default_route)) ++#endif + default_route_set[f->unit] = 1; + + /* Make a proxy ARP entry if requested. */ +@@ -1492,7 +1513,12 @@ + + /* assign a default route through the interface if required */ + if (ipcp_wantoptions[f->unit].default_route) ++#ifndef __linux__ + if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr)) ++#else ++ if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr, ++ wo->replace_default_route)) ++#endif + default_route_set[f->unit] = 1; + + /* Make a proxy ARP entry if requested. */ +@@ -1559,7 +1585,7 @@ + sifnpmode(f->unit, PPP_IP, NPMODE_DROP); + sifdown(f->unit); + ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr, +- ipcp_hisoptions[f->unit].hisaddr); ++ ipcp_hisoptions[f->unit].hisaddr, 0); + } + + /* Execute the ip-down script */ +@@ -1575,16 +1601,25 @@ + * proxy arp entries, etc. + */ + static void +-ipcp_clear_addrs(unit, ouraddr, hisaddr) ++ipcp_clear_addrs(unit, ouraddr, hisaddr, replacedefaultroute) + int unit; + u_int32_t ouraddr; /* local address */ + u_int32_t hisaddr; /* remote address */ ++ bool replacedefaultroute; + { + if (proxy_arp_set[unit]) { + cifproxyarp(unit, hisaddr); + proxy_arp_set[unit] = 0; + } +- if (default_route_set[unit]) { ++ /* If replacedefaultroute, sifdefaultroute will be called soon ++ * with replacedefaultroute set and that will overwrite the current ++ * default route. This is the case only when doing demand, otherwise ++ * during demand, this cifdefaultroute would restore the old default ++ * route which is not what we want in this case. In the non-demand ++ * case, we'll delete the default route and restore the old if there ++ * is one saved by an sifdefaultroute with replacedefaultroute. ++ */ ++ if (!replacedefaultroute && default_route_set[unit]) { + cifdefaultroute(unit, ouraddr, hisaddr); + default_route_set[unit] = 0; + } +--- ppp/pppd/ipcp.h Wed May 31 17:20:41 2000 ++++ ppp/pppd/ipcp.h Wed May 31 15:56:17 2000 +@@ -47,6 +47,7 @@ + bool old_addrs; /* Use old (IP-Addresses) option? */ + bool req_addr; /* Ask peer to send IP address? */ + bool default_route; /* Assign default route through interface? */ ++ bool replace_default_route; /* Replace default route through interface? */ + bool proxy_arp; /* Make proxy ARP entry for peer? */ + bool neg_vj; /* Van Jacobson Compression? */ + bool old_vj; /* use old (short) form of VJ option? */ +--- ppp/pppd/pppd.8 Wed May 31 17:20:41 2000 ++++ ppp/pppd/pppd.8 Wed May 31 15:56:17 2000 +@@ -99,6 +99,13 @@ + This entry is removed when the PPP connection is broken. This option + is privileged if the \fInodefaultroute\fR option has been specified. + .TP ++.B replacedefaultroute ++This option is a flag to the defaultroute option. If defaultroute is ++set and this flag is also set, pppd replaces an existing default route ++with the new default route. ++ ++ ++.TP + .B disconnect \fIscript + Run the executable or shell command specified by \fIscript\fR after + pppd has terminated the link. This script could, for example, issue +@@ -589,7 +596,12 @@ + .TP + .B nodefaultroute + Disable the \fIdefaultroute\fR option. The system administrator who +-wishes to prevent users from creating default routes with pppd ++wishes to prevent users from adding a default route with pppd ++can do so by placing this option in the /etc/ppp/options file. ++.TP ++.B noreplacedefaultroute ++Disable the \fIreplacedefaultroute\fR option. The system administrator who ++wishes to prevent users from replacing a default route with pppd + can do so by placing this option in the /etc/ppp/options file. + .TP + .B nodeflate +--- ppp/pppd/pppd.h Wed May 31 17:20:41 2000 ++++ ppp/pppd/pppd.h Wed May 31 15:56:17 2000 +@@ -416,7 +416,11 @@ + int cif6addr __P((int, eui64_t, eui64_t)); + /* Remove an IPv6 address from i/f */ + #endif ++#ifndef __linux__ + int sifdefaultroute __P((int, u_int32_t, u_int32_t)); ++#else ++int sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt)); ++#endif + /* Create default route through i/f */ + int cifdefaultroute __P((int, u_int32_t, u_int32_t)); + /* Delete default route through i/f */ +--- ppp/pppd/sys-linux.c Wed May 31 17:20:41 2000 ++++ ppp/pppd/sys-linux.c Wed May 31 17:37:23 2000 +@@ -143,6 +143,8 @@ + + static int if_is_up; /* Interface has been marked up */ + static u_int32_t default_route_gateway; /* Gateway for default route added */ ++static struct rtentry old_def_rt; /* Old default route */ ++static int default_rt_repl_rest; /* replace and restore old default rt */ + static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ + static char proxy_arp_dev[16]; /* Device for proxy arp entry */ + static u_int32_t our_old_addr; /* for detecting address changes */ +@@ -1209,6 +1211,9 @@ + p = NULL; + } + ++ SET_SA_FAMILY (rt->rt_dst, AF_INET); ++ SET_SA_FAMILY (rt->rt_gateway, AF_INET); ++ + SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16); + SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16); + SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16); +@@ -1278,19 +1283,53 @@ + /******************************************************************** + * + * sifdefaultroute - assign a default route through the address given. ++ * ++ * If the global default_rt_repl_rest flag is set, then this function ++ * already replaced the original system defaultroute with some other ++ * route and it should just replace the current defaultroute with ++ * another one, without saving the current route. Use: demand mode, ++ * when pppd sets first a defaultroute it it's temporary ppp0 addresses ++ * and then changes the temporary addresses to the addresses for the real ++ * ppp connection when it has come up. + */ + +-int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) ++int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway, bool replace) + { +- struct rtentry rt; +- +- if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) { +- u_int32_t old_gateway = SIN_ADDR(rt.rt_gateway); ++ struct rtentry rt, tmp_rt; ++ struct rtentry *del_rt = NULL; + +- if (old_gateway != gateway) +- error("not replacing existing default route to %s [%I]", +- rt.rt_dev, old_gateway); +- return 0; ++ ++ if (default_rt_repl_rest) { ++ /* We have already reclaced the original defaultroute, if we ++ * are called again, we will delete the current default route ++ * and set the new default route in this function. ++ * - this is normally only the case the doing demand: */ ++ if (defaultroute_exists( &tmp_rt )) ++ del_rt = &tmp_rt; ++ } else if ( defaultroute_exists( &old_def_rt ) && ++ strcmp( old_def_rt.rt_dev, ifname ) != 0) { ++ /* We did not yet replace an existing default route, let's ++ * check if we should save and replace a default route: ++ */ ++ u_int32_t old_gateway = SIN_ADDR(old_def_rt.rt_gateway); ++ ++ if (old_gateway != gateway) { ++ if (!replace) { ++ error("not replacing default route to %s [%I]", ++ old_def_rt.rt_dev, old_gateway); ++ return 0; ++ } else { ++ // we need to copy rt_dev because we need it permanent too: ++ char * tmp_dev = malloc(strlen(old_def_rt.rt_dev)+1); ++ strcpy(tmp_dev, old_def_rt.rt_dev); ++ old_def_rt.rt_dev = tmp_dev; ++ ++ notice("replacing old default route to %s [%I]", ++ old_def_rt.rt_dev, old_gateway); ++ default_rt_repl_rest = 1; ++ del_rt = &old_def_rt; ++ } ++ } + } + + memset (&rt, '\0', sizeof (rt)); +@@ -1310,6 +1349,12 @@ + error("default route ioctl(SIOCADDRT): %m(%d)", errno); + return 0; + } ++ if (default_rt_repl_rest && del_rt) ++ if (ioctl(sock_fd, SIOCDELRT, del_rt) < 0) { ++ if ( ! ok_error ( errno )) ++ error("del old default route ioctl(SIOCDELRT): %m(%d)", errno); ++ return 0; ++ } + + default_route_gateway = gateway; + return 1; +@@ -1344,6 +1389,16 @@ + error("default route ioctl(SIOCDELRT): %m (%d)", errno); + return 0; + } ++ } ++ if (default_rt_repl_rest) { ++ notice("restoring old default route to %s [%I]", ++ old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway)); ++ if (ioctl(sock_fd, SIOCADDRT, &old_def_rt) < 0) { ++ if ( ! ok_error ( errno )) ++ error("restore default route ioctl(SIOCADDRT): %m(%d)", errno); ++ return 0; ++ } ++ default_rt_repl_rest = 0; + } + + return 1; diff -Nru ppp-2.4.1.uus/debian/patches/fix_closed_fds ppp-2.4.2+20040202/debian/patches/fix_closed_fds --- ppp-2.4.1.uus/debian/patches/fix_closed_fds 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/fix_closed_fds 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,34 @@ +sys_init() will open a socket and keep it open for the whole like of the +process. If pppd is started without all standard fds open then the socket +will get one of their numbers, which will be clobbered later by the +/dev/null fd duplicated by main(). + +See Debian bug #235192. + +diff -ruN ppp.orig/pppd/main.c ppp/pppd/main.c +--- ppp.orig/pppd/main.c 2004-02-29 18:50:12.000000000 +0100 ++++ ppp/pppd/main.c 2004-02-29 18:48:56.000000000 +0100 +@@ -385,11 +385,6 @@ + if (dryrun) + die(0); + +- /* +- * Initialize system-dependent stuff. +- */ +- sys_init(); +- + /* Make sure fds 0, 1, 2 are open to somewhere. */ + fd_devnull = open(_PATH_DEVNULL, O_RDWR); + if (fd_devnull < 0) +@@ -401,6 +396,11 @@ + fd_devnull = i; + } + ++ /* ++ * Initialize system-dependent stuff. ++ */ ++ sys_init(); ++ + #ifdef USE_TDB + pppdb = tdb_open(_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644); + if (pppdb != NULL) { diff -Nru ppp-2.4.1.uus/debian/patches/no_crypt_hack ppp-2.4.2+20040202/debian/patches/no_crypt_hack --- ppp-2.4.1.uus/debian/patches/no_crypt_hack 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/no_crypt_hack 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,45 @@ +diff -ruN ppp.orig/pppd/auth.c ppp/pppd/auth.c +--- ppp.orig/pppd/auth.c 2003-06-12 02:01:21.000000000 +0200 ++++ ppp/pppd/auth.c 2003-12-02 14:48:40.000000000 +0100 +@@ -1292,8 +1292,10 @@ + } + if (secret[0] != 0 && !login_secret) { + /* password given in pap-secrets - must match */ ++#ifndef NO_CRYPT_HACK + if ((cryptpap || strcmp(passwd, secret) != 0) + && strcmp(crypt(passwd, secret), secret) != 0) ++#endif + ret = UPAP_AUTHNAK; + } + } +@@ -1495,8 +1497,10 @@ + /* + * If no passwd, don't let them login. + */ ++#ifndef NO_CRYPT_HACK + if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2 + || strcmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd) != 0) ++#endif + return (UPAP_AUTHNAK); + + #endif /* #ifdef USE_PAM */ +diff -ruN ppp.orig/pppd/Makefile.linux ppp/pppd/Makefile.linux +--- ppp.orig/pppd/Makefile.linux 2003-11-27 23:00:22.000000000 +0100 ++++ ppp/pppd/Makefile.linux 2003-12-02 14:47:53.000000000 +0100 +@@ -116,12 +116,16 @@ + #LIBS += -lshadow $(LIBS) + endif + ++ifdef NO_CRYPT_HACK ++CFLAGS += -DNO_CRYPT_HACK ++else + ifneq ($(wildcard /usr/include/crypt.h),) + CFLAGS += -DHAVE_CRYPT_H=1 + endif + ifneq ($(wildcard /usr/lib/libcrypt.*),) + LIBS += -lcrypt + endif ++endif + + ifdef NEEDDES + ifndef USE_CRYPT diff -Nru ppp-2.4.1.uus/debian/patches/ppp-2.3.11-oedod.dif ppp-2.4.2+20040202/debian/patches/ppp-2.3.11-oedod.dif --- ppp-2.4.1.uus/debian/patches/ppp-2.3.11-oedod.dif 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/ppp-2.3.11-oedod.dif 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,172 @@ +--- ppp/pppd/demand.c ++++ ppp/pppd/demand.c 2000/06/28 14:54:04 +@@ -25,6 +25,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -32,6 +34,8 @@ + #include + #include + #include ++#include ++#include + #ifdef PPP_FILTER + #include + #include +@@ -210,6 +214,14 @@ + int c, rv; + + rv = 0; ++ ++/* check for synchronous connection... */ ++ ++ if ( (p[0] == 0xFF) && (p[1] == 0x03) ) { ++ rv = loop_frame(p,n); ++ return rv; ++ } ++ + for (; n > 0; --n) { + c = *p++; + if (c == PPP_FLAG) { +@@ -288,17 +300,102 @@ + * loopback, now that the real serial link is up. + */ + void +-demand_rexmit(proto) ++demand_rexmit(proto, newip) + int proto; ++ u_int32_t newip; + { + struct packet *pkt, *prev, *nextpkt; ++ unsigned short checksum; ++ unsigned short pkt_checksum = 0; ++ unsigned iphdr; ++ struct timeval tv; ++ char cv = 0; ++ char ipstr[16]; + + prev = NULL; + pkt = pend_q; + pend_q = NULL; ++ tv.tv_sec = 1; ++ tv.tv_usec = 0; ++ select(0,NULL,NULL,NULL,&tv); /* Sleep for 1 Seconds */ + for (; pkt != NULL; pkt = nextpkt) { + nextpkt = pkt->next; + if (PPP_PROTOCOL(pkt->data) == proto) { ++ if ( (proto == PPP_IP) && newip ) { ++ /* Get old checksum */ ++ ++ iphdr = (pkt->data[4] & 15) << 2; ++ checksum = *((unsigned short *) (pkt->data+14)); ++ if (checksum == 0xFFFF) { ++ checksum = 0; ++ } ++ ++ ++ if (pkt->data[13] == 17) { ++ pkt_checksum = *((unsigned short *) (pkt->data+10+iphdr)); ++ if (pkt_checksum) { ++ cv = 1; ++ if (pkt_checksum == 0xFFFF) { ++ pkt_checksum = 0; ++ } ++ } ++ else { ++ cv = 0; ++ } ++ } ++ ++ if (pkt->data[13] == 6) { ++ pkt_checksum = *((unsigned short *) (pkt->data+20+iphdr)); ++ cv = 1; ++ if (pkt_checksum == 0xFFFF) { ++ pkt_checksum = 0; ++ } ++ } ++ ++ /* Delete old Source-IP-Address */ ++ checksum -= *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; ++ checksum -= *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; ++ ++ pkt_checksum -= *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; ++ pkt_checksum -= *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; ++ ++ /* Change Source-IP-Address */ ++ * ((u_int32_t *) (pkt->data + 16)) = newip; ++ ++ /* Add new Source-IP-Address */ ++ checksum += *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; ++ checksum += *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; ++ ++ pkt_checksum += *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; ++ pkt_checksum += *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; ++ ++ /* Write new checksum */ ++ if (!checksum) { ++ checksum = 0xFFFF; ++ } ++ *((unsigned short *) (pkt->data+14)) = checksum; ++ if (pkt->data[13] == 6) { ++ *((unsigned short *) (pkt->data+20+iphdr)) = pkt_checksum; ++ } ++ if (cv && (pkt->data[13] == 17) ) { ++ *((unsigned short *) (pkt->data+10+iphdr)) = pkt_checksum; ++ } ++ ++ /* Log Packet */ ++ strcpy(ipstr,inet_ntoa(*( (struct in_addr *) (pkt->data+16)))); ++ if (pkt->data[13] == 1) { ++ syslog(LOG_INFO,"Open ICMP %s -> %s\n", ++ ipstr, ++ inet_ntoa(*( (struct in_addr *) (pkt->data+20)))); ++ } else { ++ syslog(LOG_INFO,"Open %s %s:%d -> %s:%d\n", ++ pkt->data[13] == 6 ? "TCP" : "UDP", ++ ipstr, ++ ntohs(*( (short *) (pkt->data+iphdr+4))), ++ inet_ntoa(*( (struct in_addr *) (pkt->data+20))), ++ ntohs(*( (short *) (pkt->data+iphdr+6)))); ++ } ++ } + output(0, pkt->data, pkt->length); + free(pkt); + } else { +--- ppp/pppd/ipcp.c ++++ ppp/pppd/ipcp.c 2000/06/28 12:32:05 +@@ -1454,7 +1454,7 @@ + proxy_arp_set[f->unit] = 1; + + } +- demand_rexmit(PPP_IP); ++ demand_rexmit(PPP_IP,go->ouraddr); + sifnpmode(f->unit, PPP_IP, NPMODE_PASS); + + } else { +--- ppp/pppd/ipv6cp.c ++++ ppp/pppd/ipv6cp.c 2000/06/28 12:32:06 +@@ -1153,7 +1153,7 @@ + } + + } +- demand_rexmit(PPP_IPV6); ++ demand_rexmit(PPP_IPV6,0); + sifnpmode(f->unit, PPP_IPV6, NPMODE_PASS); + + } else { +--- ppp/pppd/pppd.h ++++ ppp/pppd/pppd.h 2000/06/28 12:32:06 +@@ -359,7 +359,7 @@ + void demand_block __P((void)); /* set all NPs to queue up packets */ + void demand_unblock __P((void)); /* set all NPs to pass packets */ + void demand_discard __P((void)); /* set all NPs to discard packets */ +-void demand_rexmit __P((int)); /* retransmit saved frames for an NP */ ++void demand_rexmit __P((int, u_int32_t)); /* retransmit saved frames for an NP*/ + int loop_chars __P((unsigned char *, int)); /* process chars from loopback */ + int loop_frame __P((unsigned char *, int)); /* should we bring link up? */ + diff -Nru ppp-2.4.1.uus/debian/patches/ppp-2.4.2-stripMSdomain ppp-2.4.2+20040202/debian/patches/ppp-2.4.2-stripMSdomain --- ppp-2.4.1.uus/debian/patches/ppp-2.4.2-stripMSdomain 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/ppp-2.4.2-stripMSdomain 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,35 @@ +diff -ruN ppp.orig/pppd/chap-new.c ppp/pppd/chap-new.c +--- ppp.orig/pppd/chap-new.c 2003-11-27 23:25:17.000000000 +0100 ++++ ppp/pppd/chap-new.c 2003-12-02 12:26:21.000000000 +0100 +@@ -57,6 +57,7 @@ + int chap_timeout_time = 3; + int chap_max_transmits = 10; + int chap_rechallenge_time = 0; ++int chapms_strip_domain = 0; + + /* + * Command-line options. +@@ -68,6 +69,8 @@ + "Set max #xmits for challenge", OPT_PRIO }, + { "chap-interval", o_int, &chap_rechallenge_time, + "Set interval for rechallenge", OPT_PRIO }, ++ { "chapms-strip-domain", o_bool, &chapms_strip_domain, ++ "Strip the domain prefix before the Username", 1 }, + { NULL } + }; + +@@ -338,6 +341,14 @@ + /* Null terminate and clean remote name. */ + slprintf(rname, sizeof(rname), "%.*v", len, name); + name = rname; ++ ++ /* strip the MS domain name */ ++ if (chapms_strip_domain && strrchr(rname, '\\')) { ++ char tmp[MAXNAMELEN+1]; ++ ++ strcpy(tmp, strrchr(rname, '\\') + 1); ++ strcpy(rname, tmp); ++ } + } + + if (chap_verify_hook) diff -Nru ppp-2.4.1.uus/debian/patches/pppdump-no-deflate ppp-2.4.2+20040202/debian/patches/pppdump-no-deflate --- ppp-2.4.1.uus/debian/patches/pppdump-no-deflate 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/pppdump-no-deflate 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,12 @@ +diff -ruN ppp-2.4.1.uus.orig/pppdump/ppp-comp.h ppp-2.4.1.uus/pppdump/ppp-comp.h +--- ppp-2.4.1.uus.orig/pppdump/ppp-comp.h 1999-03-23 04:21:01.000000000 +0100 ++++ ppp-2.4.1.uus/pppdump/ppp-comp.h 2003-08-09 23:54:49.000000000 +0200 +@@ -37,6 +37,8 @@ + #ifndef DO_BSD_COMPRESS + #define DO_BSD_COMPRESS 1 /* by default, include BSD-Compress */ + #endif ++#undef DO_DEFLATE ++#define DO_DEFLATE 0 + #ifndef DO_DEFLATE + #define DO_DEFLATE 1 /* by default, include Deflate */ + #endif diff -Nru ppp-2.4.1.uus/debian/patches/setevn_call_file ppp-2.4.2+20040202/debian/patches/setevn_call_file --- ppp-2.4.1.uus/debian/patches/setevn_call_file 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/setevn_call_file 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,24 @@ +diff -ruN ppp.orig/pppd/options.c ppp/pppd/options.c +--- ppp.orig/pppd/options.c 2004-02-27 19:45:18.000000000 +0100 ++++ ppp/pppd/options.c 2004-02-27 19:44:48.000000000 +0100 +@@ -1448,6 +1448,7 @@ + if ((fname = (char *) malloc(l)) == NULL) + novm("call file name"); + slprintf(fname, l, "%s%s", _PATH_PEERFILES, arg); ++ script_setenv("CALL_FILE", arg, 0); + + ok = options_from_file(fname, 1, 1, 1); + +diff -ruN ppp.orig/pppd/pppd.8 ppp/pppd/pppd.8 +--- ppp.orig/pppd/pppd.8 2004-02-27 19:45:18.000000000 +0100 ++++ ppp/pppd/pppd.8 2004-02-27 19:45:13.000000000 +0100 +@@ -1569,6 +1569,9 @@ + .B LINKNAME + The logical name of the link, set with the \fIlinkname\fR option. + .TP ++.B CALL_FILE ++The value of the \fIcall\fR option. ++.TP + .B DNS1 + If the peer supplies DNS server addresses, this variable is set to the + first DNS server address supplied. diff -Nru ppp-2.4.1.uus/debian/patches/syslog_local2 ppp-2.4.2+20040202/debian/patches/syslog_local2 --- ppp-2.4.1.uus/debian/patches/syslog_local2 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches/syslog_local2 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,12 @@ +diff -ruN ppp.orig/pppd/pppd.h ppp/pppd/pppd.h +--- ppp.orig/pppd/pppd.h 2003-11-28 00:30:27.000000000 +0100 ++++ ppp/pppd/pppd.h 2003-11-28 00:30:20.000000000 +0100 +@@ -812,7 +812,7 @@ + || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP) + #define LOG_PPP LOG_LOCAL2 + #else +-#define LOG_PPP LOG_DAEMON ++#define LOG_PPP LOG_LOCAL2 + #endif + #endif /* LOG_PPP */ + diff -Nru ppp-2.4.1.uus/debian/patches-applied ppp-2.4.2+20040202/debian/patches-applied --- ppp-2.4.1.uus/debian/patches-applied 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/patches-applied 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -debian/patches/001_udeb.diff -debian/patches/002_chat.c.diff -debian/patches/003_cbcp.diff -debian/patches/004_auth.c.diff -debian/patches/005_fsm.c.diff -debian/patches/006_ipcp.c.diff -debian/patches/007_ipcp.h.diff -debian/patches/008_pathnames.h.diff -debian/patches/009_SETUP.diff -debian/patches/010_scripts_README.diff -debian/patches/011_scripts_redialer.diff -debian/patches/012_secure-card.diff -debian/patches/013_scripts_ip-up.diff -debian/patches/014_scripts_poff.diff -debian/patches/015_scripts_pon.diff -debian/patches/016_chat_manpage.diff -debian/patches/017_memory_management.diff -debian/patches/018_ip-up_option.diff -debian/patches/020_IPPROTO_TCP_undefine.diff -debian/patches/021_setipaddr.diff -debian/patches/022_lockfile-fix.diff -debian/patches/023_lcp-max-termintate.diff -debian/patches/024_pppd.8-persist-maxfail.diff -debian/patches/025_packet_count.diff -debian/patches/026_pppd.8-active-filter.diff -debian/patches/027_child_debugging.diff diff -Nru ppp-2.4.1.uus/debian/plog ppp-2.4.2+20040202/debian/plog --- ppp-2.4.1.uus/debian/plog 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/plog 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -s /var/log/ppp.log ]; then - exec tail "$@" /var/log/ppp.log -else - exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\[' -fi diff -Nru ppp-2.4.1.uus/debian/po/POTFILES.in ppp-2.4.2+20040202/debian/po/POTFILES.in --- ppp-2.4.1.uus/debian/po/POTFILES.in 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/po/POTFILES.in 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1 @@ +[type: gettext/rfc822deb] ppp-udeb.templates diff -Nru ppp-2.4.1.uus/debian/po/fr.po ppp-2.4.2+20040202/debian/po/fr.po --- ppp-2.4.1.uus/debian/po/fr.po 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/po/fr.po 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp 2.4.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-19 11:50-0800\n" +"PO-Revision-Date: 2004-03-02 11:18+0100\n" +"Last-Translator: Olivier Gauwin \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:3 +msgid "Configure and start PPPoE networking" +msgstr "Configurer et démarrer l'accès au réseau par PPPoE" + +#. Type: select +#. Description +#: ../ppp-udeb.templates:8 +msgid "Interface name" +msgstr "Nom de l'interface :" + +#. Type: select +#. Description +#: ../ppp-udeb.templates:8 +msgid "Choose the name of the network interface connected to your PPPoE modem." +msgstr "" +"Veuillez choisir le nom de l'interface réseau connectée à votre modem PPPoE." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:13 +msgid "Your username" +msgstr "Nom d'utilisateur :" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:17 +msgid "Your password" +msgstr "Mot de passe :" diff -Nru ppp-2.4.1.uus/debian/po/ja.po ppp-2.4.2+20040202/debian/po/ja.po --- ppp-2.4.1.uus/debian/po/ja.po 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/po/ja.po 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: ppp 2.4.2+20040202-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-19 11:50-0800\n" +"PO-Revision-Date: 2004-03-02 08:02+0900\n" +"Last-Translator: Hideki Yamane \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:3 +msgid "Configure and start PPPoE networking" +msgstr "PPPoE ¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÀßÄê¤ÈÀܳ³«»Ï" + +#. Type: select +#. Description +#: ../ppp-udeb.templates:8 +msgid "Interface name" +msgstr "¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹Ì¾" + +#. Type: select +#. Description +#: ../ppp-udeb.templates:8 +msgid "Choose the name of the network interface connected to your PPPoE modem." +msgstr "PPPoE ¥â¥Ç¥à¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¥«¡¼¥É¤Î̾Á°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:13 +msgid "Your username" +msgstr "¥æ¡¼¥¶Ì¾" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:17 +msgid "Your password" +msgstr "¥Ñ¥¹¥ï¡¼¥É" diff -Nru ppp-2.4.1.uus/debian/po/nl.po ppp-2.4.2+20040202/debian/po/nl.po --- ppp-2.4.1.uus/debian/po/nl.po 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/po/nl.po 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,59 @@ +# translation of ppp_2.4.2+20040202-1_nl.po to Dutch +# translation of ppp_2.4.2+20040202-1_nl.po to Dutch +# translation of ppp_2.4.2+20040202-1_nl.po to Dutch +# translation of ppp_2.4.2+20040202-1_nl.po to Dutch +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Frans Pop , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp_2.4.2+20040202-1_nl\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-19 11:50-0800\n" +"PO-Revision-Date: 2004-03-22 21:30+0100\n" +"Last-Translator: Frans Pop \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3\n" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:3 +msgid "Configure and start PPPoE networking" +msgstr "Configureer en start PPPoE-netwerkfunctionaliteit" + +#. Type: select +#. Description +#: ../ppp-udeb.templates:8 +msgid "Interface name" +msgstr "Interfacenaam" + +#. Type: select +#. Description +#: ../ppp-udeb.templates:8 +msgid "Choose the name of the network interface connected to your PPPoE modem." +msgstr "Kies de naam van de netwerkinterface die verwijst naar uw PPPoE-modem." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:13 +msgid "Your username" +msgstr "Uw gebruikersnaam" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:17 +msgid "Your password" +msgstr "Uw wachtwoord" + diff -Nru ppp-2.4.1.uus/debian/po/templates.pot ppp-2.4.2+20040202/debian/po/templates.pot --- ppp-2.4.1.uus/debian/po/templates.pot 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/po/templates.pot 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-19 11:50-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:3 +msgid "Configure and start PPPoE networking" +msgstr "" + +#. Type: select +#. Description +#: ../ppp-udeb.templates:8 +msgid "Interface name" +msgstr "" + +#. Type: select +#. Description +#: ../ppp-udeb.templates:8 +msgid "Choose the name of the network interface connected to your PPPoE modem." +msgstr "" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:13 +msgid "Your username" +msgstr "" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:17 +msgid "Your password" +msgstr "" diff -Nru ppp-2.4.1.uus/debian/po/tr.po ppp-2.4.2+20040202/debian/po/tr.po --- ppp-2.4.1.uus/debian/po/tr.po 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/po/tr.po 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,46 @@ +# Turkish translation of ppp. +# This file is distributed under the same license as the ppp package. +# Gürkan Aslan , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-03-11 11:27+0000\n" +"PO-Revision-Date: 2004-04-14 12:56+0300\n" +"Last-Translator: Gürkan Aslan \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:3 +msgid "Configure and start PPPoE networking" +msgstr "PPPoE ağını yapılandır ve baÅŸlat" + +#. Type: select +#. Description +#: ../ppp-udeb.templates:8 +msgid "Interface name" +msgstr "Arayüz adı" + +#. Type: select +#. Description +#: ../ppp-udeb.templates:8 +msgid "Choose the name of the network interface connected to your PPPoE modem." +msgstr "PPPoE modeme baÄŸlı olan aÄŸ arayüzü adını seçin." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:13 +msgid "Your username" +msgstr "Kullanıcı adınız" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:17 +msgid "Your password" +msgstr "Parolanız" diff -Nru ppp-2.4.1.uus/debian/poff ppp-2.4.2+20040202/debian/poff --- ppp-2.4.1.uus/debian/poff 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/poff 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -#!/bin/sh - -# $Id: poff,v 1.8 1999/08/28 16:34:51 phil Exp $ -# Written by John Hasler and based on work -# by Phil Hands . Distributed under the GNU GPL - -if [ -x /usr/bin/kill ]; then - KILL="/usr/bin/kill" -else - KILL="/bin/kill" -fi -SIG=TERM -DONE="stopped" -MODE="" - -usage () -{ - cat < pon.txt -.\" -.TH PON 1 "July 2000" "Debian Project" "Debian PPPD" -.SH NAME -pon, poff, plog \- starts up, shuts down or lists the log of PPP connections -.SH SYNOPSIS -.B pon -[ isp-name [ options ] ] -.br -.B poff -[ -r ] [ -d ] [ -c ] [ -a ] [ -h ] [ isp-name ] -.br -.B plog -[ arguments ] -.SH DESCRIPTION -This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP -scripts, which allow users to control PPP connections. -.. -.SS pon -\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP -file, if it exists and is executable. Otherwise, a PPP connection will be -started using configuration from \fI/etc/ppp/peers/provider\fP. -This is the default behaviour unless an \fBisp-name\fP argument is given. -.PP -For instance, to use ISP configuration "myisp" run: -.IP -pon myisp -.PP -\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP. -You can pass additional \fBoptions\fP after the ISP name, too. -\fBpon\fP can be used to run multiple, simultaneous PPP connections. -.. -.SS poff -\fBpoff\fP closes a PPP connection. If more than one PPP connection exists, -the one named in the argument to \fBpoff\fP will be killed, e.g. -.IP -poff myprovider2 -.PP -will terminate the connection to myprovider2, and leave the PPP connections -to e.g. "myprovider1" or "myprovider3" up and running. -.PP -\fBpoff\fP takes the following command line options: -.RS -.TP -.B "\-r" -causes the connection to be redialed after it is dropped. -.TP -.B "\-d" -toggles the state of pppd's debug option. -.TP -.B "\-c" -causes -.BR pppd (8) -to renegotiate compression. -.TP -.B "\-a" -stops all running ppp connections. If the argument \fBisp-name\fP -is given it will be ignored. -.TP -.B "\-h" -displays help information. -.TP -.B "\-v" -prints the version and exits. -.PP -If no argument is given, \fBpoff\fP will stop or signal pppd if and only -if there is exactly one running. If more than one connection is active, -it will exit with an error code of 1. -.. -.SS plog -\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that -file doesn't exist, it shows you the last few lines of your -\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd. -This script makes use of the -.BR tail (1) -command, so arguments that can be passed to -.BR tail (1) -can also be passed to \fBplog\fP. -.PP -Note: the \fBplog\fP script can only be used by root or another system -administrator in group "adm", due to security reasons. Also, to have all -pppd-generated information in one logfile, that plog can show, you need the -following line in your \fI/etc/syslog.conf\fP file: -.PP -local2.* -/var/log/ppp.log -.RE -.SH FILES -.TP -.I /etc/ppp/options -PPPd system options file. -.TP -.I /etc/ppp/pap-secrets -System PAP passwords file. -.TP -.I /etc/ppp/chap-secrets -System CHAP passwords file. -.TP -.I /etc/ppp/peers/ -Directory holding the peer options files. The default file is called -\fIprovider\fP. -.TP -.I /etc/chatscripts/provider -The chat script invoked from the default \fI/etc/ppp/peers/provider\fP. -.TP -.I /var/log/ppp.log -The default PPP log file. -.SH AUTHORS -The p-commands were written by Christoph Lameter . -Updated and revised by Philip Hands . -.br -This manual was written by Othmar Pasteka . Modified -by Rob Levin , with some extensions taken from -the old p-commands manual written by John Hasler . -.SH "SEE ALSO" -.BR pppd (8), -.BR chat (8), -.BR tail (1). diff -Nru ppp-2.4.1.uus/debian/postinst ppp-2.4.2+20040202/debian/postinst --- ppp-2.4.1.uus/debian/postinst 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -#!/bin/sh -e - -action="$1" - -# fixup after ppp-connect removed (unless this is an abort-* action) -expr "${action}" : abort- >/dev/null || { - if [ -f /etc/ppp/ppp-connect ] ; then - echo "The file /etc/ppp/ppp-connect is no longer part of the ppp" - echo -n "package, removing..." - rm /etc/ppp/ppp-connect - fi -} - -# fixup after old update-rc.d -if [ -f /etc/rc2.d/K20ppp ] ; then - echo Fixing up start/stop scripts - rm -f /etc/rc2.d/K20ppp - rm -f /etc/rc3.d/K20ppp - rm -f /etc/rc4.d/K20ppp - rm -f /etc/rc5.d/K20ppp -fi - -# get rid of old /etc/cron.daily/ppp -test -f /etc/cron.daily/ppp && rm -f /etc/cron.daily/ppp - -# install /etc/ppp/pap-secrets and /etc/ppp/chap-secrets from templates, -# if necessary -if [ ! -f /etc/ppp/chap-secrets ];then - install -m 600 /usr/share/ppp/chap-secrets /etc/ppp -fi -if [ ! -f /etc/ppp/pap-secrets ];then - install -m 600 /usr/share/ppp/pap-secrets /etc/ppp -fi - -# install template provider files. -if [ ! -f /etc/ppp/peers/provider ];then - install -g dip -m 640 /usr/share/ppp/provider.peer \ - /etc/ppp/peers/provider -fi -if [ ! -f /etc/chatscripts/provider ];then - install -g dip -m 640 /usr/share/ppp/provider.chatscript \ - /etc/chatscripts/provider -fi - - -# setup hostname in /etc/ppp/pap-secrets and /etc/ppp/options.ttyXX -HOST="`hostname`" -for i in /etc/ppp/pap-secrets /etc/ppp/options.ttyXX; do - if grep -q hostname $i; then - tmp=$i.tmp-$$ - cp $i $tmp - sed -e "s/hostname/$HOST/g" <$tmp >$i - rm $tmp - fi -done - -if [ -f /etc/ppp.options_out -a -f /etc/ppp.chatscript ]; then - echo "Converting old dialup setup to new setup" - mv /etc/ppp.chatscript /etc/chatscripts/provider - X=`cat /etc/ppp.options_out` - cat >/etc/ppp/peers/provider <<-!EOF! - # The chatscript (be sure to edit that file too) - connect "/usr/sbin/chat -v -f /etc/chatscripts/provider" - $X -!EOF! - rm /etc/ppp.options_out - chmod 640 /etc/chatscripts/provider /etc/ppp/peers/provider - chgrp dip /etc/chatscripts/provider /etc/ppp/peers/provider -fi - -if [ -f /var/log/ppp.log ]; then - chown root.adm /var/log/ppp.log - chmod 640 /var/log/ppp.log -fi -if [ -f /var/log/ppp-connect-errors ]; then - chown root.adm /var/log/ppp-connect-errors - chmod 640 /var/log/ppp-connect-errors -fi - -# lets make the /dev/ppp node if we dont have devfs -if [ ! -c /dev/ppp -a ! -c /dev/.devfsd ]; then - cd /dev && /sbin/MAKEDEV ppp - # braindead makedev - group dip, not dialout. - chgrp dip /dev/ppp -fi - -# fix the perms on all sensitive files. -# FIXME - this could be bad :) (if you dont see why, you're a moron) -if [ -e /etc/ppp/pap-secrets ]; then - chown root.dip /etc/ppp/pap-secrets - chmod 0600 /etc/ppp/pap-secrets -fi -if [ -e /etc/ppp/chap-secrets ]; then - chown root.dip /etc/ppp/chap-secrets - chmod 0600 /etc/ppp/chap-secrets -fi -if [ -e /etc/ppp/peers/provider ]; then - chown root.dip /etc/ppp/peers/provider - chmod 0640 /etc/ppp/peers/provider -fi -if [ -e /etc/chatscripts/provider ]; then - chown root.dip /etc/chatscripts/provider - chmod 0640 /etc/chatscripts/provider -fi - -#DEBHELPER# diff -Nru ppp-2.4.1.uus/debian/postrm ppp-2.4.2+20040202/debian/postrm --- ppp-2.4.1.uus/debian/postrm 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = "purge" ]; then - rm -rf /etc/ppp /etc/chatscripts -fi - -#DEBHELPER# diff -Nru ppp-2.4.1.uus/debian/ppp-dev.dirs ppp-2.4.2+20040202/debian/ppp-dev.dirs --- ppp-2.4.1.uus/debian/ppp-dev.dirs 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp-dev.dirs 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1 @@ +usr/include/net/ diff -Nru ppp-2.4.1.uus/debian/ppp-udeb.postinst ppp-2.4.2+20040202/debian/ppp-udeb.postinst --- ppp-2.4.1.uus/debian/ppp-udeb.postinst 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp-udeb.postinst 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,92 @@ +#!/bin/sh -e + +# TODO: +# - what about resolv.conf? usepeerdns is enabled + +. /usr/share/debconf/confmodule + +INTERFACES=$(grep : /proc/net/dev | cut -d':' -f1 | sort | sed -e 's/ *//' | grep -E '^(eth|nas|tap|nic-)') +INTERFACES=$(echo $INTERFACES | sed -e 's/ /, /g') + +if [ -z "$INTERFACES" ]; then + # XXX FIXME + echo "No ethernet interfaces found!" + exit 1 +fi + +db_subst ppp/interface INTERFACES "$INTERFACES" +db_input high ppp/interface || true +db_go || true +db_get ppp/interface +INTERFACE="$RET" + +db_input high ppp/username || true +db_go || true +db_get ppp/username +USERNAME="$RET" + +db_input high ppp/password || true +db_go || true +db_get ppp/password +PASSWORD="$RET" + +# XXX just to be sure that the answers will not be cached if the script +# is run a second time +db_purge + +db_stop + +cat < /etc/ppp/peers/pppoe +# kernel space PPPoE driver example configuration +# +# See the manual page pppd(8) for information on all the options. + +# MUST CHANGE: Uncomment the following line, replacing the user@provider.net +# by the DSL user name given to your by your DSL provider. +# There should be a matching entry with the password in /etc/ppp/pap-secrets +# and/or /etc/ppp/chap-secrets. +#user "myusername@myprovider.net" +user "$USERNAME" + +# Load the pppoe plugin. Change the ethernet interface name if needed. +plugin rp-pppoe.so +$INTERFACE + +# Assumes that your IP address is allocated dynamically by the ISP. +noipdefault +# Try to get the name server addresses from the ISP. +usepeerdns +# Use this connection as the default route. +# Comment out if you already have the correct default route installed. +defaultroute + +# Makes pppd "dial again" when the connection is lost. +persist + +# Do not ask the remote to authenticate. +noauth + +# RFC 2516, paragraph 7 mandates that the following options MUST NOT be +# requested and MUST be rejected if requested by the peer: +# Address-and-Control-Field-Compression (ACFC) +noaccomp +# Asynchronous-Control-Character-Map (ACCM) +default-asyncmap + +# Do not try to negotiate other kinds of compression. +nopcomp +noccp +novj +EOF + +cat < /etc/ppp/pap-secrets +#GENERATED-BY-DEBIAN-INSTALLER# +$USERNAME * $PASSWORD +EOF +cp /etc/ppp/pap-secrets /etc/ppp/chap-secrets + +pppd call pppoe + +#DEBHELPER# + +exit 0 diff -Nru ppp-2.4.1.uus/debian/ppp-udeb.templates ppp-2.4.2+20040202/debian/ppp-udeb.templates --- ppp-2.4.1.uus/debian/ppp-udeb.templates 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp-udeb.templates 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,17 @@ +Template: debian-installer/ppp-udeb/title +Type: text +_Description: Configure and start PPPoE networking + +Template: ppp/interface +Type: select +Choices: ${INTERFACES} +_Description: Interface name + Choose the name of the network interface connected to your PPPoE modem. + +Template: ppp/username +Type: string +_Description: Your username + +Template: ppp/password +Type: password +_Description: Your password diff -Nru ppp-2.4.1.uus/debian/ppp.dirs ppp-2.4.2+20040202/debian/ppp.dirs --- ppp-2.4.1.uus/debian/ppp.dirs 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp.dirs 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,10 @@ +etc/bash_completion.d/ +etc/apm/event.d/ +etc/ppp/peers/ +etc/chatscripts/ +etc/ppp/ip-up.d/ +etc/ppp/ip-down.d/ +etc/ppp/ipv6-up.d/ +etc/ppp/ipv6-down.d/ +usr/share/ppp/ +usr/bin/ diff -Nru ppp-2.4.1.uus/debian/ppp.init ppp-2.4.2+20040202/debian/ppp.init --- ppp-2.4.1.uus/debian/ppp.init 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp.init 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,48 @@ +#!/bin/sh -e +# +# /etc/init.d/ppp: start or stop PPP link. +# +# This configuration method is deprecated, please use /etc/network/interfaces. + +[ -x /usr/sbin/pppd -a -f /etc/ppp/ppp_on_boot ] || exit 0 +if [ -x /etc/ppp/ppp_on_boot ]; then RUNFILE=1; fi + +case "$1" in + start) + echo -n "Starting up PPP link: pppd" + if [ "$RUNFILE" = "1" ]; then + /etc/ppp/ppp_on_boot + else + pppd call provider + fi + echo "." + ;; + stop) + echo -n "Shutting down PPP link: pppd" + if [ "$RUNFILE" = "1" ]; then + poff -a + else + poff provider + fi + echo "." + ;; + restart|force-reload) + echo -n "Restarting PPP link: pppd" + if [ "$RUNFILE" = "1" ]; then + poff -a + sleep 5 + /etc/ppp/ppp_on_boot + else + poff provider + sleep 5 + pppd call provider + fi + echo "." + ;; + *) + echo "Usage: /etc/init.d/ppp {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff -Nru ppp-2.4.1.uus/debian/ppp.links ppp-2.4.2+20040202/debian/ppp.links --- ppp-2.4.1.uus/debian/ppp.links 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp.links 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,2 @@ +usr/share/man/man1/pon.1 usr/share/man/man1/poff.1 +usr/share/man/man1/pon.1 usr/share/man/man1/plog.1 diff -Nru ppp-2.4.1.uus/debian/ppp.logrotate ppp-2.4.2+20040202/debian/ppp.logrotate --- ppp-2.4.1.uus/debian/ppp.logrotate 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp.logrotate 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,9 @@ +/var/log/ppp-connect-errors { + weekly + rotate 4 + missingok + notifempty + compress + nocreate +} + diff -Nru ppp-2.4.1.uus/debian/ppp.pam ppp-2.4.2+20040202/debian/ppp.pam --- ppp-2.4.1.uus/debian/ppp.pam 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp.pam 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,6 @@ +#%PAM-1.0 +# Information for the PPPD process with the 'login' option. +auth required pam_nologin.so +@include common-auth +@include common-account +@include common-session diff -Nru ppp-2.4.1.uus/debian/ppp.postinst ppp-2.4.2+20040202/debian/ppp.postinst --- ppp-2.4.1.uus/debian/ppp.postinst 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp.postinst 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,63 @@ +#!/bin/sh -e + +# install /etc/ppp/pap-secrets and /etc/ppp/chap-secrets from templates, +# if necessary +for file in pap-secrets chap-secrets; do + if [ -f /etc/ppp/$file ]; then + TAG=$(head -n 1 /etc/ppp/$file) + if [ "$TAG" = "#GENERATED-BY-DEBIAN-INSTALLER#" ]; then + (sed -e "s/-HOSTNAME-/$HOST/g" /usr/share/ppp/$file; \ + cat /etc/ppp/$file) > /etc/ppp/$file.tmp + mv /etc/ppp/$file.tmp /etc/ppp/$file + fi + else + sed -e "s/-HOSTNAME-/$HOST/g" < /usr/share/ppp/$file > /etc/ppp/$file + fi + chown root:root /etc/ppp/$file + chmod 600 /etc/ppp/$file +done + +# install template provider files +if [ ! -f /etc/ppp/peers/provider ]; then + cp /usr/share/ppp/provider.peer \ + /etc/ppp/peers/provider + chgrp dip /etc/ppp/peers/provider + chmod 640 /etc/ppp/peers/provider +fi +if [ ! -f /etc/chatscripts/provider ]; then + cp /usr/share/ppp/provider.chatscript \ + /etc/chatscripts/provider + chgrp dip /etc/chatscripts/provider + chmod 640 /etc/chatscripts/provider +fi + +# fix the log files permissions +LOG_FILES="/var/log/ppp.log /var/log/ppp-connect-errors" +for file in $LOG_FILES; do + [ -e $file ] || continue + chown root:adm $file + chmod 640 $file +done + +# create /dev/ppp if we are not using devfs +if [ ! -c /dev/.devfsd -a ! -c /dev/ppp ]; then + cd /dev && /sbin/MAKEDEV ppp +fi + +case "$1" in + configure) + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + diff -Nru ppp-2.4.1.uus/debian/ppp.postrm ppp-2.4.2+20040202/debian/ppp.postrm --- ppp-2.4.1.uus/debian/ppp.postrm 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp.postrm 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,34 @@ +#!/bin/sh -e + +delete_etc_files() { + rm -f /etc/ppp/pap-secrets /etc/ppp/chap-secrets /etc/ppp/resolv.conf \ + /etc/ppp/peers/provider /etc/chatscripts/provider +} + +delete_var_files() { + rm -f /var/log/ppp.log /var/log/ppp-connect-errors \ + /var/log/ppp-ipupdown.log +} + +case "$1" in + remove) + ;; + + purge) + delete_etc_files + delete_var_files + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + diff -Nru ppp-2.4.1.uus/debian/ppp.pppd-dns ppp-2.4.2+20040202/debian/ppp.pppd-dns --- ppp-2.4.1.uus/debian/ppp.pppd-dns 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp.pppd-dns 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,8 @@ +#!/bin/sh -e +# +# Restore /etc/resolv.conf if the system crashed before the ppp link +# was shut down. + +[ -x /etc/ppp/ip-down.d/0000usepeerdns ] \ + && exec /etc/ppp/ip-down.d/0000usepeerdns + diff -Nru ppp-2.4.1.uus/debian/ppp.preinst ppp-2.4.2+20040202/debian/ppp.preinst --- ppp-2.4.1.uus/debian/ppp.preinst 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp.preinst 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,26 @@ +#!/bin/sh -e + +# Remove the diversions on /usr/sbin/pppd caused by old ppp-pam package. + +if dpkg-divert --list /usr/sbin/pppd | grep -q "diversion of /usr/sbin/pppd to /usr/sbin/pppd.nopam by ppp-pam"; then + dpkg-divert --package ppp-pam --remove \ + --divert /usr/sbin/pppd.nopam /usr/sbin/pppd +fi + +if dpkg-divert --list /usr/sbin/pppd | grep -q "diversion of /usr/sbin/pppd to /usr/sbin/pppd.ppp-pam by ppp-pam"; then + dpkg-divert --package ppp-pam --remove --rename \ + --divert /usr/sbin/pppd.ppp-pam /usr/sbin/pppd +fi + +# Remove the old diverted files. +if [ -x /usr/sbin/pppd ]; then + rm -f /usr/sbin/pppd.nopam /usr/sbin/pppd.ppp-pam +fi + +# Remove wrong suidmanager entries caused by diverted files. +if command -v suidunregister >/dev/null 2>&1 && [ -e /etc/suid.conf ]; then + suidunregister -s ppp /usr/sbin/pppd.nopam + suidunregister -s ppp /usr/sbin/pppd.ppp-pam +fi + +#DEBHELPER# diff -Nru ppp-2.4.1.uus/debian/ppp.prerm ppp-2.4.2+20040202/debian/ppp.prerm --- ppp-2.4.1.uus/debian/ppp.prerm 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/ppp.prerm 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh -e + +# If we are removing ppp we have to stop all ppp's + +if [ "$1" = remove ]; then + echo -n "Stopping all PPP connections..." + start-stop-daemon --stop --oknodo --exec /usr/sbin/pppd || true + echo "done." +fi + +#DEBHELPER# diff -Nru ppp-2.4.1.uus/debian/preinst ppp-2.4.2+20040202/debian/preinst --- ppp-2.4.1.uus/debian/preinst 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -#!/bin/sh -e - -# Remove the diversions on /usr/sbin/pppd caused by old ppp-pam package. - -if dpkg-divert --list /usr/sbin/pppd | grep -q "diversion of /usr/sbin/pppd to /usr/sbin/pppd.nopam by ppp-pam"; then - dpkg-divert --package ppp-pam --remove \ - --divert /usr/sbin/pppd.nopam /usr/sbin/pppd -fi - -if dpkg-divert --list /usr/sbin/pppd | grep -q "diversion of /usr/sbin/pppd to /usr/sbin/pppd.ppp-pam by ppp-pam"; then - dpkg-divert --package ppp-pam --remove --rename \ - --divert /usr/sbin/pppd.ppp-pam /usr/sbin/pppd -fi - -# Remove the old diverted files. -if [ -x /usr/sbin/pppd ]; then - rm -f /usr/sbin/pppd.nopam /usr/sbin/pppd.ppp-pam -fi - -# Remove wrong suidmanager entries caused by diverted files. -if command -v suidunregister >/dev/null 2>&1 && [ -e /etc/suid.conf ]; then - suidunregister -s ppp /usr/sbin/pppd.nopam - suidunregister -s ppp /usr/sbin/pppd.ppp-pam -fi - -#DEBHELPER# diff -Nru ppp-2.4.1.uus/debian/prerm ppp-2.4.2+20040202/debian/prerm --- ppp-2.4.1.uus/debian/prerm 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh -e - -# If we are removing ppp we have to stop all ppp's - -if [ "$1" = remove ]; then - echo -n "Stopping all PPP connections..." - start-stop-daemon --stop --oknodo --exec /usr/sbin/pppd - echo "done." -fi - -#DEBHELPER# diff -Nru ppp-2.4.1.uus/debian/provider.chatscript ppp-2.4.2+20040202/debian/provider.chatscript --- ppp-2.4.1.uus/debian/provider.chatscript 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/provider.chatscript 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -# This is the chat script used to dial out to your default service provider. -# Please customize the entries enclosed in parenthesis to match your setup. -# Only the "provider" file will be handled by poff and pon (unless with -# extra command line arguments). -# -# Remember to edit /etc/ppp/peers/provider accordingly. -# -# ATZW2 as a default init string -# - On all hayes compatible modems, W2 will correctly report the connect -# speed. -# -ABORT BUSY -ABORT "NO CARRIER" -ABORT VOICE -ABORT "NO DIALTONE" -"" ATZW2 -OK ATDT -ogin -word \q diff -Nru ppp-2.4.1.uus/debian/provider.peer ppp-2.4.2+20040202/debian/provider.peer --- ppp-2.4.1.uus/debian/provider.peer 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/provider.peer 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -# These are the options to dial out to your default service provider. -# Please customize them correctly. Only the "provider" file will be -# handled by poff and pon (unless with extra command line arguments). - -# You usually need this if there is no PAP authentication -noauth - -# The chat script (be sure to edit that file, too!) -connect "/usr/sbin/chat -v -f /etc/chatscripts/provider" - -# Set up routing to go through this PPP link -defaultroute - -# Default modem (you better replace this with /dev/ttySx!) -/dev/modem - -# Speed -38400 - -# Keep modem up even if connection fails -persist diff -Nru ppp-2.4.1.uus/debian/rules ppp-2.4.2+20040202/debian/rules --- ppp-2.4.1.uus/debian/rules 2019-04-09 00:41:22.000000000 +0000 +++ ppp-2.4.2+20040202/debian/rules 2006-04-25 12:14:43.000000000 +0000 @@ -1,152 +1,211 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# merged with old ppp makefile. GNU copyright 1998 by Philip Hands. +SHELL=/bin/bash -e -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 -export DH_COMPAT=3 - -# package build dir. -builddir = $(CURDIR)/debian/ppp -builddir-udeb = $(CURDIR)/debian/ppp-udeb +export DH_VERBOSE=1 +export NOISY=1 -# patching stuff -patches=debian/patches-applied +#BUILD_UDEB := 1 + +include debian/scripts/vars + +BUILD_DIR := $(SOURCE_DIR)/$(TAR_DIR) +B := $(BUILD_DIR) +D := $(CURDIR)/debian/ppp + +ifdef BUILD_UDEB +PACKAGE := ppp-udeb +VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) +ARCH := $(shell dpkg --print-architecture) +FILENAME := $(PACKAGE)_$(VERSION)_$(ARCH).udeb +PRIORITY := $(shell grep ^Priority: debian/control | head -1 | cut -d ' ' -f 2) +endif + +# Use soft-float and thumb mode if it enabled. +ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS))) + CFLAGS += -mthumb +endif + +export CFLAGS # Various collections of files for use with dh_* tools. -DOCS=README.linux FAQ README SETUP PLUGINS README.MSCHAP80 README.cbcp \ - debian/README.STATIC-IP debian/README.win9x debian/kernel.fix-2.0.30-2 -EXAMPLES=scripts/ -CHANGELOGS=debian/changelog-from-README Changes-2.3 +DOCS := README.linux FAQ README SETUP PLUGINS README.MSCHAP80 README.cbcp +DOCS2 := README.STATIC-IP README.win9x defaultroute +all: build -# Compile source. -build: build-stamp -build-stamp: - dh_testdir - # have to do make clean since udeb and deb build in same area - -$(MAKE) clean - ./configure - $(MAKE) USE_PAM=y FILTER=y HAVE_INET6=y COPTS="-DLOG_PPP=LOG_LOCAL2" +unpack: $(STAMP_DIR)/unpack +$(STAMP_DIR)/unpack: + $(MAKE) -f debian/sys-build.mk source.make touch $@ -# Compile cut-down source for a udeb -build-udeb: build-stamp-udeb -build-stamp-udeb: +# used by the maintainer +unpack.nopatch: + $(MAKE) -f debian/sys-build.mk source.build + +# used by the maintainer +diff: + $(MAKE) -f debian/sys-build.mk make-diff + +clean: + $(MAKE) -f debian/sys-build.mk source.clean + dh_clean + + +configure: $(STAMP_DIR)/configure +$(STAMP_DIR)/configure: $(STAMP_DIR)/unpack dh_testdir - # udeb clean: - # have to do make clean since udeb and deb build in same area -$(MAKE) clean - ./configure - $(MAKE) COPTS="-DLOG_PPP=LOG_LOCAL2" UDEB_CFLAGS="-Os -fomit-frame-pointer -UPPP_FILTER -UHAVE_MULTILINK" + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + ./configure \ + " touch $@ -# -# clean source tree -# -clean: +build: $(STAMP_DIR)/build +$(STAMP_DIR)/build: $(STAMP_DIR)/configure dh_testdir - test -f $(patches) # maintainer sanity check - -$(MAKE) dist-clean - -$(RM) build-stamp-udeb build-stamp - dh_clean debian/changelog-from-README - - -binary-indep: -# We have nothing to do, no architecture-independent packages here. - - -# -# Build the package! -# -binary-arch: ppp ppp-udeb -ppp: build - # dh_testversion + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + $(MAKE) USE_PAM= FILTER= HAVE_INET6= CBCP= \ + " + touch $@ + +udeb: build-udeb +build-udeb: $(STAMP_DIR)/build-udeb +$(STAMP_DIR)/build-udeb: $(STAMP_DIR)/configure +ifdef BUILD_UDEB + dh_testdir + cd $B && if [ ! -d pppd-udeb/ ]; then \ + mkdir pppd-udeb/ && \ + cd pppd-udeb/ && \ + chmod +x $(CURDIR)/extra/lndir.sh && \ + $(CURDIR)/extra/lndir.sh ../pppd && \ + $(MAKE) clean && \ + cd plugins && $(MAKE) clean ; \ + fi + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + cd pppd-udeb/ && \ + $(MAKE) COPTS=\"-Os -fomit-frame-pointer\" \ + CHAPMS= USE_CRYPT= NO_CRYPT_HACK=1 MPPE= \ + FILTER= HAVE_MULTILINK= USE_TDB= \ + HAS_SHADOW= USE_PAM= HAVE_INET6= \ + CBCP= USE_SRP= MAXOCTETS= \ + && \ + cd plugins/ && \ + $(MAKE) COPTS=\"-Os -fomit-frame-pointer\" \ + SUBDIRS=rp-pppoe PLUGINS= \ + " +endif + touch $@ + +install: $(STAMP_DIR)/build $(STAMP_DIR)/build-udeb checkroot dh_testdir - dh_testroot dh_clean -k dh_installdirs - $(MAKE) install DESTDIR=$(builddir) MANDIR='$$(DESTDIR)/usr/share/man' + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + $(MAKE) install DESTDIR=$D MANDIR='$D/usr/share/man' \ + " + + { echo "Changelog extracted from README file:" ; \ + echo ; \ + sed -e "/^What's new in ppp-/,/package, see the Changes-2.3 file./!d" $B/README ; \ + } > $B/changelog-from-README + +binary-arch: install + rm -rf $D/etc/ppp/*-secrets $D/usr/include/ + + install -m755 extra/pon extra/plog extra/poff $D/usr/bin/ + cp extra/pon.completion $D/etc/bash_completion.d/pon + + cp extra/options $D/etc/ppp/ + install -m755 extra/ip-up extra/ip-down extra/ipv6-up extra/ipv6-down \ + $D/etc/ppp/ + install -m755 extra/0000usepeerdns-up $D/etc/ppp/ip-up.d/0000usepeerdns + install -m755 extra/0000usepeerdns-down \ + $D/etc/ppp/ip-down.d/0000usepeerdns + install -m755 extra/apm $D/etc/apm/event.d/ppp + + install -m644 extra/pap-secrets extra/chap-secrets \ + extra/provider.peer extra/provider.chatscript \ + $D/usr/share/ppp/ + install -m644 extra/chatscript.pap $D/etc/chatscripts/pap + + dh_installchangelogs -p ppp \ + $B/changelog-from-README Changes-2.3 + dh_installdocs -p ppp \ + $(addprefix $B/,$(DOCS)) $(addprefix extra/,$(DOCS2)) + dh_installexamples $B/scripts/ extra/autopppd extra/userscripts-* \ + extra/popp extra/filters extra/options.ttyXX \ + extra/peers-pppoe extra/per-linkname + # use our own version, not the upstream one + mv $D/usr/share/doc/ppp/examples/autopppd \ + $D/usr/share/doc/ppp/examples/scripts/ + dh_installman extra/pon.1 + dh_link + dh_installlogrotate + dh_installinit --init-script=pppd-dns --no-start \ + --update-rcd-params='start 38 S .' + dh_installinit --no-start \ + --update-rcd-params='start 14 2 3 4 5 . stop 86 0 1 6 .' + + dh_strip -a + dh_compress -a + dh_fixperms -a + + chown root:dip $D/usr/sbin/pppd \ + $D/etc/ppp/ $D/etc/ppp/peers/ $D/etc/chatscripts/ + chmod 4754 $D/usr/sbin/pppd + chmod 2750 $D/etc/ppp/peers/ $D/etc/chatscripts/ + + dh_md5sums -a + dh_shlibdeps -a --exclude=pppoatm.so + dh_installdeb -a + +# ppp ############################### + dh_gencontrol -p ppp + dh_builddeb -p ppp + +ifdef BUILD_UDEB +# ppp-udeb ########################## + dh_installdirs -p ppp-udeb etc/ppp/peers/ usr/sbin/ \ + usr/lib/pppd/2.4.2b3/ usr/lib/prebaseconfig.d/ + grep '^[a-zA-Zo-9]' extra/options > $D/etc/ppp/options +# cp $B/chat/chat $D-udeb/usr/sbin/ + cp $B/pppd-udeb/pppd $D-udeb/usr/sbin/ + cp $B/pppd-udeb/pppd $D-udeb/usr/sbin/ + cp $B/pppd-udeb/plugins/rp-pppoe/rp-pppoe.so \ + $D-udeb/usr/lib/pppd/2.4.2b3/ + cp extra/prebaseconfig $D-udeb/usr/lib/prebaseconfig.d/60pppoe + + dh_installdeb -p ppp-udeb + dh_installdebconf -p ppp-udeb +# Don't write your stupid guesses to debian/files. + dh_gencontrol -p ppp-udeb -- -fdebian/files~ +# Register file manually. + dpkg-distaddfile $(FILENAME) debian-installer $(PRIORITY) + dh_builddeb -p ppp-udeb --filename=$(FILENAME) +endif + +binary-indep: install + dh_installchangelogs -i \ + $B/changelog-from-README Changes-2.3 + dh_installdocs -i + + cp $(addprefix $B/include/net/,pppio.h *compress.h) \ + $(addprefix $B/pppd/,pppd.h fsm.h lcp.h ipcp.h patchlevel.h) \ + $D-dev/usr/include/net/ + + dh_compress -i + dh_fixperms -i + + dh_installdeb -i + dh_gencontrol -i + dh_builddeb -i - cd $(builddir)/etc/ppp && rm -f pap-secrets chap-secrets - cp include/net/pppio.h include/net/*compress.h $(builddir)/usr/include/net - cd debian && install -m644 options options.ttyXX no_ppp_on_boot $(builddir)/etc/ppp - cd debian && install -m755 ip-up ip-down $(builddir)/etc/ppp - cd debian && install -m755 pon plog poff $(builddir)/usr/bin - cd debian && install -m644 pon.1 $(builddir)/usr/share/man/man1 - cd $(builddir)/usr/share/man/man1 && ln -s pon.1 poff.1 && ln -s pon.1 plog.1 - # install template files. - install -m644 etc.ppp/chap-secrets debian/pap-secrets debian/provider.peer debian/provider.chatscript $(builddir)/usr/share/ppp/ - - { echo "Changelog extracted from README file:" ; echo ; sed -e "/^What's new in ppp-/,/package, see the Changes-2.3 file./!d" README ; } > debian/changelog-from-README - - dh_installdocs -p$@ $(DOCS) - dh_installexamples $(EXAMPLES) - dh_installchangelogs -p$@ $(CHANGELOGS) - dh_installmodules -p$@ - dh_installinit --no-restart-on-upgrade --update-rcd-params='start 14 2 3 4 5 . stop 14 0 1 6 .' - cp pppd/ppp.pam $(builddir)/etc/pam.d/ppp - dh_strip - dh_compress - dh_fixperms - chmod -R g-ws $(builddir) - # Special permissions - chown root.dip $(builddir)/usr/sbin/pppd - chmod 4754 $(builddir)/usr/sbin/pppd - chown root.dip $(builddir)/etc/ppp $(builddir)/etc/ppp/peers $(builddir)/etc/chatscripts - chmod 750 $(builddir)/etc/ppp - chmod 2750 $(builddir)/etc/ppp/peers $(builddir)/etc/chatscripts - dh_shlibdeps - dh_gencontrol -p$@ - dh_installdeb - dh_md5sums - dh_builddeb -p$@ - -PACKAGE=ppp-udeb -VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) -ARCH=$(shell dpkg --print-architecture) -FILENAME=$(PACKAGE)_$(VERSION)_$(ARCH).udeb -PRIORITY=$(shell grep ^Priority: debian/control | cut -d ' ' -f 2) - - -ppp-udeb: build-udeb - mkdir -p ./debian/$@ - $(MAKE) install DESTDIR=$(builddir-udeb) - $(RM) -r $(builddir-udeb)/usr/man/ - $(RM) -r $(builddir-udeb)/usr/sbin/pppdump - $(RM) -r $(builddir-udeb)/usr/sbin/pppstats - @echo "Building $@" - dh_testdir - dh_testroot - dh_installdirs - dh_strip -p$@ - dh_compress -p$@ - dh_fixperms -p$@ - dh_installdeb -p$@ - dh_shlibdeps -p$@ - # Don't write your stupid guesses to debian/files. - dh_gencontrol -p$@ -- -fdebian/files~ - # Register file manually. - dpkg-distaddfile $(FILENAME) debian-installer $(PRIORITY) - dh_md5sums -p$@ - dh_builddeb -p$@ --filename=$(FILENAME) - - -# Various source manipulation -patch: - test ! -f $(patches) # already patched - ls debian/patches/* >$(patches) - (for i in `cat $(patches)`;do cat $$i | patch -p1; done) - -unpatch: - test -f $(patches) # not patched - (for i in `tac $(patches)`;do cat $$i | patch -Rp1;done) - -$(RM) $(patches) - +checkroot: + test root = "`whoami`" -binary: binary-indep binary-arch -.PHONY: binary binary-arch binary-indep clean +binary: binary-arch +.PHONY: binary binary-arch binary-indep unpack configure build clean checkroot diff -Nru ppp-2.4.1.uus/debian/scripts/Makefile ppp-2.4.2+20040202/debian/scripts/Makefile --- ppp-2.4.1.uus/debian/scripts/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/scripts/Makefile 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,11 @@ +#!/usr/bin/make -f +all: sh.vars mk.vars + +clean: + rm -f sh.vars mk.vars + +mk.vars: vars.build vars + $(SHELL) vars.build vars make > $@ +sh.vars: vars.build vars + $(SHELL) vars.build vars shell > $@ + diff -Nru ppp-2.4.1.uus/debian/scripts/archmap ppp-2.4.2+20040202/debian/scripts/archmap --- ppp-2.4.1.uus/debian/scripts/archmap 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/scripts/archmap 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,22 @@ +#!/bin/sh +# i486 i386 i486 i586 pentium pentiumpro +if [ $(basename $0) = archmap ];then + if [ -z $1 ];then + arch=$(dpkg --print-gnu-build-architecture) + else + arch=$1 + fi +else + if [ -z $arch ];then + arch=$(dpkg --print-gnu-build-architecture) + fi +fi +set -- $(egrep ".* $arch( .*|$)" debian/scripts/archmap) +if [ -z $2 ];then + arch=$arch +else + arch=$2 +fi +if [ $(basename $0) = archmap ];then + echo $arch +fi diff -Nru ppp-2.4.1.uus/debian/scripts/getglibcversion ppp-2.4.2+20040202/debian/scripts/getglibcversion --- ppp-2.4.1.uus/debian/scripts/getglibcversion 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/scripts/getglibcversion 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,56 @@ +#!/bin/sh +# GNU C library version detection shell script. +# Copyright 1999 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# This script probably makes about a billion too many assumptions, but it's +# better than hardcoding the glibc version on a per-architecture basis. + +set -e + +usage () { + echo "Usage: getglibcversion [option]" + echo " Where [option] may be one of:" + echo " --major return major version only" + echo " --minor return minor version only" + echo " --point return ittybitty version only" + echo "With no option, returns major.minor.ittybitty ."; +} + +case $# in + 0) ;; + 1) case $1 in + --help) usage + exit 0 ;; + --major) RETURN=1 ;; + --minor) RETURN=2 ;; + --point) RETURN=3 ;; + *) exec 1>&2 + usage + exit 1 ;; + esac ;; + *) exec 1>&2 + usage + exit 1 ;; +esac + +LIBCLIST=$(cd /lib && ls libc-*.so) + +case $(echo $LIBCLIST | wc -l | awk '{print $1}') in + 0) echo "No GNU C library found! Aborting." >&2 + exit 1 ;; + 1) ;; + *) echo "Multiple versions of GNU C library found! Aborting." >&2 + exit 1 ;; +esac + +LIBCVERSION=$(echo $LIBCLIST | sed 's/libc-//;s/\.so//') + +if [ -z $RETURN ]; then + echo $LIBCVERSION +else + echo $LIBCVERSION | cut -d. -f$RETURN +fi + +exit 0 diff -Nru ppp-2.4.1.uus/debian/scripts/lib ppp-2.4.2+20040202/debian/scripts/lib --- ppp-2.4.1.uus/debian/scripts/lib 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/scripts/lib 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,200 @@ +#!/bin/sh +if [ $(basename $0) = lib ];then + make -C debian/scripts sh.vars + . debian/scripts/sh.vars +fi +fetchmsg() { + local msg + msg=$1;shift + eval echo $(sed -ne "s/^$(BASENAME):$msg://p" debian/scripts/messages) +} +START() { + echo -n "$(fetchmsg START "$@") " +} +OK() { + fetchmsg OK "$@" +} +FAILED() { + fetchmsg FAILED "$@" +} +ALREADY_DONE() { + fetchmsg ALREADY_DONE "$@" +} + +BASENAME() { + local base + if [ "$cmd" ];then + base=$cmd + else + base=${0##*/} + fi + if [ x$base = x ];then + echo "Danger, Will Robinson, Danger!" 1>&2 + echo "Bash is very confused." 1>&2 + exit 1 + fi + if [ x$base = xlib ];then + echo "You can't call this directly." 1>&2 + echo "This is a library that should be sourced." 1>&2 + exit 1 + fi + echo $base +} +file2cat() { + $(decompress_prog $1) $1 +} +debug() { + echo "$@" + eval "$@" +} +decompress_prog() { + local which + which="cat" + [ $1 != ${1%.tgz} -o $1 != ${1%.gz} -o $1 != ${1%.Z} ] && which="gunzip -c" + [ $1 != ${1%.bz2} ] && which="bunzip2 -c" + [ $1 != ${1%.bz} ] && which="bunzip -c" + echo $which +} +compress_ext() { + local which + which="" + [ $1 != ${1%.gz} ] && which=gz + [ $1 != ${1%.Z} ] && which=Z + [ $1 != ${1%.bz2} ] && which=bz2 + [ $1 != ${1%.bz} ] && which=bz + echo $which +} +filetype_detect() { + local which f + which="" + f=$(echo "$1" | sed 's|:::.*||') + [ $f != ${f%.jar} ] && which=jarfile + [ $f != ${f%.zip} ] && which=zipfile + [ $f != ${f%.tgz} ] && which=tarball + [ $f != ${f%.tar.$(compress_ext $f)} ] && which=tarball + [ $f != ${f%.tar} ] && which=tarball + [ $f != ${f%.diff.$(compress_ext $f)} -o $1 != ${1%.patch.$(compress_ext $1)} ] && which=patch + [ $f != ${f%.diff} -o $1 != ${1%.patch} ] && which=patch + [ $f != ${f%.dsc} ] && which=dsc + echo $which +} +extract_tar() { + local which file dir curd + dir="$1" + shift + curd=$(pwd) + while [ $# -gt 0 ];do + file="$1" + [ "$file" = "${1#/}" ] && file="$curd/$file" + case "$(filetype_detect $file)" in + "jarfile") (cd $dir;fastjar -xf $file);; + "zipfile") (cd $dir;miniunzip -x $file);; + "tarball") $(decompress_prog $file) $file | (cd $dir;tar xvf -);; + *) echo "unsupported tarball";; + esac + shift + done +} + +do.patching() { + filetmpl=\$d/\$f + reversesort="" + reversepatch="" + + case "$cmd" in + source.patch) + mkdir -p $SOURCE_DIR/$TAR_DIR + patch_dirs="$SRC_PATCH_DIR $SRC_ADD_PATCH_DIR" + stampfiletmpl=\$STAMP_DIR/\$d/\$f + logtmpl=\$STAMP_DIR/log/\$d/\$f + dirprep="\$STAMP_DIR/log/\$d \$STAMP_DIR/\$d" + patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR + ;; + patch.apply) + mkdir -p $SOURCE_DIR/$TAR_DIR $STAMP_DIR/patches + patch_dirs="$PATCH_DIR $ADD_PATCH_DIR" + stampfiletmpl=\$STAMP_DIR/patches/\$f + logtmpl=\$STAMP_DIR/log/\$d/\$f + dirprep=\$STAMP_DIR/log/\$d + patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR + ;; + fix.source.patch) + if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then + exit + fi + mkdir -p $STAMP_DIR/fixpatch + patch_dirs=debian/fixpatch + stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)" + logtmpl=\$STAMP_DIR/log/fixpatch/\$f + dirprep=\$STAMP_DIR/log/fixpatch + patchapplydirtmpl=upstream + ;; + unfix.source.patch) + if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then + exit + fi + mkdir -p $STAMP_DIR/fixpatch + patch_dirs=debian/fixpatch + stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)" + logtmpl=\$STAMP_DIR/log/fixpatch/\$f + dirprep=\$STAMP_DIR/log/fixpatch + patchapplydirtmpl=upstream + reversesort=-r + reversepatch=-R + ;; + esac + for d in $patch_dirs;do + if [ ! -d $d ];then + continue + fi + eval mkdir -p $dirprep + # '-maxdepth 1' is to avoid using files from CVS directory + # kvalo 20040909 + for f in `(cd $d >/dev/null;find -type f ! -name 'chk-*' -maxdepth 1 2>/dev/null )|sort $reversesort`;do + eval stampfile=$stampfiletmpl + eval log=$logtmpl + eval file=$filetmpl + eval patchapplydir=$patchapplydirtmpl + if [ ! -e $stampfile ];then + START $file + if file2cat $file | (cd $patchapplydir;patch -p1 $reversepatch) > $log;then + OK $file + touch $stampfile + else + FAILED $file + exit 1 + fi + else + ALREADY_DONE $file + fi + done + done + +} +# +# External api functions. +# + +source.clean() { + if [ "$DBS_UNIFIED" ];then + exit + fi + rm -rf $SOURCE_DIR $STAMP_DIR/upstream $STAMP_DIR/patches + rm -f $STAMP_DIR/{source.{clean,build,make}} + return +if [ x$SOURCE_DIR = x ];then + files=`find -type f -maxdepth 1 -mindepth 1` + dirs=`find -type d -maxdepth 1 -mindepth 1 ! -name 'debian' ! -name 'upstream'` + echo files=\"$files\" + echo dirs=\"$dirs\" +fi + +} +source.patch() { cmd=source.patch; do.patching; } +fix.source.patch() { cmd=fix.source.patch; do.patching; } +unfix.source.patch() { cmd=unfix.source.patch; do.patching; } +patch.apply() { cmd=patch.apply; do.patching; } + +if [ $(basename $0) = lib ];then + $1 +fi diff -Nru ppp-2.4.1.uus/debian/scripts/messages ppp-2.4.2+20040202/debian/scripts/messages --- ppp-2.4.1.uus/debian/scripts/messages 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/scripts/messages 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,29 @@ +fix.source.patch:START:"Fixing upstream patch $1" +fix.source.patch:OK:"successful." +fix.source.patch:FAILED:"failed!" +fix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already applied!" + +unfix.source.patch:START:"Unfixing upstream patch $1 +unfix.source.patch:OK:"successful." +unfix.source.patch:FAILED:"failed! +unfix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already reversed!" + +patch.unapply:START:"Reversing patch $1" +patch.unapply:OK:"successful." +patch.unapply:FAILED:"failed!" +patch.unapply:ALREADY_DONE:"Patch $1 not applied!" + +patch.apply:START:"Applying patch $1" +patch.apply:OK:"successful." +patch.apply:FAILED:"failed!" +patch.apply:ALREADY_DONE:"Patch $1 already applied!" + +source.patch:START:"Applying upstream patch $1" +source.patch:OK:"successful." +source.patch:FAILED:"failed!" +source.patch:ALREADY_DONE:"upstream patch $1 already applied!" + +source.unpack:START:"Extracting upstream tarball $1" +source.unpack:OK:"successful." +source.unpack:FAILED:"failed!" +source.unpack:ALREADY_DONE:"upstream tarball $1 already extracted!" diff -Nru ppp-2.4.1.uus/debian/scripts/source.unpack ppp-2.4.2+20040202/debian/scripts/source.unpack --- ppp-2.4.1.uus/debian/scripts/source.unpack 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/scripts/source.unpack 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,32 @@ +#!/bin/sh +make -C debian/scripts sh.vars +. debian/scripts/sh.vars +. debian/scripts/lib + +mkdir -p $STAMP_DIR/upstream/tarballs/ $SOURCE_DIR +if [ ! -z "$SRC_TAR_DIR" -a -d "$SRC_TAR_DIR" ];then + files=$(find $SRC_TAR_DIR -type f|sort) +else + VER=$(dpkg-parsechangelog 2>&1|egrep ^Version|cut -d " " -f 2|cut -d "-" -f 1) + SRC=$(dpkg-parsechangelog 2>&1|egrep ^Source|cut -d " " -f 2-) + files=../${SRC}_${VER}.orig.tar.gz +fi +for f in $files;do + stampfile=$STAMP_DIR/upstream/tarballs/`basename $f` + if [ ! -e $stampfile ];then + START $f + if extract_tar ${SOURCE_DIR:-.} $f > $stampfile.log;then + if [ x$SOURCE_DIR = x ];then + mkdir -p $STAMP_DIR/upstream/files/tarballs + cp $stampfile.log $STAMP_DIR/upstream/files/tarballs/`basename $f`.list + fi + OK $f + touch $stampfile + else + FAILED $f + exit 1 + fi + else + ALREADY_DONE $f + fi +done diff -Nru ppp-2.4.1.uus/debian/scripts/vars ppp-2.4.2+20040202/debian/scripts/vars --- ppp-2.4.1.uus/debian/scripts/vars 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/scripts/vars 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,31 @@ +# This file is NOT a shell script. +# +# This file gets included by both debian/rules (make) AND the scripts in +# debian/scripts (bash) +# + +# Where to cd to to unpack all the tarballs. +SOURCE_DIR=build-tree +# For a single pkg, this is the directory that is embedded in the tarball. +# For multiple pkgs, this is null. +TAR_DIR=ppp +# Where to place all the stamp files. This directory can be removed, and +# all the targets will then be rerun. +STAMP_DIR=debian/stampdir +# When sys-build.mk is used to build the source, this is the target(s) to +# run. +BUILD_TARGET= +# When cleaning the source, during diff generation, if this is set, this +# target will be called in debian/rules. This allows for pkgs that have +# complicated cleaning rules. +CLEAN_TARGET_EXTERNAL=extra-clean +# Whether to die if the source cleaning fails. +CLEAN_IGNORE=yes +# The clean target to run. Defaults to clean. +CLEAN_TARGET=maintainer-clean +# Files to exclude from the diff. +DIFF_EXCLUDE="" +# Where the patches are located(duh!). +PATCH_DIR=debian/patches +SRC_PATCH_DIR=upstream/patches +SRC_TAR_DIR=upstream/tarballs diff -Nru ppp-2.4.1.uus/debian/scripts/vars.build ppp-2.4.2+20040202/debian/scripts/vars.build --- ppp-2.4.1.uus/debian/scripts/vars.build 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/scripts/vars.build 2006-04-25 12:08:45.000000000 +0000 @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +sed_cmd='' +cat $1 | while read REPLY; do + case "$REPLY" in + \#*|"") continue;; + *) + var=$(echo $REPLY|sed 's/\([^=]*\)=.*/\1/') + eval $REPLY + if [ $2 = "make" ]; then + eval echo "$var=\$$var" + else + eval echo "$var=\\\"\$$var\\\"" + fi + ;; + esac +done diff -Nru ppp-2.4.1.uus/debian/sys-build.mk ppp-2.4.2+20040202/debian/sys-build.mk --- ppp-2.4.1.uus/debian/sys-build.mk 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/sys-build.mk 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,167 @@ +#!/usr/bin/make -f +# Separate tarball/patch build system by Adam Heath + +# The magic targets that you need to concern yourself with are: +# +# source.build: Unpacks upstream tarballs, optionally applies patches +# to fix the upstream patches, then applies upstream +# patches. +# source.make: Applies debian patches. +# source.clean: Cleans the build directory, then unfixes the upstream +# patches. +# source.compile: Will compile the source for you. Please check +# debian/scripts/vars. +# source.cmd: When calling this target, if you define a variable +# SOURCE_CMD, it will run that command in the build +# tree. +# make-diff: Generates debian.diff in the current directory which +# contains all edits that are currently in the build +# tree. +# +# Nothing in this file should require any editting. Please look at +# debian/scripts/vars for things to change for the local environment. +# +# debian/rules target command +# ---------------------------------------------------------------- +# clean: $(MAKE) -f debian/sys-build.mk source.clean +# build: $(MAKE) -f debian/sys-build.mk source.compile +# for simple systems. +# build: $(MAKE) -f debian/sys-build.mk source.make +# and, in the rules file, you can +# build the targets you want. +SHELL=/bin/bash +ifndef NOISY +.SILENT: +endif + +include debian/scripts/vars +# remove quotes +DIFF_EXCLUDE:=$(patsubst %,-x %,$(shell echo $(DIFF_EXCLUDE))) + +ifdef TAR_DIR +BUILD_TREE=$(SOURCE_DIR)/$(TAR_DIR) +else +BUILD_TREE=$(SOURCE_DIR) +endif + +SOURCE_CMD=: + +ifdef CLEAN_IGNORE + CLEAN_CMD=- + CLEAN_SH= +else + CLEAN_CMD= + CLEAN_SH= +endif +ifndef CLEAN_TARGET + CLEAN_TARGET=clean +endif + +foo: + echo $(DIFF_EXCLUDE) + +make-diff: + mv $(BUILD_TREE) bak + $(MAKE) -f debian/sys-build.mk source.clean + $(MAKE) -f debian/sys-build.mk source.make + mv $(BUILD_TREE) $(BUILD_TREE).orig + mv bak $(BUILD_TREE) + +ifdef TAR_DIR +ifdef CLEAN_TARGET_EXTERNAL + $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL) +else + $(CLEAN_CMD)$(MAKE) -C $(BUILD_TREE) $(CLEAN_TARGET) +endif + -(cd $(SOURCE_DIR);diff -ruNp $(TAR_DIR).orig $(TAR_DIR) $(DIFF_EXCLUDE)) > debian.diff +else +ifdef CLEAN_TARGET_EXTERNAL + $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL) +else + $(CLEAN_CMD)for a in $(BUILD_TREE)/*;do $(MAKE) -C $$a $(CLEAN_TARGET);done +endif + -(diff -ruNp $(BUILD_TREE).orig $(BUILD_TREE) $(DIFF_EXCLUDE)) > debian.diff + if [ ! -s debian.diff ];then\ + rm debian.diff;\ + fi +endif + rm -rf $(BUILD_TREE).orig + +patchapply: $(STAMP_DIR)/patchapply +$(STAMP_DIR)/patchapply: $(STAMP_DIR)/source.build $(STAMP_DIR) + $(SHELL) debian/scripts/lib patch.apply + touch $@ + rm -f $(STAMP_DIR)/patchunapply + +patchunapply: $(STAMP_DIR)/patchunapply +$(STAMP_DIR)/patchunapply: $(STAMP_DIR)/source.build $(STAMP_DIR) + $(SHELL) debian/scripts/lib patch.unapply + touch $@ + rm -f $(STAMP_DIR)/patchapply + +.export: SOURCE_TREE + +# +# The rules that really do the work all start with $(STAMPDIR) +# This little trick allows us to use stamp files to keep us from +# having to rerun long targets over and over. It also puts +# all stamp files in one place, for easy cleaning. +# +# If a stampdir rule depends on something else, be sure it is +# another stampdir rule. Depending on base rule won't work. +# + +source.build: $(STAMP_DIR)/source.build +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.build +$(STAMP_DIR)/source.build: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/source.patch $(STAMP_DIR) + touch $@ + +source.make: $(STAMP_DIR)/source.make +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.make +$(STAMP_DIR)/source.make: $(STAMP_DIR)/source.build $(STAMP_DIR)/patchapply $(STAMP_DIR) + touch $@ + +source.unpack: $(STAMP_DIR)/source.unpack +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.unpack +$(STAMP_DIR)/source.unpack: $(STAMP_DIR) + $(SHELL) debian/scripts/source.unpack + touch $@ + +source.patch: $(STAMP_DIR)/source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.patch +$(STAMP_DIR)/source.patch: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/fix.source.patch $(STAMP_DIR) + $(SHELL) debian/scripts/lib source.patch + touch $@ + +fix.source.patch: $(STAMP_DIR)/fix.source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/fix.source.patch +$(STAMP_DIR)/fix.source.patch: $(STAMP_DIR) + $(SHELL) debian/scripts/lib fix.source.patch + touch $@ + +unfix.source.patch: $(STAMP_DIR)/unfix.source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/unfix.source.patch +$(STAMP_DIR)/unfix.source.patch: $(STAMP_DIR) + $(SHELL) debian/scripts/lib unfix.source.patch + touch $@ + +source.compile: $(STAMP_DIR)/source.compile +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.compile +$(STAMP_DIR)/source.compile: $(STAMP_DIR)/source.make $(STAMP_DIR) + $(MAKE) -C $(BUILD_TREE) $(BUILD_TARGET) + touch $@ + +source.command: + (cd $(BUILD_TREE); $(SOURCE_CMD)) + +DIR_TARGETS+=$(STAMP_DIR) +$(STAMP_DIR_TARGETS): $(STAMP_DIR) + +$(DIR_TARGETS)/: + mkdir -p $@ + +source.clean: unfix.source.patch + $(SHELL) debian/scripts/lib source.clean + rm -f $(STAMP_DIR_TARGETS) + rm -rf $(STAMP_DIR) + $(MAKE) -C debian/scripts clean diff -Nru ppp-2.4.1.uus/debian/update-source ppp-2.4.2+20040202/debian/update-source --- ppp-2.4.1.uus/debian/update-source 1970-01-01 00:00:00.000000000 +0000 +++ ppp-2.4.2+20040202/debian/update-source 2006-04-25 12:08:46.000000000 +0000 @@ -0,0 +1,39 @@ +# cd upstream/tarballs/ +# tar xzf ppp-cvs-*.tar.gz +# cp -a ppp ppp.OLD +# rsync --delete --archive --verbose --compress ppp.samba.org::ftp/unpacked/ppp/ ppp/ --exclude=CVS/ --exclude-from=../../debian/update-source +# tar czvvf ppp-cvs-$(date +%Y%m%d).tar.gz ppp/ +.cvsignore +/aix4/ +/freebsd-2.0/ +/freebsd-2.2.8/ +/freebsd-3.0/ +/netbsd-1.1/ +/netbsd-1.2/ +/NeXT/ +/osf1/ +/ultrix/ +*.aix4 +*.bsd +*.netbsd-1.2 +*.svr4 +*.NeXT +*.osf +*.ultrix +sys-aix4.c +sys-bsd.c +sys-svr4.c +sys-NeXT.c +sys-osf.c +sys-ultrix.c ++ /linux/Makefile.top +/linux/* + +# these files are shipped with official releases, but we ignore then anyway +/solaris/ +/sunos4/ +/svr4/ +*.sol2 +*.sunos4 +sys-solaris.c +sys-sunos4.c