aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-09-13 20:56:13 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-09-13 20:56:13 +0000
commit2c605ba1f1130d81aa6ff2d070244aa0d6ba386d (patch)
tree7edd487f644bd5a3324aec3ebf31759dd7eac326 /package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch
parenta8e1a031a805d21e40a1e3d20f0176061579720f (diff)
downloadupstream-2c605ba1f1130d81aa6ff2d070244aa0d6ba386d.tar.gz
upstream-2c605ba1f1130d81aa6ff2d070244aa0d6ba386d.tar.bz2
upstream-2c605ba1f1130d81aa6ff2d070244aa0d6ba386d.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> SVN-Revision: 42525
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.patch8
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 */