summaryrefslogtreecommitdiffstats
path: root/net-dialup/ppp
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
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')
-rw-r--r--net-dialup/ppp/Manifest2
-rw-r--r--net-dialup/ppp/files/ppp-2.4.7-musl.diff52
2 files changed, 42 insertions, 12 deletions
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 8709993..884e83c 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,6 +1,6 @@
AUX README.mpls 530 SHA256 5ef99aba902533fe9d17b7dfaf91e72b638cc70b9f811d1e518822ee80b5ff57 SHA512 2b617365fce74cceeb14e53f476b454c4420273661050d25e1c524cf5d56a7554318a268f7b9ebb100592b61a01d274efaeed28abb9ca0adaeb71ef981201b36 WHIRLPOOL f96310ae7e75bd4e289d97767f6a74a6a0a0006855068755d7cfb484950e145246472b3a6cffcd0db44c589ed43720f998872ef1e7b12a3ccd02e833d80e6e84
AUX modules.ppp 299 SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3 SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041 WHIRLPOOL dfc2d6fb1a36b74b0dd998739bb1c5977234c2d88100f686fb6faae2826795b0ca217937a7775660421f5ebc356e5e1378849ac6e56fef018eceab6f90bb26e3
-AUX ppp-2.4.7-musl.diff 4603 SHA256 77b218412f3d1dbac23c2e71efbb8e0f8e7fc458ff7a967036a0fa0f940ee0f1 SHA512 be1412a16fc05574d791b092de0419e77e4185a6921b7416dde54def80d85c3e6bc7cb42777a9a5b63cc190a6ca37b20b47484ab8eef8c1e2a1efcf406a348e3 WHIRLPOOL df48691e40df8572b21e17df1274f4d083215f07f03bb389b1dd5fa6fbc6091ddc0a4d03b193492c7899a7a08627a5c013c0f3bc97ebc1bc40f189d97aae67a2
+AUX ppp-2.4.7-musl.diff 5350 SHA256 91e67a03538b1146584b784bfd41f33eb4d0587af66e6df442a3a2ffa259c8af SHA512 ce6381280c5299933ee55cc1039874e9d33900e28198939263ca4b78e1c1b8e88939e198c4e313e7f05ba6d85ff33e8d5ccd5c5ba12c7acfff6d96e767738179 WHIRLPOOL bf6d148ba578ffcdd169c966d13daa541d478a2d400e1a1aad53b52d0e11b55d14b23d0f78f3f9dbb8b3cfd56ea4641d2a15224fcc47fc996c4779429d4e397a
DIST ppp-2.4.7-patches-2.tar.xz 37484 SHA256 ca2a58bb2af2c2a728cfaefab31386239bda2e750765141f9aae65bde38d58f1 SHA512 91d91820a7171dbe93fc4d9235456dd6eaa821b79fd0d34691bd95ecfeec2f571ed69ef07fa5839c78132dbbcb0f6b347e2ac5f794a0a1385055c7bf9a4637b6 WHIRLPOOL 6ba77ffdcf51fd792439c56dd43bab51cb978db395c1a409019e549fb1481a33f0cd8b8b3aaed93dbecb3b5e4b6916e4ef5a5425a6509b05b874add936632173
DIST ppp-2.4.7.tar.gz 688117 SHA256 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 WHIRLPOOL 48f3251e6b955ecfdaf9260b9ea5220d9e355fff836e2f5217ee0b15bf2c93e43f8207005f58bf1f97fb8ff0c76c56df8ecd8536f63c4d84d5940458ba0ba5c3
DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 WHIRLPOOL 74e5e0d7f9bc52d1b9cfeff83fe74c2b38cc10c60636cd9c0f5d67d61dc7da56dbf2bcc84afa29444546792876cb36afbc853a6515ce9b3d83d6de98eacedd1e
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>
+