summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory A. Pratt <anarchy@gentoo.org>2017-06-23 23:07:10 -0500
committerJory A. Pratt <anarchy@gentoo.org>2017-06-23 23:07:10 -0500
commitfd2deafc9c6fb8dce7a9a31fc6416bb1f9db7f5e (patch)
tree4c85d69ec84313ae3b0bafdfe667e9e84e33f5e4
parentnet-misc/networkmanager: Make it work with musl :) (diff)
downloadanarchy-fd2deafc9c6fb8dce7a9a31fc6416bb1f9db7f5e.tar.gz
anarchy-fd2deafc9c6fb8dce7a9a31fc6416bb1f9db7f5e.tar.bz2
anarchy-fd2deafc9c6fb8dce7a9a31fc6416bb1f9db7f5e.zip
net-misc/networkmanager: add missing musl patch
-rw-r--r--net-misc/networkmanager/Manifest3
-rw-r--r--net-misc/networkmanager/files/0001-Support-musl-libc.patch108
-rw-r--r--net-misc/networkmanager/networkmanager-1.8.0.ebuild1
3 files changed, 111 insertions, 1 deletions
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index f9d3b13..e3ee359 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,7 +1,8 @@
+AUX 0001-Support-musl-libc.patch 3238 SHA256 8b01890c7bd0267106c8c55f1e900f43a59704707441f9a4e407eb00dd4134a2 SHA512 557464b1f7a0ec729d7a9b604ccc7671881db25bc683a6a68a535b9f076a80408be913e8d5890e4fba7c72df4b6c60aeca424d3df184d2a1d7ceb3ac314b6b6c WHIRLPOOL 755f01472816ed5c5009a7614b31f835c78190eadc6e8add27f576c9b373578cc014454e368824154d2f5234480dd153177562a42693759fe3bb1839093c9cb0
AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 SHA256 702e1e702ec633608fd75dfd44f66437896421c9d2d7fe9966df8e4ef1d93a6c SHA512 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214 WHIRLPOOL b89a4069cc973cf55001a5f0028c75a90ce4ea070c4424b5a22f3e9b8e61ee34ff7b06891eb1c6f8fa24735b3e5d98e61f0bfefca7dd12eeb615b83e72225c8b
AUX 10-openrc-status-r4 1182 SHA256 f8ed424818b866a0bf882c569f4484e8b1485ce7ac8c472f060fd877f2dcfe65 SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec WHIRLPOOL c71c923c293730894a660c8db3371fee2697666388f49947ecc2508b18a0a0d16a72643f34e8a1dadb559743ea1b56a34d3abfd95bced85dc0d753a33d661fb8
AUX conf.d.NetworkManager 230 SHA256 4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a WHIRLPOOL 7dbb15bf184e918369187605af91816ed11c460147066ede11f200d73103bb6f7f63ccc7abe7996d485294f44282d6bbd9520cc9e50f04ce41262c9817f7b994
AUX init.d.NetworkManager-r1 1822 SHA256 861445d46e8863dca26a91018da3dd9fee6a64467a93e7512774dfd88914539d SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658 WHIRLPOOL f028c78b1afc1cacb835bb61971910bde1ee6596578e5d7a3d88228a449528be0804fdca4b745894c4d8058980f48b93d976a922ce46727a0492680c085fa8cc
DIST NetworkManager-1.8.0.tar.xz 3811100 SHA256 fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e SHA512 1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c WHIRLPOOL 3e94a50cd50582f9cad26937ee8d597fe275a857882b1fe7ee3a85e3a30cedf16f559064f92afcb00e1703c42b34c0438a0b798538dcedf8cd29da596390b93a
-EBUILD networkmanager-1.8.0.ebuild 10578 SHA256 52a3f14c78dd67ac6d08f9fd37150815bd53288a9fa464bcda89f6e05a87d88d SHA512 38382d77131c7aef0ae7f7ff023d88572a467d9b7b9425eba3e1f71b6a61c06b7b33015a8ecd72448ef02146f034c0ab9cc39909847c0bdc03e916c1f7fd158b WHIRLPOOL e5f717c44a42f4a50d5eafbc81b508ab9a6ad31a107bcc7b12aa0076196745f70464c8c3897806713cc5d10e0874b41a35f7a7db2f4576e7be220b7cac301b9e
+EBUILD networkmanager-1.8.0.ebuild 10629 SHA256 bcb3eca1b6cd768ae5cd72db4872b338f1d6c25b82164a87d4a8fdd3b68a176d SHA512 94770c29a40afa1314fec6b241ff67ed1cfa4ae50431133bd1fa293a7e31a3c4072adfe4fd10afc90e5b8001a374a51385b58a058c734a238a84268d9593ce87 WHIRLPOOL cf8f35983bd9626d037f8b5fc754db56794bbac80032a8997e3a99c4db761564f777bd83842f7ed52f439932cc019c6394fbd368b2e214c4eb5921a1e77a0414
MISC metadata.xml 1771 SHA256 ee2f0f65eaf3effc914d94105b1b44113cccd50ef09de57d6f37319406ed0a9f SHA512 4a61288c3e91ab8eb040053c706fe147e53fd1e9000b9597dc5b2f0920e08efd0e896f308e32758b4af6371b8fb9737f495355d0a9e2e95a9fd883bd10a8c535 WHIRLPOOL 2c91ccec729d06338d05ec4f3641607b4ac29e1228f9407964426db94c44b21d0fc473413395c9356e486b5c680cdd27a2468bf75ce164923aa874df83e9e1da
diff --git a/net-misc/networkmanager/files/0001-Support-musl-libc.patch b/net-misc/networkmanager/files/0001-Support-musl-libc.patch
new file mode 100644
index 0000000..14206d3
--- /dev/null
+++ b/net-misc/networkmanager/files/0001-Support-musl-libc.patch
@@ -0,0 +1,108 @@
+From 7c7a97f8a4cc9a3efba630dc31ca9c35592bb1b9 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Tue, 23 May 2017 14:15:43 -0500
+Subject: [PATCH] Support musl libc
+
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+---
+ configure.ac | 1 +
+ libnm-core/nm-utils.h | 4 ++++
+ src/platform/wifi/wifi-utils.h | 4 ++++
+ src/systemd/src/basic/socket-util.h | 5 +++++
+ src/systemd/src/basic/stdio-util.h | 2 ++
+ src/systemd/src/basic/util.h | 5 +++++
+ 6 files changed, 21 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 6f190c0..ddc25f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -278,6 +278,7 @@ dnl
+ dnl Checks for libdl - on certain platforms its part of libc
+ dnl
+ AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
++AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""])
+ AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
+
+ PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
+diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
+index 77fe18a..dcc776f 100644
+--- a/libnm-core/nm-utils.h
++++ b/libnm-core/nm-utils.h
+@@ -30,7 +30,11 @@
+ #include <netinet/in.h>
+
+ /* For ETH_ALEN and INFINIBAND_ALEN */
++#if defined(__GLIBC__)
+ #include <linux/if_ether.h>
++#else
++#define ETH_ALEN 6 /* Octets in one ethernet addr */
++#endif
+ #include <linux/if_infiniband.h>
+
+ #include "nm-core-enum-types.h"
+diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
+index 705717b..da3edc4 100644
+--- a/src/platform/wifi/wifi-utils.h
++++ b/src/platform/wifi/wifi-utils.h
+@@ -22,7 +22,11 @@
+ #ifndef __WIFI_UTILS_H__
+ #define __WIFI_UTILS_H__
+
++#if defined(__GLIBC__)
+ #include <net/ethernet.h>
++#else /* musl libc */
++#define ETH_ALEN 6 /* Octets in one ethernet addr */
++#endif
+
+ #include "nm-dbus-interface.h"
+
+diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h
+index 19a9ddb..337b20e 100644
+--- a/src/systemd/src/basic/socket-util.h
++++ b/src/systemd/src/basic/socket-util.h
+@@ -28,6 +28,11 @@
+ #include <sys/un.h>
+ #include <linux/netlink.h>
+ #include <linux/if_packet.h>
++#if !defined(__GLIBC__)
++/* SIOCGSTAMPNS from linux/asm-generic.h
++ * for src/systemd/src/libsystemd-network/sd-lldp.c */
++#include <linux/sockios.h>
++#endif
+
+ #include "macro.h"
+ #include "missing.h"
+diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h
+index bd1144b..9eafacb 100644
+--- a/src/systemd/src/basic/stdio-util.h
++++ b/src/systemd/src/basic/stdio-util.h
+@@ -19,7 +19,9 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
+
++#if defined(__GLIBC__)
+ #include <printf.h>
++#endif
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h
+index c7da6c3..d19e1b2 100644
+--- a/src/systemd/src/basic/util.h
++++ b/src/systemd/src/basic/util.h
+@@ -46,6 +46,11 @@
+ #include "missing.h"
+ #include "time-util.h"
+
++#if !defined(__GLIBC__)
++typedef int (*__compar_fn_t) (const void*, const void*);
++typedef __compar_fn_t comparison_fn_t;
++#endif
++
+ size_t page_size(void) _pure_;
+ #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
+
+--
+2.13.0
+
diff --git a/net-misc/networkmanager/networkmanager-1.8.0.ebuild b/net-misc/networkmanager/networkmanager-1.8.0.ebuild
index 97234c0..d3f2365 100644
--- a/net-misc/networkmanager/networkmanager-1.8.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.8.0.ebuild
@@ -145,6 +145,7 @@ src_prepare() {
DOC_CONTENTS="To modify system network connections without needing to enter the
root password, add your user account to the 'plugdev' group."
+ eapply "${FILESDIR}"/0001-Support-musl-libc.patch
use vala && vala_src_prepare
gnome2_src_prepare
}