Changeset 34171


Ignore:
Timestamp:
2012-11-12T20:13:45+01:00 (5 years ago)
Author:
jow
Message:

ppp:

  • fix multilink ppp with custom ifnames, patch by George Kashperko <george@…>
  • refresh patches
Location:
trunk/package/network/services/ppp
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/services/ppp/Makefile

    r33660 r34171  
    1111PKG_NAME:=ppp 
    1212PKG_VERSION:=2.4.5 
    13 PKG_RELEASE:=6 
     13PKG_RELEASE:=7 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
  • trunk/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch

    r32463 r34171  
    1313--- a/pppd/sys-linux.c 
    1414+++ b/pppd/sys-linux.c 
    15 @@ -1743,6 +1743,7 @@ int cifdefaultroute (int unit, u_int32_t 
     15@@ -1755,6 +1755,7 @@ int cifdefaultroute (int unit, u_int32_t 
    1616        SIN_ADDR(rt.rt_genmask) = 0L; 
    1717     } 
  • trunk/package/network/services/ppp/patches/340-populate_default_gateway.patch

    r32463 r34171  
    1414--- a/pppd/sys-linux.c 
    1515+++ b/pppd/sys-linux.c 
    16 @@ -1697,6 +1697,9 @@ int sifdefaultroute (int unit, u_int32_t 
     16@@ -1709,6 +1709,9 @@ int sifdefaultroute (int unit, u_int32_t 
    1717     memset (&rt, 0, sizeof (rt)); 
    1818     SET_SA_FAMILY (rt.rt_dst, AF_INET); 
     
    2424  
    2525     if (kernel_version > KVERSION(2,1,0)) { 
    26 @@ -1704,7 +1707,7 @@ int sifdefaultroute (int unit, u_int32_t 
     26@@ -1716,7 +1719,7 @@ int sifdefaultroute (int unit, u_int32_t 
    2727        SIN_ADDR(rt.rt_genmask) = 0L; 
    2828     } 
  • trunk/package/network/services/ppp/patches/400-simplify_kernel_checks.patch

    r32463 r34171  
    3030 #define MAX_IFS                100 
    3131  
    32 @@ -1438,11 +1438,12 @@ int ccp_fatal_error (int unit) 
     32@@ -1450,11 +1450,12 @@ int ccp_fatal_error (int unit) 
    3333  * 
    3434  * path_to_procfs - find the path to the proc file system mount point 
     
    4545     FILE *fp; 
    4646  
    47 @@ -1464,6 +1465,7 @@ static char *path_to_procfs(const char * 
     47@@ -1476,6 +1477,7 @@ static char *path_to_procfs(const char * 
    4848            fclose (fp); 
    4949        } 
     
    5353     strlcpy(proc_path + proc_path_len, tail, 
    5454            sizeof(proc_path) - proc_path_len); 
    55 @@ -2116,15 +2118,19 @@ int ppp_available(void) 
     55@@ -2128,15 +2130,19 @@ int ppp_available(void) 
    5656     int    my_version, my_modification, my_patch; 
    5757     int osmaj, osmin, ospatch; 
     
    7373        /* XXX should get from driver */ 
    7474        driver_version = 2; 
    75 @@ -2185,6 +2191,7 @@ int ppp_available(void) 
     75@@ -2197,6 +2203,7 @@ int ppp_available(void) 
    7676  
    7777     if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP)) 
     
    8181 /* 
    8282  *  This is the PPP device. Validate the version of the driver at this 
    83 @@ -2678,6 +2685,7 @@ get_pty(master_fdp, slave_fdp, slave_nam 
     83@@ -2690,6 +2697,7 @@ get_pty(master_fdp, slave_fdp, slave_nam 
    8484     } 
    8585 #endif /* TIOCGPTN */ 
     
    8989        /* the old way - scan through the pty name space */ 
    9090        for (i = 0; i < 64; ++i) { 
    91 @@ -2696,6 +2704,7 @@ get_pty(master_fdp, slave_fdp, slave_nam 
     91@@ -2708,6 +2716,7 @@ get_pty(master_fdp, slave_fdp, slave_nam 
    9292            } 
    9393        } 
  • trunk/package/network/services/ppp/patches/403-no_wtmp.patch

    r32463 r34171  
    88--- a/pppd/sys-linux.c 
    99+++ b/pppd/sys-linux.c 
    10 @@ -2254,6 +2254,7 @@ int ppp_available(void) 
     10@@ -2266,6 +2266,7 @@ int ppp_available(void) 
    1111  
    1212 void logwtmp (const char *line, const char *name, const char *host) 
     
    1616     pid_t  mypid = getpid(); 
    1717 #if __GLIBC__ < 2 
    18 @@ -2319,6 +2320,7 @@ void logwtmp (const char *line, const ch 
     18@@ -2331,6 +2332,7 @@ void logwtmp (const char *line, const ch 
    1919        close (wtmp); 
    2020     } 
Note: See TracChangeset for help on using the changeset viewer.