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/400-simplify_kernel_checks.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/400-simplify_kernel_checks.patch')
-rw-r--r-- | package/network/services/ppp/patches/400-simplify_kernel_checks.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package/network/services/ppp/patches/400-simplify_kernel_checks.patch b/package/network/services/ppp/patches/400-simplify_kernel_checks.patch index cea9e16c2e..05cbdb11ba 100644 --- a/package/network/services/ppp/patches/400-simplify_kernel_checks.patch +++ b/package/network/services/ppp/patches/400-simplify_kernel_checks.patch @@ -10,7 +10,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -196,7 +196,7 @@ static int driver_is_old = 0; +@@ -192,7 +192,7 @@ static int driver_is_old = 0; static int restore_term = 0; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ @@ -19,7 +19,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> static char loop_name[20]; static unsigned char inbuf[512]; /* buffer for chars read from loopback */ -@@ -214,8 +214,8 @@ static int looped; /* 1 if using loop +@@ -210,8 +210,8 @@ static int looped; /* 1 if using loop static int link_mtu; /* mtu for the link (not bundle) */ static struct utsname utsname; /* for the kernel version */ @@ -29,7 +29,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> #define MAX_IFS 100 -@@ -1451,11 +1451,12 @@ int ccp_fatal_error (int unit) +@@ -1439,11 +1439,12 @@ int ccp_fatal_error (int unit) * * path_to_procfs - find the path to the proc file system mount point */ @@ -44,7 +44,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> struct mntent *mntent; FILE *fp; -@@ -1477,6 +1478,7 @@ static char *path_to_procfs(const char * +@@ -1465,6 +1466,7 @@ static char *path_to_procfs(const char * fclose (fp); } } @@ -52,7 +52,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> strlcpy(proc_path + proc_path_len, tail, sizeof(proc_path) - proc_path_len); -@@ -2129,15 +2131,19 @@ int ppp_available(void) +@@ -2126,15 +2128,19 @@ int ppp_available(void) int my_version, my_modification, my_patch; int osmaj, osmin, ospatch; @@ -72,7 +72,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> /* XXX should get from driver */ driver_version = 2; -@@ -2197,6 +2203,7 @@ int ppp_available(void) +@@ -2194,6 +2200,7 @@ int ppp_available(void) if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP)) ok = 0; @@ -80,7 +80,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> /* * This is the PPP device. Validate the version of the driver at this -@@ -2730,6 +2737,7 @@ get_pty(master_fdp, slave_fdp, slave_nam +@@ -2727,6 +2734,7 @@ get_pty(master_fdp, slave_fdp, slave_nam } #endif /* TIOCGPTN */ @@ -88,7 +88,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> if (sfd < 0) { /* the old way - scan through the pty name space */ for (i = 0; i < 64; ++i) { -@@ -2748,6 +2756,7 @@ get_pty(master_fdp, slave_fdp, slave_nam +@@ -2745,6 +2753,7 @@ get_pty(master_fdp, slave_fdp, slave_nam } } } @@ -125,7 +125,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> char *pppd_pppoe_service = NULL; static char *acName = NULL; static char *existingSession = NULL; -@@ -371,10 +368,6 @@ PPPoEDevnameHook(char *cmd, char **argv, +@@ -372,10 +369,6 @@ PPPoEDevnameHook(char *cmd, char **argv, void plugin_init(void) { |