ppp: update to version 2.4.7.git-2019-10-04

[openwrt/openwrt.git] / package / network / services / ppp / patches / 120-debian_ipv6_updown_option.patch

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 8842404d10eb6cd3457166b125374649d210646e..1971ac049f35c32711a0ca9f99a948cf71a8933b 100644 (file)
--- 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;