On Wed, Apr 12, 2017 at 10:30:51PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl
> ---
> 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..0
> --- a/patches/ppp-2.4.5/0001-git-20100307.patch
> +++ /dev/null
> @@ -1,134 +0,0 @@
> -From: Marco d'Itri
> -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);
> -+