diff options
author | Hans Dedecker <dedeckeh@gmail.com> | 2019-10-10 21:53:38 +0200 |
---|---|---|
committer | Hans Dedecker <dedeckeh@gmail.com> | 2019-10-10 22:37:10 +0200 |
commit | f8b58757d0e17560a1ccee29e94783f2d3cefb1e (patch) | |
tree | d3a4d8163c0535a1f18f736537aec02be9545f34 /package/network/services/ppp/patches/100-debian_ip-ip_option.patch | |
parent | 46a129194de0f9e2f71b6526634569e1ec802504 (diff) | |
download | upstream-f8b58757d0e17560a1ccee29e94783f2d3cefb1e.tar.gz upstream-f8b58757d0e17560a1ccee29e94783f2d3cefb1e.tar.bz2 upstream-f8b58757d0e17560a1ccee29e94783f2d3cefb1e.zip |
ppp: update to version 2.4.7.git-2019-10-04
0d004db Revert "pppd: Include time.h before using time_t"
e400854 pppdump: Eliminate printf format warning by using %zd
7f2f0de pppd: Refactor setjmp/longjmp with pipe pair in event wait loop
4e71317 make: Avoid using host include for cross-compiling
3202f89 pppoe: Remove the use of cdefs
d8e8d7a pppd: Remove unused rcsid variables
486f854 pppd: Fix GLIBC version test for non-glibc toolchains
b6cd558 pppd: Include time.h before using time_t
ef8ec11 radius: Fix compiler warning
f6330ec magic: Remove K&R style of arguments
347904e Add Submitting-patches.md
Remove patches 130-no_cdefs_h.patch, 131-missing_prototype_macro.patch,
132-fix_linux_includes.patch as fixed upstream
Refresh patches
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package/network/services/ppp/patches/100-debian_ip-ip_option.patch')
-rw-r--r-- | package/network/services/ppp/patches/100-debian_ip-ip_option.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/ppp/patches/100-debian_ip-ip_option.patch b/package/network/services/ppp/patches/100-debian_ip-ip_option.patch index a670230b35..c9ff869bb1 100644 --- a/package/network/services/ppp/patches/100-debian_ip-ip_option.patch +++ b/package/network/services/ppp/patches/100-debian_ip-ip_option.patch @@ -12,7 +12,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> --- a/pppd/ipcp.c +++ b/pppd/ipcp.c -@@ -1958,7 +1958,7 @@ ipcp_up(f) +@@ -1957,7 +1957,7 @@ ipcp_up(f) */ if (ipcp_script_state == s_down && ipcp_script_pid == 0) { ipcp_script_state = s_up; @@ -21,7 +21,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> } } -@@ -2008,7 +2008,7 @@ ipcp_down(f) +@@ -2007,7 +2007,7 @@ ipcp_down(f) /* Execute the ip-down script */ if (ipcp_script_state == s_up && ipcp_script_pid == 0) { ipcp_script_state = s_down; @@ -30,7 +30,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> } } -@@ -2062,13 +2062,13 @@ ipcp_script_done(arg) +@@ -2061,13 +2061,13 @@ ipcp_script_done(arg) case s_up: if (ipcp_fsm[0].state != OPENED) { ipcp_script_state = s_down; @@ -48,7 +48,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> } --- a/pppd/main.c +++ b/pppd/main.c -@@ -308,6 +308,9 @@ main(argc, argv) +@@ -306,6 +306,9 @@ main(argc, argv) struct protent *protp; char numbuf[16]; @@ -60,7 +60,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> --- a/pppd/options.c +++ b/pppd/options.c -@@ -118,6 +118,8 @@ bool tune_kernel; /* may alter kernel s +@@ -117,6 +117,8 @@ bool tune_kernel; /* may alter kernel s int connect_delay = 1000; /* wait this many ms after connect script */ int req_unit = -1; /* requested interface unit */ char req_ifname[MAXIFNAMELEN]; /* requested interface name */ @@ -69,7 +69,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> bool multilink = 0; /* Enable multilink operation */ char *bundle_name = NULL; /* bundle name for multilink */ bool dump_options; /* print out option values */ -@@ -317,6 +319,13 @@ option_t general_options[] = { +@@ -316,6 +318,13 @@ option_t general_options[] = { "Metric to use for the default route (Linux only; -1 for default behavior)", OPT_PRIV|OPT_LLIMIT|OPT_INITONLY, NULL, 0, -1 }, |