diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch new file mode 100644 index 00000000000..f0e4ba060f2 --- /dev/null +++ b/srcpkgs/NetworkManager/patches/musl-process-util.patch @@ -0,0 +1,38 @@ +--- src/systemd/src/basic/process-util.c.orig 2018-03-20 23:12:35.698715891 +0100 ++++ src/systemd/src/basic/process-util.c 2018-03-20 23:17:24.114733986 +0100 +@@ -36,6 +36,9 @@ + #include + #include + #include ++#ifndef __GLIBC__ ++#include ++#endif + #if 0 /* NM_IGNORED */ + #if HAVE_VALGRIND_VALGRIND_H + #include +@@ -1015,11 +1018,13 @@ static void reset_cached_pid(void) { + cached_pid = CACHED_PID_UNSET; + } + ++#ifdef __GLIBC__ + /* 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__)); ++#endif + + pid_t getpid_cached(void) { + pid_t current_value; +@@ -1042,7 +1047,11 @@ pid_t getpid_cached(void) { + + new_pid = getpid(); + ++#ifdef __GLIBC__ + if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { ++#else ++ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) { ++#endif + /* OOM? Let's try again later */ + cached_pid = CACHED_PID_UNSET; + return new_pid; diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index b08609f9f2c..e6fa12a7344 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,6 +1,6 @@ # Template file for 'NetworkManager' pkgname=NetworkManager -version=1.8.6 +version=1.10.6 revision=1 build_style=gnu-configure configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient @@ -24,7 +24,7 @@ maintainer="Juan RP " homepage="https://wiki.gnome.org/Projects/NetworkManager" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=0df0aa7fa4915a386107a54d4b5ac875759a9a17f33f77238ef9822a9d90347d +checksum=6af0b1e856a3725f88791f55c4fbb04105dc0b20dbf182aaec8aad16481fac76 # gtk-doc generation is disabled but gtkdocisze is required by autogen.sh hostmakedepends=" @@ -45,7 +45,9 @@ make_dirs=" /etc/NetworkManager/dispatcher.d/pre-down.d 0750 root root " case "$XBPS_TARGET_MACHINE" in - *-musl) CFLAGS+=" -DHAVE_SECURE_GETENV -Dsecure_getenv=getenv -D__USE_POSIX199309" + *-musl) + CFLAGS+=" -DHAVE_SECURE_GETENV -Dsecure_getenv=getenv" + CFLAGS+=" -D__USE_POSIX199309 -DRTLD_DEEPBIND=0" ;; esac