summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Gerus <arachnist@i.am-a.cat>2015-05-20 10:15:46 +0200
committerRobert Gerus <arachnist@i.am-a.cat>2015-05-20 10:15:46 +0200
commit3bcb0026e3002c6b95a3924286e2418a9f74fdc6 (patch)
tree62322369d571f88f879608e4a26d9d4b7e769582
parent2c638b1099e970253cba7a28a49719070882623e (diff)
downloadgentoo-overlay-3bcb0026e3002c6b95a3924286e2418a9f74fdc6.tar.gz
gentoo-overlay-3bcb0026e3002c6b95a3924286e2418a9f74fdc6.tar.bz2
gentoo-overlay-3bcb0026e3002c6b95a3924286e2418a9f74fdc6.tar.xz
gentoo-overlay-3bcb0026e3002c6b95a3924286e2418a9f74fdc6.zip
Fix for musl… again…
-rw-r--r--net-dialup/ppp/files/ppp-2.4.7-musl.diff54
1 files changed, 40 insertions, 14 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 6403029..1d57444 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:02:17.890008148 +0000
++++ ppp-2.4.7/include/linux/ppp_defs.h 2015-05-20 08:13:50.530007102 +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:03:19.630008055 +0000
++++ ppp-2.4.7/include/net/ppp_defs.h 2015-05-20 08:13:50.530007102 +0000
@@ -38,6 +38,8 @@
#ifndef _PPP_DEFS_H_
#define _PPP_DEFS_H_
@@ -25,9 +25,9 @@ diff -ur ppp-2.4.7.orig/include/net/ppp_defs.h ppp-2.4.7/include/net/ppp_defs.h
* The basic PPP frame.
*/
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 2015-05-20 07:57:46.870008558 +0000
-+++ ppp-2.4.7/pppd/Makefile.linux 2015-05-20 07:58:47.420008466 +0000
-@@ -138,7 +138,7 @@
+--- 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
+@@ -126,7 +126,7 @@
endif
ifdef USE_LIBUTIL
@@ -36,9 +36,10 @@ 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:02:55.830008091 +0000
++++ ppp-2.4.7/pppd/magic.h 2015-05-20 08:13:50.530007102 +0000
@@ -42,6 +42,10 @@
* $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
*/
@@ -50,9 +51,22 @@ diff -ur ppp-2.4.7.orig/pppd/magic.h ppp-2.4.7/pppd/magic.h
void magic_init __P((void)); /* Initialize the magic number generator */
u_int32_t magic __P((void)); /* Returns the next magic number */
+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
+@@ -101,9 +101,6 @@
+ /* Define if you have the <netpacket/packet.h> header file. */
+ #define HAVE_NETPACKET_PACKET_H 1
+
+-/* Define if you have the <sys/cdefs.h> header file. */
+-#define HAVE_SYS_CDEFS_H 1
+-
+ /* Define if you have the <sys/dlpi.h> header file. */
+ /* #undef HAVE_SYS_DLPI_H */
+
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 07:59:13.280008427 +0000
++++ ppp-2.4.7/pppd/plugins/rp-pppoe/if.c 2015-05-20 08:13:50.530007102 +0000
@@ -30,10 +30,6 @@
#include <linux/if_packet.h>
#endif
@@ -66,7 +80,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 07:59:38.730008389 +0000
++++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c 2015-05-20 08:13:50.530007102 +0000
@@ -46,7 +46,6 @@
#include <unistd.h>
#include <fcntl.h>
@@ -76,9 +90,9 @@ diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.7/pppd/plugins/rp
#include <linux/ppp_defs.h>
#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 2015-05-20 07:57:46.640008558 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe-discovery.c 2015-05-20 08:00:10.770008340 +0000
-@@ -28,10 +28,6 @@
+--- 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
+@@ -27,10 +27,6 @@
#include <linux/if_packet.h>
#endif
@@ -89,7 +103,7 @@ diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.7/pppd/p
#ifdef HAVE_ASM_TYPES_H
#include <asm/types.h>
#endif
-@@ -56,6 +52,8 @@
+@@ -55,6 +51,8 @@
exit(status);
}
@@ -98,10 +112,22 @@ 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:01:35.390008213 +0000
-@@ -86,19 +86,6 @@
++++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe.h 2015-05-20 08:14:47.780007016 +0000
+@@ -39,10 +39,6 @@
+ #error Unknown method for accessing raw Ethernet frames
+ #endif
+
+-#ifdef HAVE_SYS_CDEFS_H
+-#include <sys/cdefs.h>
+-#endif
+-
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+@@ -86,19 +82,6 @@
#include <netinet/in.h>