ppp: update to version 2.4.7.git-2018-06-23

[openwrt/openwrt.git] / package / network / services / ppp / patches / 100-debian_ip-ip_option.patch

diff --git a/package/network/services/ppp/patches/100-debian_ip-ip_option.patch b/package/network/services/ppp/patches/100-debian_ip-ip_option.patch
index 703311fb47a4421b30daa4a724aeb6fde0c59641..a670230b3510ddc2feaa926befc195ffdb1fb22e 100644 (file)
--- a/package/network/services/ppp/patches/100-debian_ip-ip_option.patch
+++ b/package/network/services/ppp/patches/100-debian_ip-ip_option.patch
@@ -48,7 +48,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
      }
 --- a/pppd/main.c
 +++ b/pppd/main.c
-@@ -316,6 +316,9 @@ main(argc, argv)
+@@ -308,6 +308,9 @@ main(argc, argv)
      struct protent *protp;
      char numbuf[16];
  
@@ -60,18 +60,18 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  
 --- a/pppd/options.c
 +++ b/pppd/options.c
-@@ -114,6 +114,8 @@ char       linkname[MAXPATHLEN];   /* logical na
- bool  tune_kernel;            /* may alter kernel settings */
+@@ -118,6 +118,8 @@ bool       tune_kernel;            /* may alter kernel s
  int   connect_delay = 1000;   /* wait this many ms after connect script */
  int   req_unit = -1;          /* requested interface unit */
+ 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 */
  bool  multilink = 0;          /* Enable multilink operation */
  char  *bundle_name = NULL;    /* bundle name for multilink */
  bool  dump_options;           /* print out option values */
-@@ -299,6 +301,13 @@ option_t general_options[] = {
-       "Unset user environment variable",
-       OPT_A2PRINTER | OPT_NOPRINT, (void *)user_unsetprint },
+@@ -317,6 +319,13 @@ option_t general_options[] = {
+       "Metric to use for the default route (Linux only; -1 for default behavior)",
+       OPT_PRIV|OPT_LLIMIT|OPT_INITONLY, NULL, 0, -1 },
  
 +    { "ip-up-script", o_string, path_ipup,
 +      "Set pathname of ip-up script",
@@ -85,10 +85,10 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
        "Enable multilink operation", OPT_PRIO | 1 },
 --- a/pppd/pppd.h
 +++ b/pppd/pppd.h
-@@ -318,6 +318,8 @@ extern bool        tune_kernel;    /* May alter ke
- extern int    connect_delay;  /* Time to delay after connect script */
+@@ -332,6 +332,8 @@ extern int connect_delay;  /* Time to del
  extern int    max_data_rate;  /* max bytes/sec through charshunt */
  extern int    req_unit;       /* interface unit number to use */
+ extern char   req_ifname[MAXIFNAMELEN]; /* interface name to use */
 +extern char   path_ipup[MAXPATHLEN]; /* pathname of ip-up script */
 +extern char   path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */
  extern bool   multilink;      /* enable multilink operation */