Changeset 42525


Ignore:
Timestamp:
2014-09-13T22:56:13+02:00 (3 years ago)
Author:
hauke
Message:

ppp: update to version 2.4.7

This fixes: CVE-2014-3158 and some other bugs.

Signed-off-by: Hauke Mehrtens <hauke@…>

Location:
trunk/package/network/services/ppp
Files:
1 deleted
14 edited

Legend:

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

    r42158 r42525  
    1010 
    1111PKG_NAME:=ppp 
    12 PKG_VERSION:=2.4.6 
     12PKG_VERSION:=2.4.7 
    1313PKG_RELEASE:=2 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ 
    17 PKG_MD5SUM:=3434d2cc9327167a0723aaaa8670083b 
     17PKG_MD5SUM:=78818f40e6d33a1d1de68a1551f6595a 
    1818PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> 
    1919 
  • trunk/package/network/services/ppp/patches/100-debian_ip-ip_option.patch

    r41193 r42525  
    8686--- a/pppd/pppd.h 
    8787+++ b/pppd/pppd.h 
    88 @@ -317,6 +317,8 @@ extern bool tune_kernel;    /* May alter ke 
     88@@ -318,6 +318,8 @@ extern bool tune_kernel;    /* May alter ke 
    8989 extern int     connect_delay;  /* Time to delay after connect script */ 
    9090 extern int     max_data_rate;  /* max bytes/sec through charshunt */ 
  • trunk/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch

    r32463 r42525  
    1313--- a/pppd/sys-linux.c 
    1414+++ b/pppd/sys-linux.c 
    15 @@ -453,6 +453,13 @@ int generic_establish_ppp (int fd) 
     15@@ -458,6 +458,13 @@ int generic_establish_ppp (int fd) 
    1616     if (new_style_driver) { 
    1717        int flags; 
  • trunk/package/network/services/ppp/patches/105-debian_demand.patch

    r41193 r42525  
    151151--- a/pppd/ipv6cp.c 
    152152+++ b/pppd/ipv6cp.c 
    153 @@ -1243,7 +1243,7 @@ ipv6cp_up(f) 
     153@@ -1232,7 +1232,7 @@ ipv6cp_up(f) 
    154154            } 
    155155  
     
    162162--- a/pppd/pppd.h 
    163163+++ b/pppd/pppd.h 
    164 @@ -584,7 +584,7 @@ void demand_conf __P((void));       /* config 
     164@@ -585,7 +585,7 @@ void demand_conf __P((void));       /* config 
    165165 void demand_block __P((void)); /* set all NPs to queue up packets */ 
    166166 void demand_unblock __P((void)); /* set all NPs to pass packets */ 
  • trunk/package/network/services/ppp/patches/110-debian_defaultroute.patch

    r41193 r42525  
    154154--- a/pppd/pppd.h 
    155155+++ b/pppd/pppd.h 
    156 @@ -664,7 +664,7 @@ int  sif6addr __P((int, eui64_t, eui64_t 
     156@@ -667,7 +667,7 @@ int  sif6addr __P((int, eui64_t, eui64_t 
    157157 int  cif6addr __P((int, eui64_t, eui64_t)); 
    158158                                /* Remove an IPv6 address from i/f */ 
     
    165165--- a/pppd/sys-linux.c 
    166166+++ b/pppd/sys-linux.c 
    167 @@ -206,6 +206,8 @@ static unsigned char inbuf[512]; /* buff 
    168   
     167@@ -207,6 +207,8 @@ static unsigned char inbuf[512]; /* buff 
    169168 static int     if_is_up;       /* Interface has been marked up */ 
     169 static int     if6_is_up;      /* Interface has been marked up for IPv6, to help differentiate */ 
    170170 static int     have_default_route;     /* Gateway for default route added */ 
    171171+static struct  rtentry old_def_rt;     /* Old default route */ 
     
    174174 static char proxy_arp_dev[16];         /* Device for proxy arp entry */ 
    175175 static u_int32_t our_old_addr;         /* for detecting address changes */ 
    176 @@ -1544,6 +1546,9 @@ static int read_route_table(struct rtent 
     176@@ -1552,6 +1554,9 @@ static int read_route_table(struct rtent 
    177177        p = NULL; 
    178178     } 
     
    184184     SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16); 
    185185     SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16); 
    186 @@ -1613,20 +1618,51 @@ int have_route_to(u_int32_t addr) 
     186@@ -1621,20 +1626,51 @@ int have_route_to(u_int32_t addr) 
    187187 /******************************************************************** 
    188188  * 
     
    249249  
    250250     memset (&rt, 0, sizeof (rt)); 
    251 @@ -1641,10 +1677,16 @@ int sifdefaultroute (int unit, u_int32_t 
     251@@ -1649,10 +1685,16 @@ int sifdefaultroute (int unit, u_int32_t 
    252252  
    253253     rt.rt_flags = RTF_UP; 
     
    267267     have_default_route = 1; 
    268268     return 1; 
    269 @@ -1675,11 +1717,21 @@ int cifdefaultroute (int unit, u_int32_t 
     269@@ -1683,11 +1725,21 @@ int cifdefaultroute (int unit, u_int32_t 
    270270     rt.rt_flags = RTF_UP; 
    271271     if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { 
     
    292292--- a/pppd/sys-solaris.c 
    293293+++ b/pppd/sys-solaris.c 
    294 @@ -2036,12 +2036,18 @@ cifaddr(u, o, h) 
     294@@ -2039,12 +2039,18 @@ cifaddr(u, o, h) 
    295295  * sifdefaultroute - assign a default route through the address given. 
    296296  */ 
  • trunk/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch

    r41193 r42525  
    4949--- a/pppd/ipv6cp.c 
    5050+++ b/pppd/ipv6cp.c 
    51 @@ -1303,7 +1303,7 @@ ipv6cp_up(f) 
     51@@ -1269,7 +1269,7 @@ ipv6cp_up(f) 
    5252      */ 
    5353     if (ipv6cp_script_state == s_down && ipv6cp_script_pid == 0) { 
     
    5858 } 
    5959  
    60 @@ -1357,7 +1357,7 @@ ipv6cp_down(f) 
     60@@ -1321,7 +1321,7 @@ ipv6cp_down(f) 
    6161     /* Execute the ipv6-down script */ 
    6262     if (ipv6cp_script_state == s_up && ipv6cp_script_pid == 0) { 
     
    6767 } 
    6868  
    69 @@ -1400,13 +1400,13 @@ ipv6cp_script_done(arg) 
     69@@ -1364,13 +1364,13 @@ ipv6cp_script_done(arg) 
    7070     case s_up: 
    7171        if (ipv6cp_fsm[0].state != OPENED) { 
     
    8585--- a/pppd/pppd.h 
    8686+++ b/pppd/pppd.h 
    87 @@ -319,6 +319,8 @@ extern int  max_data_rate;  /* max bytes/s 
     87@@ -320,6 +320,8 @@ extern int  max_data_rate;  /* max bytes/s 
    8888 extern int     req_unit;       /* interface unit number to use */ 
    8989 extern char    path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ 
  • trunk/package/network/services/ppp/patches/310-precompile_filter.patch

    r41193 r42525  
    7878     { "maxoctets", o_int, &maxoctets, 
    7979       "Set connection traffic limit", 
    80 @@ -1488,6 +1504,29 @@ callfile(argv) 
     80@@ -1493,6 +1509,29 @@ callfile(argv) 
    8181     return ok; 
    8282 } 
  • trunk/package/network/services/ppp/patches/320-custom_iface_names.patch

    r41193 r42525  
    5757  * Limits. 
    5858  */ 
    59 @@ -316,6 +320,7 @@ extern char *record_file;   /* File to rec 
     59@@ -317,6 +321,7 @@ extern char *record_file;   /* File to rec 
    6060 extern bool    sync_serial;    /* Device is synchronous serial device */ 
    6161 extern int     maxfail;        /* Max # of unsuccessful connection attempts */ 
     
    7878 static int ppp_disc = N_PPP;   /* The PPP discpline */ 
    7979 static int initfdflags = -1;   /* Initial file descriptor flags for fd */ 
    80 @@ -615,7 +619,8 @@ void generic_disestablish_ppp(int dev_fd 
     80@@ -620,7 +624,8 @@ void generic_disestablish_ppp(int dev_fd 
    8181  */ 
    8282 static int make_ppp_unit() 
     
    8888        if (ppp_dev_fd >= 0) { 
    8989                dbglog("in make_ppp_unit, already had /dev/ppp open?"); 
    90 @@ -638,6 +643,30 @@ static int make_ppp_unit() 
     90@@ -643,6 +648,30 @@ static int make_ppp_unit() 
    9191        } 
    9292        if (x < 0) 
  • trunk/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch

    r41193 r42525  
    119119--- a/pppd/sys-linux.c 
    120120+++ b/pppd/sys-linux.c 
    121 @@ -693,6 +693,16 @@ void cfg_bundle(int mrru, int mtru, int 
     121@@ -698,6 +698,16 @@ void cfg_bundle(int mrru, int mtru, int 
    122122        add_fd(ppp_dev_fd); 
    123123 } 
     
    136136  * make_new_bundle - create a new PPP unit (i.e. a bundle) 
    137137  * and connect our channel to it.  This should only get called 
    138 @@ -711,6 +721,8 @@ void make_new_bundle(int mrru, int mtru, 
     138@@ -716,6 +726,8 @@ void make_new_bundle(int mrru, int mtru, 
    139139  
    140140        /* set the mrru and flags */ 
  • trunk/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch

    r39963 r42525  
    1313--- a/pppd/sys-linux.c 
    1414+++ b/pppd/sys-linux.c 
    15 @@ -1748,6 +1748,7 @@ int cifdefaultroute (int unit, u_int32_t 
     15@@ -1756,6 +1756,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

    r39963 r42525  
    1414--- a/pppd/sys-linux.c 
    1515+++ b/pppd/sys-linux.c 
    16 @@ -1702,6 +1702,9 @@ int sifdefaultroute (int unit, u_int32_t 
     16@@ -1710,6 +1710,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 @@ -1709,7 +1712,7 @@ int sifdefaultroute (int unit, u_int32_t 
     26@@ -1717,7 +1720,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

    r41193 r42525  
    2020 static char loop_name[20]; 
    2121 static unsigned char inbuf[512]; /* buffer for chars read from loopback */ 
    22 @@ -213,8 +213,8 @@ static int  looped;                 /* 1 if using loop 
     22@@ -214,8 +214,8 @@ static int  looped;                 /* 1 if using loop 
    2323 static int     link_mtu;               /* mtu for the link (not bundle) */ 
    2424  
     
    3030 #define MAX_IFS                100 
    3131  
    32 @@ -1443,11 +1443,12 @@ int ccp_fatal_error (int unit) 
     32@@ -1451,11 +1451,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 @@ -1469,6 +1470,7 @@ static char *path_to_procfs(const char * 
     47@@ -1477,6 +1478,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 @@ -2121,15 +2123,19 @@ int ppp_available(void) 
     55@@ -2129,15 +2131,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 @@ -2189,6 +2195,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 @@ -2684,6 +2691,7 @@ get_pty(master_fdp, slave_fdp, slave_nam 
     83@@ -2730,6 +2737,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 @@ -2702,6 +2710,7 @@ get_pty(master_fdp, slave_fdp, slave_nam 
     91@@ -2748,6 +2756,7 @@ get_pty(master_fdp, slave_fdp, slave_nam 
    9292            } 
    9393        } 
     
    139139--- a/pppd/plugins/pppol2tp/pppol2tp.c 
    140140+++ b/pppd/plugins/pppol2tp/pppol2tp.c 
    141 @@ -500,12 +500,7 @@ static void pppol2tp_cleanup(void) 
     141@@ -486,12 +486,7 @@ static void pppol2tp_cleanup(void) 
    142142  
    143143 void plugin_init(void) 
  • trunk/package/network/services/ppp/patches/401-no_record_file.patch

    r41193 r42525  
    88--- a/pppd/pppd.h 
    99+++ b/pppd/pppd.h 
    10 @@ -316,7 +316,6 @@ extern int  holdoff;        /* Dead time before 
     10@@ -317,7 +317,6 @@ extern int  holdoff;        /* Dead time before 
    1111 extern bool    holdoff_specified; /* true if user gave a holdoff value */ 
    1212 extern bool    notty;          /* Stdin/out is not a tty */ 
     
    1818--- a/pppd/tty.c 
    1919+++ b/pppd/tty.c 
    20 @@ -145,7 +145,7 @@ char        *disconnect_script = NULL; /* Scrip 
     20@@ -146,7 +146,7 @@ char        *disconnect_script = NULL; /* Scrip 
    2121 char   *welcomer = NULL;       /* Script to run after phys link estab. */ 
    2222 char   *ptycommand = NULL;     /* Command to run on other side of pty */ 
     
    2727 bool   sync_serial = 0;        /* Device is synchronous serial device */ 
    2828 char   *pty_socket = NULL;     /* Socket to connect to pty */ 
    29 @@ -201,8 +201,10 @@ option_t tty_options[] = { 
     29@@ -202,8 +202,10 @@ option_t tty_options[] = { 
    3030       "Send and receive over socket, arg is host:port", 
    3131       OPT_PRIO | OPT_DEVNAM }, 
  • trunk/package/network/services/ppp/patches/403-no_wtmp.patch

    r41193 r42525  
    88--- a/pppd/sys-linux.c 
    99+++ b/pppd/sys-linux.c 
    10 @@ -2259,6 +2259,7 @@ int ppp_available(void) 
     10@@ -2267,6 +2267,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 @@ -2324,6 +2325,7 @@ void logwtmp (const char *line, const ch 
     18@@ -2332,6 +2333,7 @@ void logwtmp (const char *line, const ch 
    1919        close (wtmp); 
    2020     } 
Note: See TracChangeset for help on using the changeset viewer.