From 3013bcf9b5e1cd57961f5c3324f901500a2c8f3d Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Fri, 29 Mar 2019 13:35:12 -0300
Subject: [PATCH] connman: update to 1.37.

---
 srcpkgs/connman/patches/musl-fixes.patch | 175 -----------------------
 srcpkgs/connman/template                 |   9 +-
 2 files changed, 4 insertions(+), 180 deletions(-)
 delete mode 100644 srcpkgs/connman/patches/musl-fixes.patch

diff --git a/srcpkgs/connman/patches/musl-fixes.patch b/srcpkgs/connman/patches/musl-fixes.patch
deleted file mode 100644
index 817f68b14c6..00000000000
--- a/srcpkgs/connman/patches/musl-fixes.patch
+++ /dev/null
@@ -1,175 +0,0 @@
---- ./configure.ac.orig
-+++ ./configure.ac
-@@ -171,6 +171,8 @@
- AM_CONDITIONAL(PPTP, test "${enable_pptp}" != "no")
- AM_CONDITIONAL(PPTP_BUILTIN, test "${enable_pptp}" = "builtin")
- 
-+AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr], [], [], [[#include <netinet/in.h>]])
-+AC_CHECK_HEADERS(execinfo.h)
- AC_CHECK_HEADERS(resolv.h, dummy=yes,
- 	AC_MSG_ERROR(resolver header files are required))
- AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [
-diff --git a/gdhcp/common.c b/gdhcp/common.c
-index e111150..ee4dc43 100644
---- gdhcp/common.c
-+++ gdhcp/common.c
-@@ -22,6 +22,7 @@
- #include <config.h>
- #endif
- 
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
-@@ -31,7 +32,6 @@
- #include <string.h>
- #include <endian.h>
- #include <net/if_arp.h>
--#include <linux/if.h>
- #include <netpacket/packet.h>
- #include <net/ethernet.h>
- #include <arpa/inet.h>
-@@ -39,6 +39,8 @@
- #include "gdhcp.h"
- #include "common.h"
- 
-+#include <linux/if.h>
-+
- static const DHCPOption client_options[] = {
- 	{ OPTION_IP,			0x01 }, /* subnet-mask */
- 	{ OPTION_IP | OPTION_LIST,	0x03 }, /* routers */
-diff --git a/tools/dhcp-test.c b/tools/dhcp-test.c
-index c34e10a..eae66fc 100644
---- tools/dhcp-test.c
-+++ tools/dhcp-test.c
-@@ -33,7 +33,6 @@
- #include <arpa/inet.h>
- #include <net/route.h>
- #include <net/ethernet.h>
--#include <linux/if_arp.h>
- 
- #include <gdhcp/gdhcp.h>
- 
---- plugins/wifi.c	2014-06-07 21:46:22.000000000 -0300
-+++ plugins/wifi.c	2014-07-18 20:37:16.811343663 -0300
-@@ -30,9 +30,8 @@
- #include <string.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
--#include <linux/if_arp.h>
--#include <linux/wireless.h>
- #include <net/ethernet.h>
-+#include <linux/wireless.h>
- 
- #ifndef IFF_LOWER_UP
- #define IFF_LOWER_UP	0x10000
---- tools/dnsproxy-test.c	2013-12-05 09:12:12.000000000 -0200
-+++ tools/dnsproxy-test.c	2014-07-18 20:36:37.484676606 -0300
-@@ -24,6 +24,7 @@
- #endif
- 
- #include <errno.h>
-+#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
---- tools/private-network-test.c	2013-08-19 19:57:25.000000000 -0300
-+++ tools/private-network-test.c	2014-07-18 20:28:42.644671909 -0300
-@@ -32,7 +32,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <signal.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/signalfd.h>
- #include <unistd.h>
- 
---- tools/tap-test.c	2013-12-05 09:12:12.000000000 -0200
-+++ tools/tap-test.c	2014-07-18 20:28:35.351338499 -0300
-@@ -29,7 +29,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <string.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- 
- #include <netinet/in.h>
---- gweb/gresolv.c	2014-07-18 20:43:40.000000000 -0300
-+++ gweb/gresolv.c	2014-07-18 20:44:43.284681413 -0300
-@@ -24,6 +24,7 @@
- #endif
- 
- #include <errno.h>
-+#include <stdio.h>
- #include <unistd.h>
- #include <stdarg.h>
- #include <string.h>
---- src/ippool.c	2014-04-04 15:12:07.000000000 -0300
-+++ src/ippool.c	2014-07-18 20:44:56.068014872 -0300
-@@ -28,7 +28,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/socket.h>
- 
- #include "connman.h"
---- src/iptables.c	2014-04-04 15:12:07.000000000 -0300
-+++ src/iptables.c	2014-07-18 20:44:25.844681240 -0300
-@@ -28,7 +28,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/socket.h>
- #include <xtables.h>
- 
-
---- gdhcp/common.h.orig
-+++ gdhcp/common.h
-@@ -18,6 +18,9 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  *
-  */
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
- 
- #include <netinet/udp.h>
- #include <netinet/ip.h>
-@@ -170,8 +173,8 @@
- 	[OPTION_U32]	= 4,
- };
- 
--/* already defined within netinet/in.h if using GNU compiler */
--#ifndef __USE_GNU
-+/* already defined within netinet/in.h if using GNU or musl libc */
-+#ifndef HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR
- struct in6_pktinfo {
- 	struct in6_addr ipi6_addr;  /* src/dst IPv6 address */
- 	unsigned int ipi6_ifindex;  /* send/recv interface index */
---- src/inet.c	2016-04-18 09:04:30.000000000 +0200
-+++ src/inet.c	2017-07-10 16:25:33.100118139 +0200
-@@ -21,6 +21,11 @@
-  *
-  */
- 
-+#if !defined(__GLIBC__)
-+/* Prevent inclusion of /usr/include/netinet/if_ether.h */
-+#define _NETINET_IF_ETHER_H
-+#endif
-+
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-@@ -34,6 +39,7 @@
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-+#include <linux/if_ether.h>
- #include <linux/sockios.h>
- #include <netdb.h>
- #include <arpa/inet.h>
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index 1fea3f60b13..0a0c7cbf1b3 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -1,10 +1,9 @@
 # Template file for 'connman'
 pkgname=connman
-version=1.36
-revision=2
+version=1.37
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin
- --enable-polkit --enable-client --enable-pie --enable-ethernet
+configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
  --enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat
  --enable-openvpn --with-openvpn=/usr/bin/openvpn --enable-openconnect
  --disable-tools --disable-wispr --with-openconnect=/usr/bin/openconnect"
@@ -16,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://01.org/connman"
 distfiles="${KERNEL_SITE}/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c789db41cc443fa41e661217ea321492ad59a004bebcd1aa013f3bc10a6e0074
+checksum=6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16
 lib32disabled=yes
 
 pre_configure() {