[PR PATCH] connman: patch segfault on musl

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

There is a new pull request by kqo against master on the void-packages repository

https://github.com/kqo/void-packages connman
https://github.com/void-linux/void-packages/pull/14655

connman: patch segfault on musl
musl > 1.1.21 requires a non-null argument to freeaddrinfo. Fixed upstream so patch can be removed on next release.

A patch file from https://github.com/void-linux/void-packages/pull/14655.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-connman-14655.patch --]
[-- Type: text/x-diff, Size: 1661 bytes --]

From de32542efa10916b996dda13bd81f3cd2b680bd9 Mon Sep 17 00:00:00 2001
From: kqo <25536224+kqo@users.noreply.github.com>
Date: Sun, 22 Sep 2019 20:34:12 +0000
Subject: [PATCH] connman: patch segfault on musl

musl > 1.1.21 requires a non-null argument to freeaddrinfo. Fixed upstream so patch can be removed on next release.
---
 srcpkgs/connman/files/musl/freeaddrinfo.patch | 17 +++++++++++++++++
 srcpkgs/connman/template                      |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/connman/files/musl/freeaddrinfo.patch

diff --git a/srcpkgs/connman/files/musl/freeaddrinfo.patch b/srcpkgs/connman/files/musl/freeaddrinfo.patch
new file mode 100644
index 00000000000..b5c1aca390d
--- /dev/null
+++ b/srcpkgs/connman/files/musl/freeaddrinfo.patch
@@ -0,0 +1,17 @@
+musl > 1.1.21 segfaults on null pointers to freeaddrinfo
+
+diff --git a/gweb/gweb.c b/gweb/gweb.c
+index 393afe0a..12fcb1d8 100644
+--- a/gweb/gweb.c
++++ b/gweb/gweb.c
+@@ -1274,7 +1274,8 @@ static bool is_ip_address(const char *host)
+ 	addr = NULL;
+ 
+ 	result = getaddrinfo(host, NULL, &hints, &addr);
+-	freeaddrinfo(addr);
++	if(!result)
++		freeaddrinfo(addr);
+ 
+ 	return result == 0;
+ }
+
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index 6d725213cad..fdc7f434a1e 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -1,7 +1,7 @@
 # Template file for 'connman'
 pkgname=connman
 version=1.37
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
  --enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat