diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-26 04:04:05 +0000 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-26 04:04:05 +0000 |
commit | 74e1ebacbf29188a4d41381d83b2bb47e593b241 (patch) | |
tree | 508a04ffd433fb8c98a78b7c42aca7390835ef3b /user/ppp/musl-fix-headers.patch | |
parent | ce0afc1e48e10bf96d9de42a005669db6d41ed16 (diff) | |
download | packages-74e1ebacbf29188a4d41381d83b2bb47e593b241.tar.gz packages-74e1ebacbf29188a4d41381d83b2bb47e593b241.tar.bz2 packages-74e1ebacbf29188a4d41381d83b2bb47e593b241.tar.xz packages-74e1ebacbf29188a4d41381d83b2bb47e593b241.zip |
user/ppp: [CVE!] Bump to 2.4.8
Diffstat (limited to 'user/ppp/musl-fix-headers.patch')
-rw-r--r-- | user/ppp/musl-fix-headers.patch | 60 |
1 files changed, 11 insertions, 49 deletions
diff --git a/user/ppp/musl-fix-headers.patch b/user/ppp/musl-fix-headers.patch index d24f62896..5b26fc29c 100644 --- a/user/ppp/musl-fix-headers.patch +++ b/user/ppp/musl-fix-headers.patch @@ -28,14 +28,13 @@ diff --git a/pppd/magic.h b/pppd/magic.h index c81213b..305aece 100644 --- a/pppd/magic.h +++ b/pppd/magic.h -@@ -42,6 +42,8 @@ - * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ +@@ -43,5 +43,7 @@ */ +#include <sys/cdefs.h> + - void magic_init __P((void)); /* Initialize the magic number generator */ - u_int32_t magic __P((void)); /* Returns the next magic number */ + void magic_init (void); /* Initialize the magic number generator */ + u_int32_t magic (void); /* Returns the next magic number */ diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c index 91e9a57..9c0fac3 100644 @@ -88,50 +87,13 @@ index 3d3bf4e..b5f82d3 100644 /* Initialize frame types to RFC 2516 values. Some broken peers apparently use different frame types... sigh... */ -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..4d68147 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -86,18 +86,6 @@ typedef unsigned long UINT32_t; - - #include <netinet/in.h> - --#ifdef HAVE_NETINET_IF_ETHER_H --#include <sys/types.h> -- --#ifdef HAVE_SYS_SOCKET_H --#include <sys/socket.h> --#endif --#ifndef HAVE_SYS_DLPI_H --#include <netinet/if_ether.h> --#endif --#endif -- -- - - /* Ethernet frame types according to RFC 2516 */ - #define ETH_PPPOE_DISCOVERY 0x8863 -diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c -index 6d71530..86d224e 100644 ---- a/pppd/sys-linux.c -+++ b/pppd/sys-linux.c -@@ -102,19 +102,11 @@ - #define MAX_ADDR_LEN 7 - #endif - --#if __GLIBC__ >= 2 - #include <asm/types.h> /* glibc 2 conflicts with linux/types.h */ - #include <net/if.h> - #include <net/if_arp.h> - #include <net/route.h> - #include <netinet/if_ether.h> --#else --#include <linux/types.h> --#include <linux/if.h> --#include <linux/if_arp.h> --#include <linux/route.h> --#include <linux/if_ether.h> --#endif +--- ppp-ppp-2.4.8/pppd/plugins/rp-pppoe/pppoe.h.old 2019-12-31 01:31:26.000000000 +0000 ++++ ppp-ppp-2.4.8/pppd/plugins/rp-pppoe/pppoe.h 2020-02-26 04:01:48.414595401 +0000 +@@ -46,6 +46,7 @@ + /* This has to be included before Linux 4.8's linux/in.h + * gets dragged in. */ #include <netinet/in.h> - #include <arpa/inet.h> ++#include <netinet/if_ether.h> + /* Ugly header files on some Linux boxes... */ + #if defined(HAVE_LINUX_IF_H) |