From 9aaa15076450a03ae1279d702d3c0f0f7f22ca2d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Mon, 18 Jan 2016 19:36:09 +0100
Subject: [PATCH] NetworkManager: update to 1.0.10.

---
 srcpkgs/NetworkManager/patches/musl.patch | 222 ++--------------------
 srcpkgs/NetworkManager/template           |  16 +-
 2 files changed, 27 insertions(+), 211 deletions(-)

diff --git a/srcpkgs/NetworkManager/patches/musl.patch b/srcpkgs/NetworkManager/patches/musl.patch
index 308583e6b9c..486757c3825 100644
--- a/srcpkgs/NetworkManager/patches/musl.patch
+++ b/srcpkgs/NetworkManager/patches/musl.patch
@@ -1,167 +1,8 @@
---- clients/cli/devices.c  2015-05-05 11:35:17.000000000 +0000
-+++ clients/cli/devices.c  2015-05-13 09:44:45.931000000 +0000
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <readline/readline.h>
-+#include <net/ethernet.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
---- clients/cli/settings.c 2015-05-05 11:35:17.000000000 +0000
-+++ clients/cli/settings.c 2015-05-13 09:44:29.586000000 +0000
-@@ -21,6 +21,7 @@
- 
- #include <stdlib.h>
- #include <arpa/inet.h>
-+#include <net/ethernet.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
---- libnm/nm-device-bt.c   2015-03-04 16:45:35.000000000 +0000
-+++ libnm/nm-device-bt.c   2015-05-13 09:42:51.825000000 +0000
-@@ -22,6 +22,7 @@
- #include "config.h"
- 
- #include <string.h>
-+#include <net/ethernet.h>
- #include <glib/gi18n-lib.h>
- 
- #include "nm-glib-compat.h"
---- libnm/nm-device-ethernet.c     2015-03-04 16:45:35.000000000 +0000
-+++ libnm/nm-device-ethernet.c     2015-05-13 09:43:08.769000000 +0000
-@@ -22,6 +22,7 @@
- #include "config.h"
- 
- #include <string.h>
-+#include <net/ethernet.h>
- #include <glib/gi18n-lib.h>
- 
- #include "nm-glib-compat.h"
---- libnm/nm-device-wifi.c 2015-03-04 16:45:35.000000000 +0000
-+++ libnm/nm-device-wifi.c 2015-05-13 09:43:24.673000000 +0000
-@@ -22,6 +22,7 @@
- #include "config.h"
- 
- #include <string.h>
-+#include <net/ethernet.h>
- #include <glib/gi18n-lib.h>
- 
- #include "nm-glib-compat.h"
---- libnm/nm-device-wimax.c        2015-05-05 11:35:17.000000000 +0000
-+++ libnm/nm-device-wimax.c        2015-05-13 09:43:35.881000000 +0000
-@@ -22,6 +22,7 @@
- #include "config.h"
- 
- #include <string.h>
-+#include <net/ethernet.h>
- #include <glib/gi18n-lib.h>
- 
- #include "nm-glib-compat.h"
---- libnm-core/nm-setting-bridge.c 2015-05-05 11:35:17.000000000 +0000
-+++ libnm-core/nm-setting-bridge.c 2015-05-13 09:40:28.049000000 +0000
-@@ -25,6 +25,7 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <glib/gi18n-lib.h>
-+#include <net/ethernet.h>
- 
- #include "nm-setting-bridge.h"
- #include "nm-connection-private.h"
---- libnm-core/nm-setting-olpc-mesh.c      2015-03-04 16:45:35.000000000 +0000
-+++ libnm-core/nm-setting-olpc-mesh.c      2015-05-13 09:41:26.729000000 +0000
-@@ -23,6 +23,7 @@
- #include "config.h"
- 
- #include <string.h>
-+#include <net/ethernet.h>
- #include <glib/gi18n-lib.h>
- 
- #include "nm-setting-olpc-mesh.h"
---- libnm-core/nm-utils.c  2015-05-05 11:35:17.000000000 +0000
-+++ libnm-core/nm-utils.c  2015-05-13 09:39:43.402000000 +0000
-@@ -23,7 +23,8 @@
- 
- #include <string.h>
- #include <stdlib.h>
- #include <netinet/ether.h>
-+#include <net/if_arp.h>
- #include <arpa/inet.h>
- #include <uuid/uuid.h>
- #include <libintl.h>
---- src/NetworkManagerUtils.c      2015-05-05 11:35:17.000000000 +0000
-+++ src/NetworkManagerUtils.c      2015-05-13 09:36:02.078000000 +0000
-@@ -34,6 +34,7 @@
- #include <sys/wait.h>
- #include <linux/if.h>
- #include <linux/if_infiniband.h>
-+#include <net/ethernet.h>
- 
- #include "NetworkManagerUtils.h"
- #include "nm-platform.h"
---- src/devices/bluetooth/nm-bluez-device.c        2015-05-05 11:35:17.000000000 +0000
-+++ /src/devices/bluetooth/nm-bluez-device.c        2015-05-13 09:36:02.078000000 +0000
-@@ -25,6 +25,7 @@
- #include <glib/gi18n.h>
- #include <gio/gio.h>
- #include <string.h>
-+#include <net/ethernet.h>
- 
- #include "nm-core-internal.h"
- 
---- src/devices/bluetooth/nm-device-bt.c   2015-05-05 11:35:17.000000000 +0000
-+++ src/devices/bluetooth/nm-device-bt.c   2015-05-13 09:44:10.995000000 +0000
-@@ -22,6 +22,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <net/ethernet.h>
- 
- #include <glib/gi18n.h>
- #include <gio/gio.h>
---- src/devices/nm-device-bridge.c 2015-05-05 11:35:17.000000000 +0000
-+++ src/devices/nm-device-bridge.c 2015-05-13 09:36:02.079000000 +0000
-@@ -24,6 +24,7 @@
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
-+#include <net/ethernet.h>
- 
- #include "gsystem-local-alloc.h"
- #include "nm-device-bridge.h"
---- src/devices/wifi/nm-wifi-ap.c  2015-05-05 11:35:17.000000000 +0000
-+++ src/devices/wifi/nm-wifi-ap.c  2015-05-13 09:36:02.079000000 +0000
-@@ -23,6 +23,7 @@
- 
- #include <string.h>
- #include <stdlib.h>
-+#include <net/ethernet.h>
- 
- #include "nm-wifi-ap.h"
- #include "nm-wifi-ap-utils.h"
---- src/dhcp-manager/nm-dhcp-dhclient-utils.c      2015-05-05 11:35:17.000000000 +0000
-+++ src/dhcp-manager/nm-dhcp-dhclient-utils.c      2015-05-13 09:36:02.079000000 +0000
-@@ -24,6 +24,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <arpa/inet.h>
-+#include <net/ethernet.h>
- 
- #include "nm-dhcp-dhclient-utils.h"
- #include "nm-dhcp-utils.h"
---- src/platform/wifi/wifi-utils.c 2015-05-05 11:35:17.000000000 +0000
-+++ src/platform/wifi/wifi-utils.c 2015-05-13 09:36:02.080000000 +0000
-@@ -24,6 +24,7 @@
- #include <sys/stat.h>
- #include <stdio.h>
- #include <string.h>
-+#include <net/ethernet.h>
- #include <glib.h>
- 
- #include "wifi-utils.h"
---- src/platform/wifi/wifi-utils.h 2015-05-05 11:35:17.000000000 +0000
-+++ src/platform/wifi/wifi-utils.h 2015-05-13 09:36:02.080000000 +0000
-@@ -22,7 +22,6 @@
+## moving the <linux/xxxx> includes to below nm includes
+## no longer works in 1.0.0.
+--- src/platform/wifi/wifi-utils.h
++++ src/platform/wifi/wifi-utils.h.new
+@@ -22,10 +22,10 @@
  #ifndef __WIFI_UTILS_H__
  #define __WIFI_UTILS_H__
  
@@ -169,9 +10,13 @@
  #include <glib.h>
  
  #include "nm-dbus-interface.h"
---- src/settings/nm-settings-connection.h  2015-04-17 11:06:20.000000000 +0000
-+++ src/settings/nm-settings-connection.h  2015-05-13 09:36:02.080000000 +0000
-@@ -22,8 +22,6 @@
++#include <linux/if_ether.h>
+ 
+ typedef struct WifiData WifiData;
+
+--- src/settings/nm-settings-connection.h
++++ src/settings/nm-settings-connection.h.new
+@@ -22,10 +22,9 @@
  #ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__
  #define __NETWORKMANAGER_SETTINGS_CONNECTION_H__
  
@@ -179,45 +24,8 @@
 -
  #include <nm-connection.h>
  #include "nm-types.h"
- 
---- src/settings/plugins/ibft/reader.c     2015-05-05 11:35:17.000000000 +0000
-+++ src/settings/plugins/ibft/reader.c     2015-05-13 09:36:02.080000000 +0000
-@@ -25,6 +25,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
-+#include <net/ethernet.h>
- #include <sys/wait.h>
- #include <sys/inotify.h>
- #include <errno.h>
---- src/settings/plugins/keyfile/reader.c  2015-05-05 11:35:17.000000000 +0000
-+++ src/settings/plugins/keyfile/reader.c  2015-05-13 09:36:02.081000000 +0000
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <arpa/inet.h>
-+#include <net/ethernet.h>
- #include <string.h>
- 
- #include "nm-core-internal.h"
---- libnm-core/nm-utils.h.orig        2015-05-13 09:54:12.405000000 +0000
-+++ libnm-core/nm-utils.h     2015-05-13 09:54:18.219000000 +0000
-@@ -30,7 +30,6 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
--#include <linux/if_ether.h>
- #include <linux/if_infiniband.h>
- 
- #include "nm-dbus-interface.h"
-
---- clients/tui/nmt-mac-entry.h.orig	2015-08-30 23:22:25.151839011 +0200
-+++ clients/tui/nmt-mac-entry.h	2015-08-30 23:22:46.510838483 +0200
-@@ -21,6 +21,7 @@
- 
- #include "nm-utils.h"
- #include "nmt-newt.h"
-+#include <net/ethernet.h>
++#include <linux/if_ether.h>
  
  G_BEGIN_DECLS
- 
+
+
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 98c68453e1c..fd261a2eba2 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.0.2
-revision=7
+version=1.0.10
+revision=1
 build_style=gnu-configure
 configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
  --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
@@ -11,7 +11,8 @@ configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
  --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 --enable-modify-system
  --with-modem-manager-1 --with-resolvconf=/usr/bin/resolvconf
  --with-session-tracking=consolekit --with-suspend-resume=upower
- --enable-polkit-agent --enable-tests=no --sbindir=/usr/bin LDFLAGS=
+ --with-systemdsystemunitdir=no --enable-polkit-agent --enable-tests=no
+ --sbindir=/usr/bin LDFLAGS=
  ac_cv_file__etc_redhat_release=no ac_cv_file__etc_gentoo_release=no
  ac_cv_file__etc_fedora_release=no ac_cv_file__etc_mandriva_release=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_debian_version=no"
@@ -20,7 +21,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff
+checksum=1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc
 
 hostmakedepends="
  automake libtool pkg-config intltool gnutls-devel glib-devel dbus-glib-devel
@@ -51,6 +52,13 @@ pre_configure() {
 
 	# Full switch to /run to not depend on /var/run being a symlink.
 	sed -e 's,^nmrundir=.*$,nmrundir=\"/run/\$PACKAGE\",' -i configure
+
+	# See
+	local f= files=$(find src/dhcp-manager/systemd-dhcp -type f) # --without-systemd has no effect
+	files="$files $(find src/dhcp-manager -maxdepth 1 -type f -name "*-systemd.*")"
+	for f in $files; do # do NOT build --with-dbus-sys-dir=/etc/dbus-1 (nm service will crash)
+		printf "" > $f
+	done
 }
 
 post_install() {