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

[openwrt/openwrt.git] / package / network / services / ppp / patches / 110-debian_defaultroute.patch

diff --git a/package/network/services/ppp/patches/110-debian_defaultroute.patch b/package/network/services/ppp/patches/110-debian_defaultroute.patch
index bdc271dbea54c1850bfb2abd883675e02f9ec043..f90005b7e37f982e634b523d03fb10362443816f 100644 (file)
--- a/package/network/services/ppp/patches/110-debian_defaultroute.patch
+++ b/package/network/services/ppp/patches/110-debian_defaultroute.patch
@@ -12,7 +12,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 
 --- a/pppd/ipcp.c
 +++ b/pppd/ipcp.c
-@@ -198,6 +198,14 @@ static option_t ipcp_option_list[] = {
+@@ -197,6 +197,14 @@ static option_t ipcp_option_list[] = {
        "disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
        &ipcp_wantoptions[0].default_route },
  
@@ -27,7 +27,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
      { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
        "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
      { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
-@@ -271,7 +279,7 @@ struct protent ipcp_protent = {
+@@ -270,7 +278,7 @@ struct protent ipcp_protent = {
      ip_active_pkt
  };
  
@@ -36,7 +36,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  static void ipcp_script __P((char *, int));   /* Run an up/down script */
  static void ipcp_script_done __P((void *));
  
-@@ -1761,7 +1769,8 @@ ip_demand_conf(u)
+@@ -1760,7 +1768,8 @@ ip_demand_conf(u)
      if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
        return 0;
      if (wo->default_route)
@@ -46,7 +46,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
            default_route_set[u] = 1;
      if (wo->proxy_arp)
        if (sifproxyarp(u, wo->hisaddr))
-@@ -1849,7 +1858,8 @@ ipcp_up(f)
+@@ -1848,7 +1857,8 @@ ipcp_up(f)
       */
      if (demand) {
        if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
@@ -56,7 +56,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
            if (go->ouraddr != wo->ouraddr) {
                warn("Local IP address changed to %I", go->ouraddr);
                script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
-@@ -1874,7 +1884,8 @@ ipcp_up(f)
+@@ -1873,7 +1883,8 @@ ipcp_up(f)
  
            /* assign a default route through the interface if required */
            if (ipcp_wantoptions[f->unit].default_route) 
@@ -66,7 +66,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
                    default_route_set[f->unit] = 1;
  
            /* Make a proxy ARP entry if requested. */
-@@ -1924,7 +1935,8 @@ ipcp_up(f)
+@@ -1923,7 +1934,8 @@ ipcp_up(f)
  
        /* assign a default route through the interface if required */
        if (ipcp_wantoptions[f->unit].default_route) 
@@ -76,7 +76,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
                default_route_set[f->unit] = 1;
  
        /* Make a proxy ARP entry if requested. */
-@@ -2002,7 +2014,7 @@ ipcp_down(f)
+@@ -2001,7 +2013,7 @@ ipcp_down(f)
        sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
        sifdown(f->unit);
        ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
@@ -85,7 +85,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
      }
  
      /* Execute the ip-down script */
-@@ -2018,16 +2030,25 @@ ipcp_down(f)
+@@ -2017,16 +2029,25 @@ ipcp_down(f)
   * proxy arp entries, etc.
   */
  static void
@@ -292,7 +292,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  }
 --- a/pppd/sys-solaris.c
 +++ b/pppd/sys-solaris.c
-@@ -2039,12 +2039,18 @@ cifaddr(u, o, h)
+@@ -2038,12 +2038,18 @@ cifaddr(u, o, h)
   * sifdefaultroute - assign a default route through the address given.
   */
  int