diff options
| author | Milan P. Stanić <mps@arvanta.net> | 2019-04-02 12:26:52 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-04-02 11:45:55 +0000 |
| commit | 97ae198ae79c7a91135fba51579e054e0c772ec9 (patch) | |
| tree | ecd2edf1bba08cff1bd729934718e05d81ab58a3 /community/networkmanager/musl-basic.patch | |
| parent | f9b414fac026d019a42f6a29e0a5518f956cf201 (diff) | |
| download | aports-97ae198ae79c7a91135fba51579e054e0c772ec9.tar.bz2 aports-97ae198ae79c7a91135fba51579e054e0c772ec9.tar.xz | |
community/networkmanager: upgrade to 1.16.0
remove wpa_supplicant from depends
rework some patches and add needed new ones
Diffstat (limited to 'community/networkmanager/musl-basic.patch')
| -rw-r--r-- | community/networkmanager/musl-basic.patch | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/community/networkmanager/musl-basic.patch b/community/networkmanager/musl-basic.patch index 533ed98449..a3ad09f774 100644 --- a/community/networkmanager/musl-basic.patch +++ b/community/networkmanager/musl-basic.patch @@ -1,5 +1,6 @@ ---- a/src/systemd/src/basic/stdio-util.h -+++ b/src/systemd/src/basic/stdio-util.h +Usual fix for musl libc +--- a/shared/systemd/src/basic/stdio-util.h ++++ b/shared/systemd/src/basic/stdio-util.h @@ -19,7 +19,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ @@ -10,45 +11,21 @@ #include <stdarg.h> #include <stdio.h> #include <sys/types.h> ---- a/src/systemd/src/basic/util.h -+++ b/src/systemd/src/basic/util.h -@@ -46,6 +46,11 @@ +--- a/shared/systemd/src/basic/util.h ++++ b/shared/systemd/src/basic/util.h +@@ -46,6 +46,12 @@ #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; ++typedef int (*__compar_d_fn_t) (const void *, const void *, void *); +#endif + size_t page_size(void) _pure_; #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) ---- a/src/systemd/sd-adapt/nm-sd-adapt.h -+++ b/src/systemd/sd-adapt/nm-sd-adapt.h -@@ -134,7 +134,7 @@ - # ifdef HAVE___SECURE_GETENV - # define secure_getenv __secure_getenv - # else --# error neither secure_getenv nor __secure_getenv is available -+# define secure_getenv getenv - # endif - #endif - ---- a/src/systemd/src/basic/process-util.c -+++ b/src/systemd/src/basic/process-util.c -@@ -1018,8 +1018,9 @@ - /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc - * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against - * libpthread, as it is part of glibc anyway. */ --extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle); --extern void* __dso_handle __attribute__ ((__weak__)); -+//extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle); -+//extern void* __dso_handle __attribute__ ((__weak__)); -+#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) - - pid_t getpid_cached(void) { - pid_t current_value; --- a/libnm-core/nm-json.c +++ b/libnm-core/nm-json.c @@ -23,6 +23,10 @@ |