diff options
author | Robert Gerus <arachnist@i.am-a.cat> | 2015-05-20 10:05:44 +0200 |
---|---|---|
committer | Robert Gerus <arachnist@i.am-a.cat> | 2015-05-20 10:05:44 +0200 |
commit | 2c638b1099e970253cba7a28a49719070882623e (patch) | |
tree | 64f18e786536f3dcf5c0f1699c47acdd95bcb07d | |
parent | 44c7d04199bc26b703482e225276ffea2c7585b9 (diff) | |
download | gentoo-overlay-2c638b1099e970253cba7a28a49719070882623e.tar.gz gentoo-overlay-2c638b1099e970253cba7a28a49719070882623e.tar.bz2 gentoo-overlay-2c638b1099e970253cba7a28a49719070882623e.tar.xz gentoo-overlay-2c638b1099e970253cba7a28a49719070882623e.zip |
Fix for musl… again
-rw-r--r-- | net-dialup/ppp/Manifest | 4 | ||||
-rw-r--r-- | net-dialup/ppp/files/musl.patch | 136 | ||||
-rw-r--r-- | net-dialup/ppp/files/ppp-2.4.7-musl.diff | 123 | ||||
-rw-r--r-- | net-dialup/ppp/ppp-2.4.7-r1.ebuild | 2 |
4 files changed, 126 insertions, 139 deletions
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index bd025f7..646d7c0 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,7 +1,7 @@ AUX README.mpls 530 SHA256 5ef99aba902533fe9d17b7dfaf91e72b638cc70b9f811d1e518822ee80b5ff57 SHA512 2b617365fce74cceeb14e53f476b454c4420273661050d25e1c524cf5d56a7554318a268f7b9ebb100592b61a01d274efaeed28abb9ca0adaeb71ef981201b36 WHIRLPOOL f96310ae7e75bd4e289d97767f6a74a6a0a0006855068755d7cfb484950e145246472b3a6cffcd0db44c589ed43720f998872ef1e7b12a3ccd02e833d80e6e84 AUX modules.ppp 299 SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3 SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041 WHIRLPOOL dfc2d6fb1a36b74b0dd998739bb1c5977234c2d88100f686fb6faae2826795b0ca217937a7775660421f5ebc356e5e1378849ac6e56fef018eceab6f90bb26e3 -AUX musl.patch 3107 SHA256 4277cfdd0dfcf7c8169f0f165c5541fccfbc9fe7cc38005f74f04e984aa1f89e SHA512 96345cf53415b540934048cdad6a268bbe01128bca1a7f670c9d6627946dcac3ecfe486e32afa788981ed77fd52d2ad979717426c60a2e50d2a66b4d6db90eb6 WHIRLPOOL ad0ce6ca588eab773159ce25f3b3e8d9db80accb8702024cd2fc49cab818f57f11b81f247a8453230d899180e2278712e8575998fe1e753ccd3a7a018108a19c +AUX ppp-2.4.7-musl.diff 3729 SHA256 b5e973a53d78cec9b9965f9925175bc9d1e5bfa9b334bb700c62333abeb18345 SHA512 2fe51ea48648ef525e883e30cd84bee31d90daa48ec5ec2b6b62d15ed35840aa351aaadce83f398212056ea761fc231c6c6edb271cb091efc3535f70fbd6fa2d WHIRLPOOL 77bea1aa26068f93bc2fcf57ee01d8b4c6426cd42cbff0f32593f4c8ffbdc57ed102f09e1a008a50a0e6fb7ab425f7555719df5372eb9d12c43a3b2126364a9e 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 -EBUILD ppp-2.4.7-r1.ebuild 6951 SHA256 87006da304ddcf8f654d438444d886aa7261a12d551371f668e0cebff5135570 SHA512 b7befd0731d58b7b5fe4bd19b46454f77ea3b037eecb4ff37566f0ea912eec465a309380c8fdfa9dfbdbe71cddd3e11318582a00c5f7ce80561303c2f791c993 WHIRLPOOL 048a43950b4a7891030e654c686f65385b1ae7110cbd98b0a0b3fc58cfdd48d79a2468fe8c7581ad9e42771f48ace3ff027d66491eee273bd4eef9c5475c8293 +EBUILD ppp-2.4.7-r1.ebuild 6955 SHA256 918a304911e97363ec3b0c7991a6a7f63ccdf2bcfcd7cb34156fc219dd051584 SHA512 19cfb251109dab86f725a3c5daad68b057c44ac9d09103ff895e1669b30020b15b33fbfd5c6be61e3545cbd91fa3fa887d39ad65b6bca72939b32cf3ed0364bf WHIRLPOOL 2d5006d8ff024153d692c8e7b37e597a0b53ba9ccb19b8014f89561f71cf751ca5cbc0253a7adae96bbbf7e210fa609534b32638103c336d85a3c3493680d1bc diff --git a/net-dialup/ppp/files/musl.patch b/net-dialup/ppp/files/musl.patch deleted file mode 100644 index 802409f..0000000 --- a/net-dialup/ppp/files/musl.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- pppd/Makefile.linux -+++ pppd/Makefile.linux -@@ -126,7 +126,7 @@ LIBS += -lcrypt - endif - - ifdef USE_LIBUTIL --CFLAGS += -DHAVE_LOGWTMP=1 -+#CFLAGS += -DHAVE_LOGWTMP=1 - LIBS += -lutil - endif - ---- pppd/plugins/rp-pppoe/if.c -+++ pppd/plugins/rp-pppoe/if.c -@@ -30,10 +30,6 @@ static char const RCSID[] = - #include <linux/if_packet.h> - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include <asm/types.h> - #endif ---- pppd/plugins/rp-pppoe/plugin.c -+++ pppd/plugins/rp-pppoe/plugin.c -@@ -46,7 +46,6 @@ static char const RCSID[] = - #include <unistd.h> - #include <fcntl.h> - #include <signal.h> --#include <net/ethernet.h> - #include <net/if_arp.h> - #include <linux/ppp_defs.h> - #include <linux/if_pppox.h> ---- pppd/plugins/rp-pppoe/pppoe-discovery.c -+++ pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -27,10 +27,6 @@ - #include <linux/if_packet.h> - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include <asm/types.h> - #endif -@@ -55,6 +51,8 @@ void die(int status) - exit(status); - } - -+#define error(x...) fprintf(stderr, x) -+ - /* Initialize frame types to RFC 2516 values. Some broken peers apparently - use different frame types... sigh... */ - ---- pppd/plugins/rp-pppoe/pppoe.h -+++ 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 ---- pppd/sys-linux.c -+++ 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 - #include <netinet/in.h> - #include <arpa/inet.h> - - ---- include/linux/ppp_defs.h.orig 2015-05-10 10:59:27.959155977 +0200 -+++ include/linux/ppp_defs.h 2015-05-10 10:59:50.190403246 +0200 -@@ -50,6 +50,9 @@ - #ifndef _PPP_DEFS_H_ - #define _PPP_DEFS_H_ - -+#ifndef __P -+# define __P(x) x -+#endif - /* - * The basic PPP frame. - */ ---- pppd/magic.h.orig 2015-05-10 11:00:16.687697962 +0200 -+++ pppd/magic.h 2015-05-10 11:00:34.030890864 +0200 -@@ -42,6 +42,10 @@ - * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ - */ - -+#ifndef __P -+# define __P(x) x -+#endif -+ - void magic_init __P((void)); /* Initialize the magic number generator */ - u_int32_t magic __P((void)); /* Returns the next magic number */ - ---- include/net/ppp_defs.h.orig 2015-05-10 11:09:54.505127657 +0200 -+++ include/net/ppp_defs.h 2015-05-10 11:10:10.753309024 +0200 -@@ -38,6 +38,8 @@ - #ifndef _PPP_DEFS_H_ - #define _PPP_DEFS_H_ - -+#include <sys/time.h> /* time_t */ -+ - /* - * The basic PPP frame. - */ diff --git a/net-dialup/ppp/files/ppp-2.4.7-musl.diff b/net-dialup/ppp/files/ppp-2.4.7-musl.diff new file mode 100644 index 0000000..6403029 --- /dev/null +++ b/net-dialup/ppp/files/ppp-2.4.7-musl.diff @@ -0,0 +1,123 @@ +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 +@@ -50,6 +50,10 @@ + #ifndef _PPP_DEFS_H_ + #define _PPP_DEFS_H_ + ++#ifndef __P ++# define __P(x) x ++#endif ++ + /* + * The basic PPP frame. + */ +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 +@@ -38,6 +38,8 @@ + #ifndef _PPP_DEFS_H_ + #define _PPP_DEFS_H_ + ++#include <sys/time.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 @@ + endif + + ifdef USE_LIBUTIL +-CFLAGS += -DHAVE_LOGWTMP=1 ++#CFLAGS += -DHAVE_LOGWTMP=1 + LIBS += -lutil + endif + +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 +@@ -42,6 +42,10 @@ + * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ + */ + ++#ifndef __P ++# define __P(x) x ++#endif ++ + 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/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 +@@ -30,10 +30,6 @@ + #include <linux/if_packet.h> + #endif + +-#ifdef HAVE_NET_ETHERNET_H +-#include <net/ethernet.h> +-#endif +- + #ifdef HAVE_ASM_TYPES_H + #include <asm/types.h> + #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 +@@ -46,7 +46,6 @@ + #include <unistd.h> + #include <fcntl.h> + #include <signal.h> +-#include <net/ethernet.h> + #include <net/if_arp.h> + #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 @@ + #include <linux/if_packet.h> + #endif + +-#ifdef HAVE_NET_ETHERNET_H +-#include <net/ethernet.h> +-#endif +- + #ifdef HAVE_ASM_TYPES_H + #include <asm/types.h> + #endif +@@ -56,6 +52,8 @@ + exit(status); + } + ++#define error(x...) fprintf(stderr, x) ++ + /* Initialize frame types to RFC 2516 values. Some broken peers apparently + use different frame types... sigh... */ + +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 @@ + + #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 + #define ETH_PPPOE_SESSION 0x8864 diff --git a/net-dialup/ppp/ppp-2.4.7-r1.ebuild b/net-dialup/ppp/ppp-2.4.7-r1.ebuild index c31afd1..004c552 100644 --- a/net-dialup/ppp/ppp-2.4.7-r1.ebuild +++ b/net-dialup/ppp/ppp-2.4.7-r1.ebuild @@ -84,7 +84,7 @@ src_prepare() { if use elibc_musl ; then einfo "Conditionally patching for musl" - epatch "${FILESDIR}"/musl.patch + epatch "${FILESDIR}"/${P}-musl.diff fi } |