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/120-debian_ipv6_updown_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/120-debian_ipv6_updown_option.patch')
-rw-r--r-- | package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch index 8842404d10..1971ac049f 100644 --- a/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch +++ b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch @@ -12,7 +12,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> --- a/pppd/main.c +++ b/pppd/main.c -@@ -310,6 +310,8 @@ main(argc, argv) +@@ -308,6 +308,8 @@ main(argc, argv) strlcpy(path_ipup, _PATH_IPUP, sizeof(path_ipup)); strlcpy(path_ipdown, _PATH_IPDOWN, sizeof(path_ipdown)); @@ -23,7 +23,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> new_phase(PHASE_INITIALIZE); --- a/pppd/options.c +++ b/pppd/options.c -@@ -120,6 +120,8 @@ int req_unit = -1; /* requested interfa +@@ -119,6 +119,8 @@ int req_unit = -1; /* requested interfa char req_ifname[MAXIFNAMELEN]; /* requested interface name */ char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ char path_ipdown[MAXPATHLEN];/* pathname of ip-down script */ @@ -32,7 +32,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 */ -@@ -326,6 +328,13 @@ option_t general_options[] = { +@@ -325,6 +327,13 @@ option_t general_options[] = { "Set pathname of ip-down script", OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, @@ -48,7 +48,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> "Enable multilink operation", OPT_PRIO | 1 }, --- a/pppd/ipv6cp.c +++ b/pppd/ipv6cp.c -@@ -1269,7 +1269,7 @@ ipv6cp_up(f) +@@ -1268,7 +1268,7 @@ ipv6cp_up(f) */ if (ipv6cp_script_state == s_down && ipv6cp_script_pid == 0) { ipv6cp_script_state = s_up; @@ -57,7 +57,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> } } -@@ -1321,7 +1321,7 @@ ipv6cp_down(f) +@@ -1320,7 +1320,7 @@ ipv6cp_down(f) /* Execute the ipv6-down script */ if (ipv6cp_script_state == s_up && ipv6cp_script_pid == 0) { ipv6cp_script_state = s_down; @@ -66,7 +66,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> } } -@@ -1364,13 +1364,13 @@ ipv6cp_script_done(arg) +@@ -1363,13 +1363,13 @@ ipv6cp_script_done(arg) case s_up: if (ipv6cp_fsm[0].state != OPENED) { ipv6cp_script_state = s_down; |