summaryrefslogtreecommitdiffstats
path: root/net-dialup/ppp/files
diff options
context:
space:
mode:
authorRobert Gerus <arachnist@i.am-a.cat>2015-05-20 14:41:46 +0200
committerRobert Gerus <arachnist@i.am-a.cat>2015-05-20 14:41:46 +0200
commit50b38f75dc1a2391fb1c9fc85d1be174be7a4b96 (patch)
tree5f4b7a4be164088757d1338b158cec3e1d88ab3d /net-dialup/ppp/files
parent08f1a599b04ad6fc7771c7285f97aec6e93231bc (diff)
downloadgentoo-overlay-50b38f75dc1a2391fb1c9fc85d1be174be7a4b96.tar.gz
gentoo-overlay-50b38f75dc1a2391fb1c9fc85d1be174be7a4b96.tar.bz2
gentoo-overlay-50b38f75dc1a2391fb1c9fc85d1be174be7a4b96.tar.xz
gentoo-overlay-50b38f75dc1a2391fb1c9fc85d1be174be7a4b96.zip
Another fix for musl in ppp
Diffstat (limited to 'net-dialup/ppp/files')
-rw-r--r--net-dialup/ppp/files/ppp-2.4.7-musl.diff52
1 files changed, 41 insertions, 11 deletions
diff --git a/net-dialup/ppp/files/ppp-2.4.7-musl.diff b/net-dialup/ppp/files/ppp-2.4.7-musl.diff
index 1d57444..8b75727 100644
--- a/net-dialup/ppp/files/ppp-2.4.7-musl.diff
+++ b/net-dialup/ppp/files/ppp-2.4.7-musl.diff
@@ -1,6 +1,6 @@
diff -ur ppp-2.4.7.orig/include/linux/ppp_defs.h ppp-2.4.7/include/linux/ppp_defs.h
--- ppp-2.4.7.orig/include/linux/ppp_defs.h 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/include/linux/ppp_defs.h 2015-05-20 08:13:50.530007102 +0000
++++ ppp-2.4.7/include/linux/ppp_defs.h 2015-05-20 12:38:46.739983089 +0000
@@ -50,6 +50,10 @@
#ifndef _PPP_DEFS_H_
#define _PPP_DEFS_H_
@@ -14,7 +14,7 @@ diff -ur ppp-2.4.7.orig/include/linux/ppp_defs.h ppp-2.4.7/include/linux/ppp_def
*/
diff -ur ppp-2.4.7.orig/include/net/ppp_defs.h ppp-2.4.7/include/net/ppp_defs.h
--- ppp-2.4.7.orig/include/net/ppp_defs.h 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/include/net/ppp_defs.h 2015-05-20 08:13:50.530007102 +0000
++++ ppp-2.4.7/include/net/ppp_defs.h 2015-05-20 12:38:46.739983089 +0000
@@ -38,6 +38,8 @@
#ifndef _PPP_DEFS_H_
#define _PPP_DEFS_H_
@@ -26,7 +26,7 @@ diff -ur ppp-2.4.7.orig/include/net/ppp_defs.h ppp-2.4.7/include/net/ppp_defs.h
*/
diff -ur ppp-2.4.7.orig/pppd/Makefile.linux ppp-2.4.7/pppd/Makefile.linux
--- ppp-2.4.7.orig/pppd/Makefile.linux 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/Makefile.linux 2015-05-20 08:13:50.530007102 +0000
++++ ppp-2.4.7/pppd/Makefile.linux 2015-05-20 12:38:46.739983089 +0000
@@ -126,7 +126,7 @@
endif
@@ -36,10 +36,9 @@ diff -ur ppp-2.4.7.orig/pppd/Makefile.linux ppp-2.4.7/pppd/Makefile.linux
LIBS += -lutil
endif
-Only in ppp-2.4.7/pppd: Makefile.linux.orig
diff -ur ppp-2.4.7.orig/pppd/magic.h ppp-2.4.7/pppd/magic.h
--- ppp-2.4.7.orig/pppd/magic.h 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/magic.h 2015-05-20 08:13:50.530007102 +0000
++++ ppp-2.4.7/pppd/magic.h 2015-05-20 12:38:46.739983089 +0000
@@ -42,6 +42,10 @@
* $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
*/
@@ -53,7 +52,7 @@ diff -ur ppp-2.4.7.orig/pppd/magic.h ppp-2.4.7/pppd/magic.h
diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/config.h ppp-2.4.7/pppd/plugins/rp-pppoe/config.h
--- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/config.h 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/config.h 2015-05-20 08:14:22.090007054 +0000
++++ ppp-2.4.7/pppd/plugins/rp-pppoe/config.h 2015-05-20 12:38:46.739983089 +0000
@@ -101,9 +101,6 @@
/* Define if you have the <netpacket/packet.h> header file. */
#define HAVE_NETPACKET_PACKET_H 1
@@ -66,7 +65,7 @@ diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/config.h ppp-2.4.7/pppd/plugins/rp
diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.7/pppd/plugins/rp-pppoe/if.c
--- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/if.c 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/if.c 2015-05-20 08:13:50.530007102 +0000
++++ ppp-2.4.7/pppd/plugins/rp-pppoe/if.c 2015-05-20 12:38:46.739983089 +0000
@@ -30,10 +30,6 @@
#include <linux/if_packet.h>
#endif
@@ -80,7 +79,7 @@ diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.7/pppd/plugins/rp-ppp
#endif
diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c
--- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c 2015-05-20 08:13:50.530007102 +0000
++++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c 2015-05-20 12:38:46.739983089 +0000
@@ -46,7 +46,6 @@
#include <unistd.h>
#include <fcntl.h>
@@ -91,7 +90,7 @@ diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.7/pppd/plugins/rp
#include <linux/if_pppox.h>
diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe-discovery.c
--- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe-discovery.c 2015-05-20 08:13:50.530007102 +0000
++++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe-discovery.c 2015-05-20 12:38:46.739983089 +0000
@@ -27,10 +27,6 @@
#include <linux/if_packet.h>
#endif
@@ -112,10 +111,9 @@ diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.7/pppd/p
/* Initialize frame types to RFC 2516 values. Some broken peers apparently
use different frame types... sigh... */
-Only in ppp-2.4.7/pppd/plugins/rp-pppoe: pppoe-discovery.c.orig
diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe.h ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe.h
--- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe.h 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe.h 2015-05-20 08:14:47.780007016 +0000
++++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe.h 2015-05-20 12:38:46.739983089 +0000
@@ -39,10 +39,6 @@
#error Unknown method for accessing raw Ethernet frames
#endif
@@ -147,3 +145,35 @@ diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe.h ppp-2.4.7/pppd/plugins/rp-
/* Ethernet frame types according to RFC 2516 */
#define ETH_PPPOE_DISCOVERY 0x8863
#define ETH_PPPOE_SESSION 0x8864
+diff -ur ppp-2.4.7.orig/pppd/sys-linux.c ppp-2.4.7/pppd/sys-linux.c
+--- ppp-2.4.7.orig/pppd/sys-linux.c 2014-08-09 12:31:39.000000000 +0000
++++ ppp-2.4.7/pppd/sys-linux.c 2015-05-20 12:39:38.269983011 +0000
+@@ -73,7 +73,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <sys/file.h>
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
+@@ -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
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+