diff options
author | Martin Schiller <ms@dev.tdt.de> | 2018-12-06 13:10:54 +0100 |
---|---|---|
committer | Hans Dedecker <dedeckeh@gmail.com> | 2019-01-25 14:55:46 +0100 |
commit | eaaee181d194f8908a70833b3298392622bc5c86 (patch) | |
tree | ce33d48f10885c6d9592c28fdf1777a38027920f /package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch | |
parent | f01044e85cad836ad7a31aa5bf5ad1f748f55f4a (diff) | |
download | upstream-eaaee181d194f8908a70833b3298392622bc5c86.tar.gz upstream-eaaee181d194f8908a70833b3298392622bc5c86.tar.bz2 upstream-eaaee181d194f8908a70833b3298392622bc5c86.zip |
ppp: update to version 2.4.7.git-2018-06-23
This bumps ppp to latest git version.
There is one upstream commit, which changes DES encryption calls from
libcrypt / glibc to openssl.
As long as we don't use glibc-2.28, revert this commit.
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Diffstat (limited to 'package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch')
-rw-r--r-- | package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch b/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch index bba5884fa4..88a991fd80 100644 --- a/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch +++ b/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch @@ -8,7 +8,15 @@ Signed-off-by: George Kashperko <george@znau.edu.ua> 2 files changed, 53 insertions(+), 14 deletions(-) --- a/pppd/multilink.c +++ b/pppd/multilink.c -@@ -56,7 +56,8 @@ static void iterate_bundle_links __P((vo +@@ -35,6 +35,7 @@ + #include <signal.h> + #include <netinet/in.h> + #include <unistd.h> ++#include <net/if.h> + + #include "pppd.h" + #include "fsm.h" +@@ -56,7 +57,8 @@ static void iterate_bundle_links __P((vo static int get_default_epdisc __P((struct epdisc *)); static int parse_num __P((char *str, const char *key, int *valp)); @@ -18,7 +26,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua> #define set_ip_epdisc(ep, addr) do { \ ep->length = 4; \ -@@ -197,35 +198,38 @@ mp_join_bundle() +@@ -197,35 +199,38 @@ mp_join_bundle() key.dptr = bundle_id; key.dsize = p - bundle_id; pid = tdb_fetch(pppdb, key); @@ -65,7 +73,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua> } /* we have to make a new bundle */ -@@ -408,22 +412,45 @@ parse_num(str, key, valp) +@@ -408,22 +413,45 @@ parse_num(str, key, valp) return 0; } @@ -118,7 +126,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua> && memcmp(vd.dptr, key.dptr, vd.dsize) == 0; --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -698,6 +698,16 @@ void cfg_bundle(int mrru, int mtru, int +@@ -686,6 +686,16 @@ void cfg_bundle(int mrru, int mtru, int add_fd(ppp_dev_fd); } @@ -135,7 +143,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua> /* * make_new_bundle - create a new PPP unit (i.e. a bundle) * and connect our channel to it. This should only get called -@@ -716,6 +726,8 @@ void make_new_bundle(int mrru, int mtru, +@@ -704,6 +714,8 @@ void make_new_bundle(int mrru, int mtru, /* set the mrru and flags */ cfg_bundle(mrru, mtru, rssn, tssn); |