From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Subject: Re: [ptxdist] [PATCH v2] ppp: version bump 2.4.5 -> 2.4.7
Date: Fri, 21 Apr 2017 15:02:37 +0200 [thread overview]
Message-ID: <20170421130237.k3vdy6u2ct4xrgnv@pengutronix.de> (raw)
In-Reply-To: <20170412203051.xjy2brni3tzu6zeh@lenoch>
On Wed, Apr 12, 2017 at 10:30:51PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> Changes:
> - v2: Add forgotten 0030-no_crypt_hack.patch
>
> Note: patches were not refreshed and renumbered as it
> would make review more difficult. I'm ready to send
> v3, eventually.
I assume, the removed patches are included in the new version?
If you create the patch with '-M' then renamed files are detected and can
be reviewed sanely.
mkl: You added these patches initially. Where are those from? Debian? Maybe
we should check there for new versions.
Michael
> patches/ppp-2.4.5/0001-git-20100307.patch | 134 -----------------
> patches/ppp-2.4.5/0002-pppoatm_no_modprobe.patch | 21 ---
> patches/ppp-2.4.5/0004-use_system_logwtmp.patch | 28 ----
> patches/ppp-2.4.5/0005-update_if_pppol2tp.patch | 61 --------
> .../ppp-2.4.5/0006-dont-exit-pado-timeout.patch | 50 -------
> patches/ppp-2.4.5/0007-fix_warnings.patch | 38 -----
> patches/ppp-2.4.5/0008-man_syntax_errors.patch | 63 --------
> patches/ppp-2.4.5/0013-documentation_typos.patch | 95 ------------
> patches/ppp-2.4.5/0015-fix_null_pppdb.patch | 35 -----
> patches/ppp-2.4.5/0024-radius_enanchements.patch | 166 ---------------------
> ...Remove-old-version-of-Linux-if_pppol2tp.h.patch | 104 -------------
> .../0003-adaptive_echos.patch | 0
> .../0009-makefiles_cleanup.patch | 0
> .../0010-always_setsid.patch | 0
> .../0011-close_dev_ppp.patch | 0
> .../{ppp-2.4.5 => ppp-2.4.7}/0012-chat_man.patch | 0
> .../0014-fix_linkpidfile.patch | 0
> .../0016-pppdump_use_zlib.patch | 0
> .../0017-pppoatm_resolver_light.patch | 0
> .../0018-pppoatm_cleanup.patch | 0
> .../0019-pppoe_noads.patch | 0
> .../0020-readable_connerrs.patch | 0
> .../0021-011_scripts_redialer.diff.patch | 0
> .../0022-cifdefroute.dif.patch | 0
> .../0023-ppp-2.3.11-oedod.dif.patch | 0
> .../{ppp-2.4.5 => ppp-2.4.7}/0025-radius_mtu.patch | 0
> .../0026-018_ip-up_option.diff.patch | 0
> .../0027-ppp-2.4.2-stripMSdomain.patch | 0
> .../0028-setenv_call_file.patch | 0
> .../0029-010_scripts_README.diff.patch | 0
> .../0030-no_crypt_hack.patch | 24 ++-
> .../0031-resolv.conf_no_log.patch | 0
> .../{ppp-2.4.5 => ppp-2.4.7}/0032-zzz_config.patch | 5 +-
> .../0033-pppd-make-makefile-sysroot-aware.patch | 0
> ...-make-the-self-made-configure-cross-aware.patch | 0
> .../0035-use-CPPFLAGS-when-compiling.patch | 0
> patches/{ppp-2.4.5 => ppp-2.4.7}/series | 11 --
> rules/ppp.make | 4 +-
> 38 files changed, 21 insertions(+), 818 deletions(-)
>
> diff --git a/patches/ppp-2.4.5/0001-git-20100307.patch b/patches/ppp-2.4.5/0001-git-20100307.patch
> deleted file mode 100644
> index d0d0e5b4a..000000000
> --- a/patches/ppp-2.4.5/0001-git-20100307.patch
> +++ /dev/null
> @@ -1,134 +0,0 @@
> -From: Marco d'Itri <md@linux.it>
> -Date: Wed, 25 Jan 2012 19:14:26 +0100
> -Subject: [PATCH] git-20100307
> -
> ----
> - pppd/lcp.c | 28 +++++++++++++++++++---------
> - pppd/plugins/pppol2tp/Makefile.linux | 2 +-
> - pppd/plugins/rp-pppoe/plugin.c | 4 ++--
> - pppd/pppd.8 | 8 ++++++++
> - 4 files changed, 30 insertions(+), 12 deletions(-)
> -
> -diff --git a/pppd/lcp.c b/pppd/lcp.c
> -index 5c77490..8ed2778 100644
> ---- a/pppd/lcp.c
> -+++ b/pppd/lcp.c
> -@@ -397,21 +397,29 @@ lcp_close(unit, reason)
> - char *reason;
> - {
> - fsm *f = &lcp_fsm[unit];
> -+ int oldstate;
> -
> - if (phase != PHASE_DEAD && phase != PHASE_MASTER)
> - new_phase(PHASE_TERMINATE);
> -- if (f->state == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) {
> -+
> -+ if (f->flags & DELAYED_UP) {
> -+ untimeout(lcp_delayed_up, f);
> -+ f->state = STOPPED;
> -+ }
> -+ oldstate = f->state;
> -+
> -+ fsm_close(f, reason);
> -+ if (oldstate == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT|DELAYED_UP)) {
> - /*
> - * This action is not strictly according to the FSM in RFC1548,
> - * but it does mean that the program terminates if you do a
> -- * lcp_close() in passive/silent mode when a connection hasn't
> -- * been established.
> -+ * lcp_close() when a connection hasn't been established
> -+ * because we are in passive/silent mode or because we have
> -+ * delayed the fsm_lowerup() call and it hasn't happened yet.
> - */
> -- f->state = CLOSED;
> -+ f->flags &= ~DELAYED_UP;
> - lcp_finished(f);
> --
> -- } else
> -- fsm_close(f, reason);
> -+ }
> - }
> -
> -
> -@@ -453,9 +461,10 @@ lcp_lowerdown(unit)
> - {
> - fsm *f = &lcp_fsm[unit];
> -
> -- if (f->flags & DELAYED_UP)
> -+ if (f->flags & DELAYED_UP) {
> - f->flags &= ~DELAYED_UP;
> -- else
> -+ untimeout(lcp_delayed_up, f);
> -+ } else
> - fsm_lowerdown(&lcp_fsm[unit]);
> - }
> -
> -@@ -489,6 +498,7 @@ lcp_input(unit, p, len)
> -
> - if (f->flags & DELAYED_UP) {
> - f->flags &= ~DELAYED_UP;
> -+ untimeout(lcp_delayed_up, f);
> - fsm_lowerup(f);
> - }
> - fsm_input(f, p, len);
> -diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
> -index 19eff67..ea3538e 100644
> ---- a/pppd/plugins/pppol2tp/Makefile.linux
> -+++ b/pppd/plugins/pppol2tp/Makefile.linux
> -@@ -20,7 +20,7 @@ all: $(PLUGINS)
> -
> - install: all
> - $(INSTALL) -d -m 755 $(LIBDIR)
> -- $(INSTALL) -c -m 4550 $(PLUGINS) $(LIBDIR)
> -+ $(INSTALL) -c -m 755 $(PLUGINS) $(LIBDIR)
> -
> - clean:
> - rm -f *.o *.so
> -diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
> -index e94494b..9bd6643 100644
> ---- a/pppd/plugins/rp-pppoe/plugin.c
> -+++ b/pppd/plugins/rp-pppoe/plugin.c
> -@@ -108,8 +108,6 @@ PPPOEInitDevice(void)
> - novm("PPPoE session data");
> - }
> - memset(conn, 0, sizeof(PPPoEConnection));
> -- conn->acName = acName;
> -- conn->serviceName = pppd_pppoe_service;
> - conn->ifName = devnam;
> - conn->discoverySocket = -1;
> - conn->sessionSocket = -1;
> -@@ -133,6 +131,8 @@ PPPOEConnectDevice(void)
> - {
> - struct sockaddr_pppox sp;
> -
> -+ conn->acName = acName;
> -+ conn->serviceName = pppd_pppoe_service;
> - strlcpy(ppp_devnam, devnam, sizeof(ppp_devnam));
> - if (existingSession) {
> - unsigned int mac[ETH_ALEN];
> -diff --git a/pppd/pppd.8 b/pppd/pppd.8
> -index 8ea8200..b7adc77 100644
> ---- a/pppd/pppd.8
> -+++ b/pppd/pppd.8
> -@@ -193,6 +193,9 @@ will not accept a different value from the peer in the IPCP
> - negotiation, unless the \fIipcp\-accept\-local\fR and/or
> - \fIipcp\-accept\-remote\fR options are given, respectively.
> - .TP
> -+.B +ipv6
> -+Enable the IPv6CP and IPv6 protocols.
> -+.TP
> - .B ipv6 \fI<local_interface_identifier>\fR,\fI<remote_interface_identifier>
> - Set the local and/or remote 64-bit interface identifier. Either one may be
> - omitted. The identifier must be specified in standard ascii notation of
> -@@ -449,6 +452,11 @@ scripts. If this
> - option is given, the \fIstring\fR supplied is given as the 6th
> - parameter to those scripts.
> - .TP
> -+.B ipv6cp\-accept\-local
> -+With this option, pppd will accept the peer's idea of our local IPv6
> -+interface identifier, even if the local IPv6 interface identifier
> -+was specified in an option.
> -+.TP
> - .B ipv6cp\-max\-configure \fIn
> - Set the maximum number of IPv6CP configure-request transmissions to
> - \fIn\fR (default 10).
> diff --git a/patches/ppp-2.4.5/0002-pppoatm_no_modprobe.patch b/patches/ppp-2.4.5/0002-pppoatm_no_modprobe.patch
> deleted file mode 100644
> index ed8390f06..000000000
> --- a/patches/ppp-2.4.5/0002-pppoatm_no_modprobe.patch
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -From: Marco d'Itri <md@linux.it>
> -Date: Wed, 25 Jan 2012 19:14:26 +0100
> -Subject: [PATCH] pppoatm_no_modprobe
> -
> ----
> - pppd/plugins/pppoatm/pppoatm.c | 2 --
> - 1 file changed, 2 deletions(-)
> -
> -diff --git a/pppd/plugins/pppoatm/pppoatm.c b/pppd/plugins/pppoatm/pppoatm.c
> -index 7712c6d..d693350 100644
> ---- a/pppd/plugins/pppoatm/pppoatm.c
> -+++ b/pppd/plugins/pppoatm/pppoatm.c
> -@@ -133,8 +133,6 @@ static int connect_pppoatm(void)
> - int fd;
> - struct atm_qos qos;
> -
> -- system ("/sbin/modprobe -q pppoatm");
> --
> - if (!device_got_set)
> - no_device_given_pppoatm();
> - fd = socket(AF_ATMPVC, SOCK_DGRAM, 0);
> diff --git a/patches/ppp-2.4.5/0004-use_system_logwtmp.patch b/patches/ppp-2.4.5/0004-use_system_logwtmp.patch
> deleted file mode 100644
> index edc6ec9e3..000000000
> --- a/patches/ppp-2.4.5/0004-use_system_logwtmp.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From: Marco d'Itri <md@linux.it>
> -Date: Wed, 25 Jan 2012 19:14:26 +0100
> -Subject: [PATCH] use_system_logwtmp
> -
> ----
> - pppd/sys-linux.c | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
> -index b675c97..1643ac5 100644
> ---- a/pppd/sys-linux.c
> -+++ b/pppd/sys-linux.c
> -@@ -2153,6 +2153,7 @@ int ppp_available(void)
> - * Update the wtmp file with the appropriate user name and tty device.
> - */
> -
> -+#ifndef linux
> - void logwtmp (const char *line, const char *name, const char *host)
> - {
> - struct utmp ut, *utp;
> -@@ -2221,6 +2222,7 @@ void logwtmp (const char *line, const char *name, const char *host)
> - }
> - #endif
> - }
> -+#endif
> -
> -
> - /********************************************************************
> diff --git a/patches/ppp-2.4.5/0005-update_if_pppol2tp.patch b/patches/ppp-2.4.5/0005-update_if_pppol2tp.patch
> deleted file mode 100644
> index 50afbffa8..000000000
> --- a/patches/ppp-2.4.5/0005-update_if_pppol2tp.patch
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -From: Marco d'Itri <md@linux.it>
> -Date: Wed, 25 Jan 2012 19:14:26 +0100
> -Subject: [PATCH] update_if_pppol2tp
> -
> ----
> - include/linux/if_pppol2tp.h | 24 +++++++++++++++++++-----
> - 1 file changed, 19 insertions(+), 5 deletions(-)
> -
> -diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
> -index 4113d6a..7ee86b2 100644
> ---- a/include/linux/if_pppol2tp.h
> -+++ b/include/linux/if_pppol2tp.h
> -@@ -2,7 +2,7 @@
> - * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661)
> - *
> - * This file supplies definitions required by the PPP over L2TP driver
> -- * (pppol2tp.c). All version information wrt this file is located in pppol2tp.c
> -+ * (l2tp_ppp.c). All version information wrt this file is located in l2tp_ppp.c
> - *
> - * License:
> - * This program is free software; you can redistribute it and/or
> -@@ -15,14 +15,14 @@
> - #ifndef __LINUX_IF_PPPOL2TP_H
> - #define __LINUX_IF_PPPOL2TP_H
> -
> --#include <asm/types.h>
> -+#include <linux/types.h>
> -+
> -
> - /* Structure used to connect() the socket to a particular tunnel UDP
> - * socket.
> - */
> --struct pppol2tp_addr
> --{
> -- pid_t pid; /* pid that owns the fd.
> -+struct pppol2tp_addr {
> -+ __kernel_pid_t pid; /* pid that owns the fd.
> - * 0 => current */
> - int fd; /* FD of UDP socket to use */
> -
> -@@ -32,6 +32,20 @@ struct pppol2tp_addr
> - __u16 d_tunnel, d_session; /* For sending outgoing packets */
> - };
> -
> -+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
> -+ * bits. So we need a different sockaddr structure.
> -+ */
> -+struct pppol2tpv3_addr {
> -+ pid_t pid; /* pid that owns the fd.
> -+ * 0 => current */
> -+ int fd; /* FD of UDP or IP socket to use */
> -+
> -+ struct sockaddr_in addr; /* IP address and port to send to */
> -+
> -+ __u32 s_tunnel, s_session; /* For matching incoming packets */
> -+ __u32 d_tunnel, d_session; /* For sending outgoing packets */
> -+};
> -+
> - /* Socket options:
> - * DEBUG - bitmask of debug message categories
> - * SENDSEQ - 0 => don't send packets with sequence numbers
> diff --git a/patches/ppp-2.4.5/0006-dont-exit-pado-timeout.patch b/patches/ppp-2.4.5/0006-dont-exit-pado-timeout.patch
> deleted file mode 100644
> index 7791a1cab..000000000
> --- a/patches/ppp-2.4.5/0006-dont-exit-pado-timeout.patch
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -From: "peter@endian.com" <peter@endian.com>
> -Date: Wed, 25 Jan 2012 19:14:26 +0100
> -Subject: [PATCH] dont-exit-pado-timeout
> -
> -To: ppp-bugs@ppp.samba.org
> -Subject: using rp-pppoe pppd exits with EXIT_OK after receiving a timeout waiting for PADO due to no modem attached
> -Date: Mon, 17 Nov 2008 19:46:54 +0000 (GMT)
> -
> -Full_Name: Peter Warasin
> -Version: 2.4.4
> -OS: linux 2.6.22.19
> -Submission from: (NULL) (217.133.34.27)
> -
> -
> -Using rp-pppoe pppd exits with exitcode 0, whenever there is no modem connected
> -and pppd get's a timeout while waiting for a PADO.
> -
> -This happens because status is set to EXIT_OK in main.c at the beginning of the
> -procedures. Within start_link(), connect() will be called as one of the first
> -calls.
> -If that call fails (no pppoe discovery for example), jumps to "fail", which
> -returns without setting the status variable to failure. So at the end pppd exits
> -with EXIT_OK.
> -
> -I moved the status = EXIT_NEGOTIATION_FAILED which will be set later within
> -start_link, at the top of it. That seems to work out, patch is attached:
> ----
> - pppd/auth.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/pppd/auth.c b/pppd/auth.c
> -index fb71944..031c030 100644
> ---- a/pppd/auth.c
> -+++ b/pppd/auth.c
> -@@ -555,6 +555,7 @@ void start_link(unit)
> - {
> - char *msg;
> -
> -+ status = EXIT_NEGOTIATION_FAILED;
> - new_phase(PHASE_SERIALCONN);
> -
> - hungup = 0;
> -@@ -591,7 +592,6 @@ void start_link(unit)
> - notice("Starting negotiation on %s", ppp_devnam);
> - add_fd(fd_ppp);
> -
> -- status = EXIT_NEGOTIATION_FAILED;
> - new_phase(PHASE_ESTABLISH);
> -
> - lcp_lowerup(0);
> diff --git a/patches/ppp-2.4.5/0007-fix_warnings.patch b/patches/ppp-2.4.5/0007-fix_warnings.patch
> deleted file mode 100644
> index 3247ec97a..000000000
> --- a/patches/ppp-2.4.5/0007-fix_warnings.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -From: Marco d'Itri <md@linux.it>
> -Date: Wed, 25 Jan 2012 19:14:26 +0100
> -Subject: [PATCH] fix_warnings
> -
> -fix minor issues
> -
> -Fix warnings, missing prototypes, an incomplete clean target.
> ----
> - pppd/ipv6cp.c | 2 +-
> - pppd/pppd.h | 2 ++
> - 2 files changed, 3 insertions(+), 1 deletion(-)
> -
> -diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c
> -index 4a09c9a..d01b778 100644
> ---- a/pppd/ipv6cp.c
> -+++ b/pppd/ipv6cp.c
> -@@ -1120,7 +1120,7 @@ ipv6_check_options()
> -
> - if (demand && (eui64_iszero(wo->ourid) || eui64_iszero(wo->hisid))) {
> - option_error("local/remote LL address required for demand-dialling\n");
> -- exit(1);
> -+ die(1);
> - }
> - }
> -
> -diff --git a/pppd/pppd.h b/pppd/pppd.h
> -index cf9840a..87522d0 100644
> ---- a/pppd/pppd.h
> -+++ b/pppd/pppd.h
> -@@ -642,6 +642,8 @@ int sif6addr __P((int, eui64_t, eui64_t));
> - /* Configure IPv6 addresses for i/f */
> - int cif6addr __P((int, eui64_t, eui64_t));
> - /* Remove an IPv6 address from i/f */
> -+int ether_to_eui64 __P((eui64_t *));
> -+ /* Convert Ethernet address into 64-bit EUI */
> - #endif
> - int sifdefaultroute __P((int, u_int32_t, u_int32_t));
> - /* Create default route through i/f */
> diff --git a/patches/ppp-2.4.5/0008-man_syntax_errors.patch b/patches/ppp-2.4.5/0008-man_syntax_errors.patch
> deleted file mode 100644
> index 89d332895..000000000
> --- a/patches/ppp-2.4.5/0008-man_syntax_errors.patch
> +++ /dev/null
> @@ -1,63 +0,0 @@
> -From: Marco d'Itri <md@linux.it>
> -Date: Wed, 25 Jan 2012 19:14:26 +0100
> -Subject: [PATCH] man_syntax_errors
> -
> -Fix some syntax errors in the man pages.
> ----
> - chat/chat.8 | 8 ++++----
> - pppstats/pppstats.8 | 2 +-
> - 2 files changed, 5 insertions(+), 5 deletions(-)
> -
> -diff --git a/chat/chat.8 b/chat/chat.8
> -index b532292..60b2803 100644
> ---- a/chat/chat.8
> -+++ b/chat/chat.8
> -@@ -288,7 +288,7 @@ ABORT 'BUSY'
> - .br
> - ABORT 'NO CARRIER'
> - .br
> --'' ATZ
> -+\&'' ATZ
> - .br
> - OK\\r\\n ATD1234567
> - .br
> -@@ -318,7 +318,7 @@ signal behavior. Here is an (simple) example script:
> - .IP
> - ABORT 'BUSY'
> - .br
> --'' ATZ
> -+\&'' ATZ
> - .br
> - OK\\r\\n ATD1234567
> - .br
> -@@ -365,7 +365,7 @@ The special reply string of \fIEOT\fR indicates that the chat program
> - should send an EOT character to the remote. This is normally the
> - End-of-file character sequence. A return character is not sent
> - following the EOT.
> --.PR
> -+.LP
> - The EOT sequence may be embedded into the send string using the
> - sequence \fI^D\fR.
> - .SH GENERATING BREAK
> -@@ -374,7 +374,7 @@ to be sent. The break is a special signal on the transmitter. The
> - normal processing on the receiver is to change the transmission rate.
> - It may be used to cycle through the available transmission rates on
> - the remote until you are able to receive a valid login prompt.
> --.PR
> -+.LP
> - The break sequence may be embedded into the send string using the
> - \fI\\K\fR sequence.
> - .SH ESCAPE SEQUENCES
> -diff --git a/pppstats/pppstats.8 b/pppstats/pppstats.8
> -index 217ffa9..4ac101e 100644
> ---- a/pppstats/pppstats.8
> -+++ b/pppstats/pppstats.8
> -@@ -172,7 +172,7 @@ option is specified.
> - When the
> - .B \-z
> - option is specified,
> --.Nm pppstats
> -+.B pppstats
> - instead displays the following fields, relating to the packet
> - compression algorithm currently in use. If packet compression is not
> - in use, these fields will all display zeroes. The fields displayed on
> diff --git a/patches/ppp-2.4.5/0013-documentation_typos.patch b/patches/ppp-2.4.5/0013-documentation_typos.patch
> deleted file mode 100644
> index 554080a78..000000000
> --- a/patches/ppp-2.4.5/0013-documentation_typos.patch
> +++ /dev/null
> @@ -1,95 +0,0 @@
> -From: Marco d'Itri <md@linux.it>
> -Date: Wed, 25 Jan 2012 19:14:26 +0100
> -Subject: [PATCH] documentation_typos
> -
> -fix documentation typos
> ----
> - README.pppoe | 2 +-
> - chat/chat.8 | 8 ++++----
> - pppd/pppd.8 | 6 +++---
> - 3 files changed, 8 insertions(+), 8 deletions(-)
> -
> -diff --git a/README.pppoe b/README.pppoe
> -index 5284e4d..9f4e5cd 100644
> ---- a/README.pppoe
> -+++ b/README.pppoe
> -@@ -33,7 +33,7 @@ received from the PPPoE layer just as if the link was a serial line
> -
> - With this in mind, the goal of the implementation of PPPoE support in
> - Linux is to allow users to simply specify that the device they intend
> --to use for the PPP connection is an ethernet device (i.e. "eth0") and
> -+to use for the PPP connection is an ethernet device (e.g. "eth0") and
> - the rest of the system should function as usual.
> -
> - 2. Using PPPoE
> -diff --git a/chat/chat.8 b/chat/chat.8
> -index b5e7c26..39733cf 100644
> ---- a/chat/chat.8
> -+++ b/chat/chat.8
> -@@ -51,7 +51,7 @@ keyword. When echoing is enabled, all output from the modem is echoed
> - to \fIstderr\fR.
> - .TP
> - .B \-E
> --Enables environment variable substituion within chat scripts using the
> -+Enables environment variable substitution within chat scripts using the
> - standard \fI$xxx\fR syntax.
> - .TP
> - .B \-v
> -@@ -78,7 +78,7 @@ SYSLOG. The use of \-S will prevent both log messages from '\-v' and
> - error messages from being sent to the SYSLOG.
> - .TP
> - .B \-T \fI<phone number>
> --Pass in an arbitary string, usually a phone number, that will be
> -+Pass in an arbitrary string, usually a phone number, that will be
> - substituted for the \\T substitution metacharacter in a send string.
> - .TP
> - .B \-U \fI<phone number 2>
> -@@ -205,7 +205,7 @@ terminal), standard error will normally be redirected to the file
> - .LP
> - \fBSAY\fR strings must be enclosed in single or double quotes. If
> - carriage return and line feed are needed in the string to be output,
> --you must explicitely add them to your string.
> -+you must explicitly add them to your string.
> - .LP
> - The SAY strings could be used to give progress messages in sections of
> - the script where you want to have 'ECHO OFF' but still let the user
> -@@ -458,7 +458,7 @@ For example, the character DC1 (17) is shown as \^^Q.
> - Environment variables are available within chat scripts, if the \fI\-E\fR
> - option was specified in the command line. The metacharacter \fI$\fR is used
> - to introduce the name of the environment variable to substitute. If the
> --substition fails, because the requested environment variable is not set,
> -+substitution fails, because the requested environment variable is not set,
> - \fInothing\fR is replaced for the variable.
> - .SH TERMINATION CODES
> - The \fIchat\fR program will terminate with the following completion
> -diff --git a/pppd/pppd.8 b/pppd/pppd.8
> -index 2943263..43b5416 100644
> ---- a/pppd/pppd.8
> -+++ b/pppd/pppd.8
> -@@ -331,7 +331,7 @@ When this is completed, pppd will commence passing data packets
> - The \fIdemand\fR option implies the \fIpersist\fR option. If this
> - behaviour is not desired, use the \fInopersist\fR option after the
> - \fIdemand\fR option. The \fIidle\fR and \fIholdoff\fR
> --options are also useful in conjuction with the \fIdemand\fR option.
> -+options are also useful in conjunction with the \fIdemand\fR option.
> - .TP
> - .B domain \fId
> - Append the domain name \fId\fR to the local host name for authentication
> -@@ -942,7 +942,7 @@ pseudo-tty master/slave pair and use the slave as its terminal
> - device. The \fIscript\fR will be run in a child process with the
> - pseudo-tty master as its standard input and output. An explicit
> - device name may not be given if this option is used. (Note: if the
> --\fIrecord\fR option is used in conjuction with the \fIpty\fR option,
> -+\fIrecord\fR option is used in conjunction with the \fIpty\fR option,
> - the child process will have pipes on its standard input and output.)
> - .TP
> - .B receive\-all
> -@@ -1050,7 +1050,7 @@ in the pseudonym.
> - .TP
> - .B srp\-use\-pseudonym
> - When operating as an EAP SRP\-SHA1 client, attempt to use the pseudonym
> --stored in ~/.ppp_psuedonym first as the identity, and save in this
> -+stored in ~/.ppp_pseudonym first as the identity, and save in this
> - file any pseudonym offered by the peer during authentication.
> - .TP
> - .B sync
> diff --git a/patches/ppp-2.4.5/0015-fix_null_pppdb.patch b/patches/ppp-2.4.5/0015-fix_null_pppdb.patch
> deleted file mode 100644
> index 46e23da12..000000000
> --- a/patches/ppp-2.4.5/0015-fix_null_pppdb.patch
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -From: Marco d'Itri <md@linux.it>
> -Date: Wed, 25 Jan 2012 19:14:26 +0100
> -Subject: [PATCH] fix_null_pppdb
> -
> -fix segfault in update_db_entry()
> -
> -From: Martin.Lottermoser@t-online.de
> -Subject: Bug#308136: Debian bug 308136 (SEGV in pppd)
> -
> -The function update_db_entry() may only be called if pppdb is not NULL;
> -unfortunately in this situation it is. Other calls to update_db_entry()
> -are protected against this, see, e.g., the end of script_setenv().
> ----
> - pppd/main.c | 8 +++++---
> - 1 file changed, 5 insertions(+), 3 deletions(-)
> -
> -diff --git a/pppd/main.c b/pppd/main.c
> -index 8da4786..8513b1d 100644
> ---- a/pppd/main.c
> -+++ b/pppd/main.c
> -@@ -1961,9 +1961,11 @@ script_setenv(var, value, iskey)
> - free(p-1);
> - script_env[i] = newstring;
> - #ifdef USE_TDB
> -- if (iskey && pppdb != NULL)
> -- add_db_key(newstring);
> -- update_db_entry();
> -+ if (pppdb != NULL) {
> -+ if (iskey)
> -+ add_db_key(newstring);
> -+ update_db_entry();
> -+ }
> - #endif
> - return;
> - }
> diff --git a/patches/ppp-2.4.5/0024-radius_enanchements.patch b/patches/ppp-2.4.5/0024-radius_enanchements.patch
> deleted file mode 100644
> index e7217bacc..000000000
> --- a/patches/ppp-2.4.5/0024-radius_enanchements.patch
> +++ /dev/null
> @@ -1,166 +0,0 @@
> -From: Marco d'Itri <md@linux.it>
> -Date: Wed, 25 Jan 2012 19:14:27 +0100
> -Subject: [PATCH] radius_enanchements
> -
> -radius plugin enhancements
> -
> -http://ppp.samba.org/cgi-bin/ppp-bugs/incoming?id=1466
> -
> -From: z0termann@mail.ru
> -To: ppp-bugs@ppp.samba.org
> -Subject: radius plugin enhancements
> -Date: Fri, 11 Aug 2006 08:06:24 +0000 (GMT)
> -
> -Full_Name: Vadim Zotov
> -Version: 2.4.3
> -OS: centos4
> -Submission from: (NULL) (194.186.83.193)
> -
> -
> -The patch below allows radius plugin to handle
> -additional radius attributes:
> -
> -- Filter-ID (sets RADIUS_FILTER_ID env. var.)
> -- Framed-Route (sets RADIUS_FRAMED_ROUTE env. var.)
> -- Idle-Timeout
> -- NAS-IP-Address
> -- MS-Primary-DNS-Server
> -- MS-Secondary-DNS-Server
> -- MS-Primary-NBNS-Server
> -- MS-Secondary-NBNS-Server
> -
> ---------------------------------------------
> ----
> - pppd/plugins/radius/radius.c | 56 ++++++++++++++++++++++++++++++++++--
> - pppd/plugins/radius/radiusclient.h | 4 +++
> - 2 files changed, 57 insertions(+), 3 deletions(-)
> -
> -diff --git a/pppd/plugins/radius/radius.c b/pppd/plugins/radius/radius.c
> -index 44d1911..edbc0b3 100644
> ---- a/pppd/plugins/radius/radius.c
> -+++ b/pppd/plugins/radius/radius.c
> -@@ -48,6 +48,8 @@ static char const RCSID[] =
> -
> - #define MD5_HASH_SIZE 16
> -
> -+#define MSDNS 1
> -+
> - static char *config_file = NULL;
> - static int add_avp(char **);
> - static struct avpopt {
> -@@ -544,6 +546,15 @@ radius_setparams(VALUE_PAIR *vp, char *msg, REQUEST_INFO *req_info,
> - int mppe_enc_types = 0;
> - #endif
> -
> -+#ifdef MSDNS
> -+ ipcp_options *wo = &ipcp_wantoptions[0];
> -+ ipcp_options *ao = &ipcp_allowoptions[0];
> -+ int got_msdns_1 = 0;
> -+ int got_msdns_2 = 0;
> -+ int got_wins_1 = 0;
> -+ int got_wins_2 = 0;
> -+#endif
> -+
> - /* Send RADIUS attributes to anyone else who might be interested */
> - if (radius_attributes_hook) {
> - (*radius_attributes_hook)(vp);
> -@@ -581,6 +592,21 @@ radius_setparams(VALUE_PAIR *vp, char *msg, REQUEST_INFO *req_info,
> - /* Session timeout */
> - maxconnect = vp->lvalue;
> - break;
> -+/* -- additional parameters */
> -+ case PW_FILTER_ID:
> -+ /* packet filter, will be handled via ip-(up|down) script */
> -+ script_setenv("RADIUS_FILTER_ID",vp->strvalue,1);
> -+ break;
> -+ case PW_FRAMED_ROUTE:
> -+ /* route, will be handled via ip-(up|down) script */
> -+ script_setenv("RADIUS_FRAMED_ROUTE",vp->strvalue,1);
> -+ break;
> -+ case PW_IDLE_TIMEOUT:
> -+ /* idle parameter */
> -+ idle_time_limit = vp->lvalue;
> -+ slprintf(msg, BUF_LEN, "setting idle tmo to %ld",vp->lvalue);
> -+ break;
> -+/* -- end of additional parameters */
> - #ifdef MAXOCTETS
> - case PW_SESSION_OCTETS_LIMIT:
> - /* Session traffic limit */
> -@@ -619,6 +645,11 @@ radius_setparams(VALUE_PAIR *vp, char *msg, REQUEST_INFO *req_info,
> - rstate.ip_addr = remote;
> - }
> - break;
> -+/* --- additional parameters ---*/
> -+ case PW_NAS_IP_ADDRESS:
> -+ wo->ouraddr = htonl(vp->lvalue);
> -+ break;
> -+/* --- end additional parameters --- */
> - case PW_CLASS:
> - /* Save Class attribute to pass it in accounting request */
> - if (vp->lvalue <= MAXCLASSLEN) {
> -@@ -629,8 +660,8 @@ radius_setparams(VALUE_PAIR *vp, char *msg, REQUEST_INFO *req_info,
> - }
> -
> -
> --#ifdef CHAPMS
> - } else if (vp->vendorcode == VENDOR_MICROSOFT) {
> -+#ifdef CHAPMS
> - switch (vp->attribute) {
> - case PW_MS_CHAP2_SUCCESS:
> - if ((vp->lvalue != 43) || strncmp(vp->strvalue + 1, "S=", 2)) {
> -@@ -673,19 +704,38 @@ radius_setparams(VALUE_PAIR *vp, char *msg, REQUEST_INFO *req_info,
> - break;
> -
> - #endif /* MPPE */
> --#if 0
> -+#ifdef MSDNS
> - case PW_MS_PRIMARY_DNS_SERVER:
> -+ ao->dnsaddr[0] = htonl(vp->lvalue);
> -+ got_msdns_1 = 1;
> -+ break;
> - case PW_MS_SECONDARY_DNS_SERVER:
> -+ ao->dnsaddr[1] = htonl(vp->lvalue);
> -+ got_msdns_2 = 1;
> -+ break;
> - case PW_MS_PRIMARY_NBNS_SERVER:
> -+ ao->winsaddr[0] = htonl(vp->lvalue);
> -+ got_wins_1 = 1;
> -+ break;
> - case PW_MS_SECONDARY_NBNS_SERVER:
> -+ ao->winsaddr[1] = htonl(vp->lvalue);
> -+ got_wins_2 = 1;
> - break;
> --#endif
> -+#endif /* MSDNS */
> - }
> - #endif /* CHAPMS */
> - }
> - vp = vp->next;
> - }
> -
> -+#ifdef MSDNS
> -+ /* override the ms-dns & ms-wins options */
> -+ if (got_msdns_1 == 1 && got_msdns_2 == 0 ) ao->dnsaddr[1] = ao->dnsaddr[0];
> -+ else if (got_msdns_1 == 0 && got_msdns_2 == 1 ) ao->dnsaddr[0] = ao->dnsaddr[1];
> -+ if (got_wins_1 == 1 && got_wins_2 == 0 ) ao->winsaddr[1] = ao->winsaddr[0];
> -+ else if (got_wins_1 == 0 && got_wins_2 == 1 ) ao->winsaddr[0] = ao->winsaddr[1];
> -+#endif
> -+
> - /* Require a valid MS-CHAP2-SUCCESS for MS-CHAPv2 auth */
> - if (digest && (digest->code == CHAP_MICROSOFT_V2) && !ms_chap2_success)
> - return -1;
> -diff --git a/pppd/plugins/radius/radiusclient.h b/pppd/plugins/radius/radiusclient.h
> -index 7b7933e..51b959a 100644
> ---- a/pppd/plugins/radius/radiusclient.h
> -+++ b/pppd/plugins/radius/radiusclient.h
> -@@ -152,6 +152,10 @@ typedef struct pw_auth_hdr
> - #define PW_MS_CHAP_MPPE_KEYS 12 /* string */
> - #define PW_MS_MPPE_SEND_KEY 16 /* string */
> - #define PW_MS_MPPE_RECV_KEY 17 /* string */
> -+#define PW_MS_PRIMARY_DNS_SERVER 28 /* ipaddr */
> -+#define PW_MS_SECONDARY_DNS_SERVER 29 /* ipaddr */
> -+#define PW_MS_PRIMARY_NBNS_SERVER 30 /* ipaddr */
> -+#define PW_MS_SECONDARY_NBNS_SERVER 31 /* ipaddr */
> -
> - /* Accounting */
> -
> diff --git a/patches/ppp-2.4.5/0036-Remove-old-version-of-Linux-if_pppol2tp.h.patch b/patches/ppp-2.4.5/0036-Remove-old-version-of-Linux-if_pppol2tp.h.patch
> deleted file mode 100644
> index dcea01aa6..000000000
> --- a/patches/ppp-2.4.5/0036-Remove-old-version-of-Linux-if_pppol2tp.h.patch
> +++ /dev/null
> @@ -1,104 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Thu, 18 Oct 2012 11:46:22 +0200
> -Subject: [PATCH] Remove old version of Linux if_pppol2tp.h
> -
> -This has been in the Linux kernel source now for long enough that we
> -can rely on getting a usable version from /usr/include on all
> -distributions that we care about. The version we have here had started
> -to lag behind what is in the Linux kernel, causing compilation errors
> -due to struct pppol2tpv3_addr being undefined. Removing our local
> -version means we will use what is in /usr/include instead.
> -
> -This is an upstream patch modified to apply to the current version.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - include/linux/if_pppol2tp.h | 79 -------------------------------------------
> - 1 file changed, 79 deletions(-)
> - delete mode 100644 include/linux/if_pppol2tp.h
> -
> -diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
> -deleted file mode 100644
> -index 7ee86b2..0000000
> ---- a/include/linux/if_pppol2tp.h
> -+++ /dev/null
> -@@ -1,79 +0,0 @@
> --/***************************************************************************
> -- * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661)
> -- *
> -- * This file supplies definitions required by the PPP over L2TP driver
> -- * (l2tp_ppp.c). All version information wrt this file is located in l2tp_ppp.c
> -- *
> -- * License:
> -- * This program is free software; you can redistribute it and/or
> -- * modify it under the terms of the GNU General Public License
> -- * as published by the Free Software Foundation; either version
> -- * 2 of the License, or (at your option) any later version.
> -- *
> -- */
> --
> --#ifndef __LINUX_IF_PPPOL2TP_H
> --#define __LINUX_IF_PPPOL2TP_H
> --
> --#include <linux/types.h>
> --
> --
> --/* Structure used to connect() the socket to a particular tunnel UDP
> -- * socket.
> -- */
> --struct pppol2tp_addr {
> -- __kernel_pid_t pid; /* pid that owns the fd.
> -- * 0 => current */
> -- int fd; /* FD of UDP socket to use */
> --
> -- struct sockaddr_in addr; /* IP address and port to send to */
> --
> -- __u16 s_tunnel, s_session; /* For matching incoming packets */
> -- __u16 d_tunnel, d_session; /* For sending outgoing packets */
> --};
> --
> --/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
> -- * bits. So we need a different sockaddr structure.
> -- */
> --struct pppol2tpv3_addr {
> -- pid_t pid; /* pid that owns the fd.
> -- * 0 => current */
> -- int fd; /* FD of UDP or IP socket to use */
> --
> -- struct sockaddr_in addr; /* IP address and port to send to */
> --
> -- __u32 s_tunnel, s_session; /* For matching incoming packets */
> -- __u32 d_tunnel, d_session; /* For sending outgoing packets */
> --};
> --
> --/* Socket options:
> -- * DEBUG - bitmask of debug message categories
> -- * SENDSEQ - 0 => don't send packets with sequence numbers
> -- * 1 => send packets with sequence numbers
> -- * RECVSEQ - 0 => receive packet sequence numbers are optional
> -- * 1 => drop receive packets without sequence numbers
> -- * LNSMODE - 0 => act as LAC.
> -- * 1 => act as LNS.
> -- * REORDERTO - reorder timeout (in millisecs). If 0, don't try to reorder.
> -- */
> --enum {
> -- PPPOL2TP_SO_DEBUG = 1,
> -- PPPOL2TP_SO_RECVSEQ = 2,
> -- PPPOL2TP_SO_SENDSEQ = 3,
> -- PPPOL2TP_SO_LNSMODE = 4,
> -- PPPOL2TP_SO_REORDERTO = 5,
> --};
> --
> --/* Debug message categories for the DEBUG socket option */
> --enum {
> -- PPPOL2TP_MSG_DEBUG = (1 << 0), /* verbose debug (if
> -- * compiled in) */
> -- PPPOL2TP_MSG_CONTROL = (1 << 1), /* userspace - kernel
> -- * interface */
> -- PPPOL2TP_MSG_SEQ = (1 << 2), /* sequence numbers */
> -- PPPOL2TP_MSG_DATA = (1 << 3), /* data packets */
> --};
> --
> --
> --
> --#endif
> diff --git a/patches/ppp-2.4.5/0003-adaptive_echos.patch b/patches/ppp-2.4.7/0003-adaptive_echos.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0003-adaptive_echos.patch
> rename to patches/ppp-2.4.7/0003-adaptive_echos.patch
> diff --git a/patches/ppp-2.4.5/0009-makefiles_cleanup.patch b/patches/ppp-2.4.7/0009-makefiles_cleanup.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0009-makefiles_cleanup.patch
> rename to patches/ppp-2.4.7/0009-makefiles_cleanup.patch
> diff --git a/patches/ppp-2.4.5/0010-always_setsid.patch b/patches/ppp-2.4.7/0010-always_setsid.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0010-always_setsid.patch
> rename to patches/ppp-2.4.7/0010-always_setsid.patch
> diff --git a/patches/ppp-2.4.5/0011-close_dev_ppp.patch b/patches/ppp-2.4.7/0011-close_dev_ppp.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0011-close_dev_ppp.patch
> rename to patches/ppp-2.4.7/0011-close_dev_ppp.patch
> diff --git a/patches/ppp-2.4.5/0012-chat_man.patch b/patches/ppp-2.4.7/0012-chat_man.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0012-chat_man.patch
> rename to patches/ppp-2.4.7/0012-chat_man.patch
> diff --git a/patches/ppp-2.4.5/0014-fix_linkpidfile.patch b/patches/ppp-2.4.7/0014-fix_linkpidfile.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0014-fix_linkpidfile.patch
> rename to patches/ppp-2.4.7/0014-fix_linkpidfile.patch
> diff --git a/patches/ppp-2.4.5/0016-pppdump_use_zlib.patch b/patches/ppp-2.4.7/0016-pppdump_use_zlib.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0016-pppdump_use_zlib.patch
> rename to patches/ppp-2.4.7/0016-pppdump_use_zlib.patch
> diff --git a/patches/ppp-2.4.5/0017-pppoatm_resolver_light.patch b/patches/ppp-2.4.7/0017-pppoatm_resolver_light.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0017-pppoatm_resolver_light.patch
> rename to patches/ppp-2.4.7/0017-pppoatm_resolver_light.patch
> diff --git a/patches/ppp-2.4.5/0018-pppoatm_cleanup.patch b/patches/ppp-2.4.7/0018-pppoatm_cleanup.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0018-pppoatm_cleanup.patch
> rename to patches/ppp-2.4.7/0018-pppoatm_cleanup.patch
> diff --git a/patches/ppp-2.4.5/0019-pppoe_noads.patch b/patches/ppp-2.4.7/0019-pppoe_noads.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0019-pppoe_noads.patch
> rename to patches/ppp-2.4.7/0019-pppoe_noads.patch
> diff --git a/patches/ppp-2.4.5/0020-readable_connerrs.patch b/patches/ppp-2.4.7/0020-readable_connerrs.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0020-readable_connerrs.patch
> rename to patches/ppp-2.4.7/0020-readable_connerrs.patch
> diff --git a/patches/ppp-2.4.5/0021-011_scripts_redialer.diff.patch b/patches/ppp-2.4.7/0021-011_scripts_redialer.diff.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0021-011_scripts_redialer.diff.patch
> rename to patches/ppp-2.4.7/0021-011_scripts_redialer.diff.patch
> diff --git a/patches/ppp-2.4.5/0022-cifdefroute.dif.patch b/patches/ppp-2.4.7/0022-cifdefroute.dif.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0022-cifdefroute.dif.patch
> rename to patches/ppp-2.4.7/0022-cifdefroute.dif.patch
> diff --git a/patches/ppp-2.4.5/0023-ppp-2.3.11-oedod.dif.patch b/patches/ppp-2.4.7/0023-ppp-2.3.11-oedod.dif.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0023-ppp-2.3.11-oedod.dif.patch
> rename to patches/ppp-2.4.7/0023-ppp-2.3.11-oedod.dif.patch
> diff --git a/patches/ppp-2.4.5/0025-radius_mtu.patch b/patches/ppp-2.4.7/0025-radius_mtu.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0025-radius_mtu.patch
> rename to patches/ppp-2.4.7/0025-radius_mtu.patch
> diff --git a/patches/ppp-2.4.5/0026-018_ip-up_option.diff.patch b/patches/ppp-2.4.7/0026-018_ip-up_option.diff.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0026-018_ip-up_option.diff.patch
> rename to patches/ppp-2.4.7/0026-018_ip-up_option.diff.patch
> diff --git a/patches/ppp-2.4.5/0027-ppp-2.4.2-stripMSdomain.patch b/patches/ppp-2.4.7/0027-ppp-2.4.2-stripMSdomain.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0027-ppp-2.4.2-stripMSdomain.patch
> rename to patches/ppp-2.4.7/0027-ppp-2.4.2-stripMSdomain.patch
> diff --git a/patches/ppp-2.4.5/0028-setenv_call_file.patch b/patches/ppp-2.4.7/0028-setenv_call_file.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0028-setenv_call_file.patch
> rename to patches/ppp-2.4.7/0028-setenv_call_file.patch
> diff --git a/patches/ppp-2.4.5/0029-010_scripts_README.diff.patch b/patches/ppp-2.4.7/0029-010_scripts_README.diff.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0029-010_scripts_README.diff.patch
> rename to patches/ppp-2.4.7/0029-010_scripts_README.diff.patch
> diff --git a/patches/ppp-2.4.5/0030-no_crypt_hack.patch b/patches/ppp-2.4.7/0030-no_crypt_hack.patch
> similarity index 72%
> rename from patches/ppp-2.4.5/0030-no_crypt_hack.patch
> rename to patches/ppp-2.4.7/0030-no_crypt_hack.patch
> index 69b5b66a2..a92de7e1d 100644
> --- a/patches/ppp-2.4.5/0030-no_crypt_hack.patch
> +++ b/patches/ppp-2.4.7/0030-no_crypt_hack.patch
> @@ -34,29 +34,39 @@ diff --git a/pppd/auth.c b/pppd/auth.c
> index 031c030..36e1549 100644
> --- a/pppd/auth.c
> +++ b/pppd/auth.c
> -@@ -1442,8 +1442,10 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg)
> +@@ -1441,11 +1441,15 @@
> }
> 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)
> + if (cryptpap || strcmp(passwd, secret) != 0) {
> + char *cbuf = crypt(passwd, secret);
> + if (!cbuf || strcmp(cbuf, secret) != 0)
> ++#endif
> + ret = UPAP_AUTHNAK;
> ++#ifndef NO_CRYPT_HACK
> + }
> +#endif
> - ret = UPAP_AUTHNAK;
> }
> }
> + fclose(f);
> diff --git a/pppd/session.c b/pppd/session.c
> index 32901a2..108331f 100644
> --- a/pppd/session.c
> +++ b/pppd/session.c
> -@@ -348,8 +348,10 @@ session_start(flags, user, passwd, ttyName, msg)
> +@@ -349,11 +349,15 @@
> /*
> * If no passwd, don't let them login if we're authenticating.
> */
> +#ifndef NO_CRYPT_HACK
> - if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2
> - || strcmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd) != 0)
> + if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2)
> +#endif
> return SESSION_FAILED;
> ++#ifndef NO_CRYPT_HACK
> + cbuf = crypt(passwd, pw->pw_passwd);
> + if (!cbuf || strcmp(cbuf, pw->pw_passwd) != 0)
> + return SESSION_FAILED;
> ++#endif
> }
>
> + #endif /* #ifdef USE_PAM */
> diff --git a/patches/ppp-2.4.5/0031-resolv.conf_no_log.patch b/patches/ppp-2.4.7/0031-resolv.conf_no_log.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0031-resolv.conf_no_log.patch
> rename to patches/ppp-2.4.7/0031-resolv.conf_no_log.patch
> diff --git a/patches/ppp-2.4.5/0032-zzz_config.patch b/patches/ppp-2.4.7/0032-zzz_config.patch
> similarity index 97%
> rename from patches/ppp-2.4.5/0032-zzz_config.patch
> rename to patches/ppp-2.4.7/0032-zzz_config.patch
> index 3ebc312f3..4abd3fbb3 100644
> --- a/patches/ppp-2.4.5/0032-zzz_config.patch
> +++ b/patches/ppp-2.4.7/0032-zzz_config.patch
> @@ -23,14 +23,13 @@ index c001679..652fb6e 100644
>
> # Uncomment the next 2 lines to include support for Microsoft's
> # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
> -@@ -61,14 +61,14 @@ HAVE_MULTILINK=y
> +@@ -61,14 +61,14 @@
> USE_TDB=y
>
> HAS_SHADOW=y
> -#USE_PAM=y
> --#HAVE_INET6=y
> +USE_PAM=y
> -+HAVE_INET6=y
> + HAVE_INET6=y
>
> # Enable plugins
> PLUGIN=y
> diff --git a/patches/ppp-2.4.5/0033-pppd-make-makefile-sysroot-aware.patch b/patches/ppp-2.4.7/0033-pppd-make-makefile-sysroot-aware.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0033-pppd-make-makefile-sysroot-aware.patch
> rename to patches/ppp-2.4.7/0033-pppd-make-makefile-sysroot-aware.patch
> diff --git a/patches/ppp-2.4.5/0034-pppd-make-the-self-made-configure-cross-aware.patch b/patches/ppp-2.4.7/0034-pppd-make-the-self-made-configure-cross-aware.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0034-pppd-make-the-self-made-configure-cross-aware.patch
> rename to patches/ppp-2.4.7/0034-pppd-make-the-self-made-configure-cross-aware.patch
> diff --git a/patches/ppp-2.4.5/0035-use-CPPFLAGS-when-compiling.patch b/patches/ppp-2.4.7/0035-use-CPPFLAGS-when-compiling.patch
> similarity index 100%
> rename from patches/ppp-2.4.5/0035-use-CPPFLAGS-when-compiling.patch
> rename to patches/ppp-2.4.7/0035-use-CPPFLAGS-when-compiling.patch
> diff --git a/patches/ppp-2.4.5/series b/patches/ppp-2.4.7/series
> similarity index 71%
> rename from patches/ppp-2.4.5/series
> rename to patches/ppp-2.4.7/series
> index 65eb49000..b36b98a96 100644
> --- a/patches/ppp-2.4.5/series
> +++ b/patches/ppp-2.4.7/series
> @@ -1,20 +1,11 @@
> # generated by git-ptx-patches
> #tag:base --start-number 1
> -0001-git-20100307.patch
> -0002-pppoatm_no_modprobe.patch
> 0003-adaptive_echos.patch
> -0004-use_system_logwtmp.patch
> -0005-update_if_pppol2tp.patch
> -0006-dont-exit-pado-timeout.patch
> -0007-fix_warnings.patch
> -0008-man_syntax_errors.patch
> 0009-makefiles_cleanup.patch
> 0010-always_setsid.patch
> 0011-close_dev_ppp.patch
> 0012-chat_man.patch
> -0013-documentation_typos.patch
> 0014-fix_linkpidfile.patch
> -0015-fix_null_pppdb.patch
> 0016-pppdump_use_zlib.patch
> 0017-pppoatm_resolver_light.patch
> 0018-pppoatm_cleanup.patch
> @@ -23,7 +14,6 @@
> 0021-011_scripts_redialer.diff.patch
> 0022-cifdefroute.dif.patch
> 0023-ppp-2.3.11-oedod.dif.patch
> -0024-radius_enanchements.patch
> 0025-radius_mtu.patch
> 0026-018_ip-up_option.diff.patch
> 0027-ppp-2.4.2-stripMSdomain.patch
> @@ -35,5 +25,4 @@
> 0033-pppd-make-makefile-sysroot-aware.patch
> 0034-pppd-make-the-self-made-configure-cross-aware.patch
> 0035-use-CPPFLAGS-when-compiling.patch
> -0036-Remove-old-version-of-Linux-if_pppol2tp.h.patch
> # 0c85b7e722333cbd8a6d8bd40a3a7d11 - git-ptx-patches magic
> diff --git a/rules/ppp.make b/rules/ppp.make
> index 867176091..d3e20fbe1 100644
> --- a/rules/ppp.make
> +++ b/rules/ppp.make
> @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_PPP) += ppp
> #
> # Paths and names
> #
> -PPP_VERSION := 2.4.5
> -PPP_MD5 := 4621bc56167b6953ec4071043fe0ec57
> +PPP_VERSION := 2.4.7
> +PPP_MD5 := 78818f40e6d33a1d1de68a1551f6595a
> PPP := ppp-$(PPP_VERSION)
> PPP_SUFFIX := tar.gz
> PPP_URL := http://ftp.samba.org/pub/ppp/$(PPP).$(PPP_SUFFIX)
> --
> 2.11.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2017-04-21 13:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-05 22:12 [ptxdist] [PATCH] " Ladislav Michl
2017-04-06 9:26 ` [ptxdist] get SVN folder ( without .tar extension) Pedro Lafuente
2017-04-06 11:55 ` Roland Hieber
2017-04-06 12:01 ` Roland Hieber
2017-04-07 9:28 ` Guillermo Rodriguez Garcia
2017-04-12 20:30 ` [ptxdist] [PATCH v2] ppp: version bump 2.4.5 -> 2.4.7 Ladislav Michl
2017-04-21 13:02 ` Michael Olbrich [this message]
2017-04-21 14:11 ` Ladislav Michl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170421130237.k3vdy6u2ct4xrgnv@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=mkl@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox