diff options
| author | John Crispin <blogic@openwrt.org> | 2014-09-18 15:24:22 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-09-18 15:24:22 +0000 |
| commit | d06df271fb99ab6b5193c359f2d02dc912c66fbc (patch) | |
| tree | f4b30a1c17c87e11db653f82fa4b831d5c00575f /package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch | |
| parent | 1dc0ebc894d49c2a095387c9706fae2c5b4f7c99 (diff) | |
| download | upstream-d06df271fb99ab6b5193c359f2d02dc912c66fbc.tar.gz upstream-d06df271fb99ab6b5193c359f2d02dc912c66fbc.tar.bz2 upstream-d06df271fb99ab6b5193c359f2d02dc912c66fbc.zip | |
ppp: update to version 2.4.7
This fixes: CVE-2014-3158 and some other bugs.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Backport of r42525
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42613 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 | 8 |
1 files changed, 4 insertions, 4 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 b59c33e623..0e57029d61 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 @@ -48,7 +48,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> "Enable multilink operation", OPT_PRIO | 1 }, --- a/pppd/ipv6cp.c +++ b/pppd/ipv6cp.c -@@ -1303,7 +1303,7 @@ ipv6cp_up(f) +@@ -1269,7 +1269,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 <jow@openwrt.org> } } -@@ -1357,7 +1357,7 @@ ipv6cp_down(f) +@@ -1321,7 +1321,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 <jow@openwrt.org> } } -@@ -1400,13 +1400,13 @@ ipv6cp_script_done(arg) +@@ -1364,13 +1364,13 @@ ipv6cp_script_done(arg) case s_up: if (ipv6cp_fsm[0].state != OPENED) { ipv6cp_script_state = s_down; @@ -84,7 +84,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> } --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -319,6 +319,8 @@ extern int max_data_rate; /* max bytes/s +@@ -320,6 +320,8 @@ extern int max_data_rate; /* max bytes/s extern int req_unit; /* interface unit number to use */ extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ |