[PATCH 01/11] nodejs: upgrade 10.15.1 -> 10.15.3

[PATCH 01/11] nodejs: upgrade 10.15.1 -> 10.15.3

[Andreas Müller]

* 10.15.2 was a security release for CVE-2019-5737 [1]
* 10.15.3 was a bugfix release [2]

[1] https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.15.2
[2] https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.15.3

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../nodejs/{nodejs_10.15.1.bb => nodejs_10.15.3.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-devtools/nodejs/{nodejs_10.15.1.bb => nodejs_10.15.3.bb} (96%)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.3.bb
similarity index 96%
rename from meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.3.bb
index 672cd8440..d2e77ea0d 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.3.bb
@@ -23,8 +23,8 @@ SRC_URI_append_class-target = " \
            file://0002-Using-native-torque.patch \
            "
 
-SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
-SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
+SRC_URI[md5sum] = "d76210a6ae1ea73d10254947684836fb"
+SRC_URI[sha256sum] = "4e22d926f054150002055474e452ed6cbb85860aa7dc5422213a2002ed9791d5"
 
 S = "${WORKDIR}/node-v${PV}"
 
-- 
2.20.1

[PATCH 02/11] glibmm: upgrade 2.58.0 -> 2.58.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../glib-2.0/{glibmm_2.58.0.bb => glibmm_2.58.1.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-core/glib-2.0/{glibmm_2.58.0.bb => glibmm_2.58.1.bb} (89%)

diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.58.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb
similarity index 89%
rename from meta-oe/recipes-core/glib-2.0/glibmm_2.58.0.bb
rename to meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb
index 77774585d..87ab0cbc5 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm_2.58.0.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb
@@ -14,8 +14,8 @@ SRC_URI = " \
     ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \
     file://remove-examples.patch \
 "
-SRC_URI[md5sum] = "4a0402ac65a7c47424b4e21b81b079c0"
-SRC_URI[sha256sum] = "d34189237b99e88228e6f557f7d6e62f767fe356f395a244f5ad0e486254b645"
+SRC_URI[md5sum] = "77f1016cbb27e15d4e04a2b7bfdb4cae"
+SRC_URI[sha256sum] = "6e5fe03bdf1e220eeffd543e017fd2fb15bcec9235f0ffd50674aff9362a85f0"
 
 do_install_append() {
     install -d ${D}${datadir}/glibmm-2.4
-- 
2.20.1

[PATCH 03/11] gtkmm3: upgrade 3.22.2 -> 3.24.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gnome/gtk+/{gtkmm3_3.22.2.bb => gtkmm3_3.24.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-gnome/gtk+/{gtkmm3_3.22.2.bb => gtkmm3_3.24.1.bb} (78%)

diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.1.bb
similarity index 78%
rename from meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb
rename to meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.1.bb
index 96b54dd2c..6dd051337 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.1.bb
@@ -14,8 +14,8 @@ inherit gnomebase distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[archive.md5sum] = "883e9046768b3a5afc8e365988823e77"
-SRC_URI[archive.sha256sum] = "91afd98a31519536f5f397c2d79696e3d53143b80b75778521ca7b48cb280090"
+SRC_URI[archive.md5sum] = "9524ed4e5c821d13eeda49ba2a78f024"
+SRC_URI[archive.sha256sum] = "ddfe42ed2458a20a34de252854bcf4b52d3f0c671c045f56b42aa27c7542d2fd"
 SRC_URI += "file://0001-do-not-build-demos.patch"
 
 EXTRA_OECONF = " --disable-documentation "
-- 
2.20.1

[PATCH 04/11] fluidsynth: upgrade 2.0.3 -> 2.0.4

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
index df431b62c..810ca997e 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
@@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"
 
 SRC_URI = "git://github.com/FluidSynth/fluidsynth.git"
-SRCREV = "1bae9b2fe1a958f54f4910c802a79673e0df9850"
+SRCREV = "9671e412feedb90325e038c3aaf5d543eebc20c0"
 S = "${WORKDIR}/git"
-PV = "2.0.3"
+PV = "2.0.4"
 
 inherit cmake pkgconfig lib_package
-- 
2.20.1

[PATCH 05/11] xfdesktop: upgrade 4.13.2 -> 4.13.3

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../xfdesktop/{xfdesktop_4.13.2.bb => xfdesktop_4.13.3.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-xfce/xfdesktop/{xfdesktop_4.13.2.bb => xfdesktop_4.13.3.bb} (76%)

diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.2.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.3.bb
similarity index 76%
rename from meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.2.bb
rename to meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.3.bb
index 85696a193..2c70a9c31 100644
--- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.2.bb
+++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.3.bb
@@ -8,8 +8,8 @@ inherit xfce distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[md5sum] = "c05569c1c39ccd314fb5da20d5086909"
-SRC_URI[sha256sum] = "387f43d8a4615f44060c019cad212ac12df62c58eea2605813743116f71ad3bd"
+SRC_URI[md5sum] = "f08944f1b69ce1c6e1fbb9d7f4cb1da7"
+SRC_URI[sha256sum] = "80f7f28ef17638fe1cf4481db694731c208785a56b6c840005202f9c2db238f5"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
-- 
2.20.1

[PATCH 06/11] xfce4-screenshooter: upgrade 1.9.3 -> 1.9.4

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...e4-screenshooter_1.9.3.bb => xfce4-screenshooter_1.9.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-apps/xfce4-screenshooter/{xfce4-screenshooter_1.9.3.bb => xfce4-screenshooter_1.9.4.bb} (80%)

diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.3.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.4.bb
similarity index 80%
rename from meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.3.bb
rename to meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.4.bb
index c6a4cdb9a..7c5848b92 100644
--- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.3.bb
+++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.4.bb
@@ -7,8 +7,8 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-
 
 inherit xfce-app
 
-SRC_URI[md5sum] = "f783eb575e2015f39e1c1aae499b113f"
-SRC_URI[sha256sum] = "364ebddc4c9971b4023aa8019d4e3bd08f091b65dc98b218beb55851f69ceda2"
+SRC_URI[md5sum] = "68321e50939fea3c66f0771d59845dab"
+SRC_URI[sha256sum] = "c4f3225b3f73f1feb1869807b8b27aec4c32a3e9c2954915a5fb39d18d3a60f2"
 
 do_compile_prepend() {
     mkdir -p lib
-- 
2.20.1

[PATCH 07/11] xfce4-calculator-plugin: 0.6.0 -> 0.7.0

[Andreas Müller]

Another plugin ported to gtk3

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...lator-plugin_0.6.0.bb => xfce4-calculator-plugin_0.7.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/calculator/{xfce4-calculator-plugin_0.6.0.bb => xfce4-calculator-plugin_0.7.0.bb} (65%)

diff --git a/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb b/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb
similarity index 65%
rename from meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb
rename to meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb
index de0d0a06d..1216456b4 100644
--- a/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb
+++ b/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=909430f63fddd63f120ba29e8979f65c"
 
 inherit xfce-panel-plugin gtk-icon-cache
 
-SRC_URI[md5sum] = "1b956a89693d039a61b4725cefb23a4d"
-SRC_URI[sha256sum] = "eb51765580ea4650f9cf062382a820fb6483ee5dbe003aeb6f063929e299f9c2"
+SRC_URI[md5sum] = "1ae192a69834ee2f51f34a0a981181f4"
+SRC_URI[sha256sum] = "7b50ab947ab058e1c079113e7f0f8b38ef242fec36ec9f31bb4e3c19cb3f9de9"
-- 
2.20.1

[PATCH 08/11] poppler: upgrade 0.71.0 -> 0.75.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch | 9 ++++++---
 .../poppler/poppler/basename-include.patch               | 2 +-
 .../poppler/{poppler_0.71.0.bb => poppler_0.75.0.bb}     | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-support/poppler/{poppler_0.71.0.bb => poppler_0.75.0.bb} (93%)

diff --git a/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch b/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch
index 7ed795ef7..c364d7372 100644
--- a/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch
+++ b/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch
@@ -15,15 +15,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
-index 33c6608..87e1b44 100644
+index 6f91669..ca5021f 100644
 --- a/glib/CMakeLists.txt
 +++ b/glib/CMakeLists.txt
-@@ -127,7 +127,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
+@@ -135,7 +135,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
    get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
    _list_prefix(_includes _tmp_includes "-I")
-   set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR})
+   set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR})
 -  set(Poppler_0_18_gir_LIBS poppler-glib)
 +  set(Poppler_0_18_gir_LIBS poppler-glib poppler)
    _list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/")
    list(APPEND _abs_introspection_files
      ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c
+-- 
+2.20.1
+
diff --git a/meta-oe/recipes-support/poppler/poppler/basename-include.patch b/meta-oe/recipes-support/poppler/poppler/basename-include.patch
index 528528ae7..ab6bdb080 100644
--- a/meta-oe/recipes-support/poppler/poppler/basename-include.patch
+++ b/meta-oe/recipes-support/poppler/poppler/basename-include.patch
@@ -8,8 +8,8 @@ Index: poppler-0.64.0/utils/pdfsig.cc
 --- poppler-0.64.0.orig/utils/pdfsig.cc
 +++ poppler-0.64.0/utils/pdfsig.cc
 @@ -35,6 +35,10 @@
- #include "Win32Console.h"
  #include "numberofcharacters.h"
+ #include <libgen.h>
  
 +#if !defined(__GLIBC__)
 +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
diff --git a/meta-oe/recipes-support/poppler/poppler_0.71.0.bb b/meta-oe/recipes-support/poppler/poppler_0.75.0.bb
similarity index 93%
rename from meta-oe/recipes-support/poppler/poppler_0.71.0.bb
rename to meta-oe/recipes-support/poppler/poppler_0.75.0.bb
index 371648d1a..febdc8eda 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.71.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.75.0.bb
@@ -8,8 +8,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
            file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \
            file://basename-include.patch \
            "
-SRC_URI[md5sum] = "b505011e49e922c83f3ffb57ab40bc28"
-SRC_URI[sha256sum] = "badbecd2dddf63352fd85ec08a9c2ed122fdadacf2a34fcb4cc227c4d01f2cf9"
+SRC_URI[md5sum] = "3fb4ca803d989742695ca586c5cc489e"
+SRC_URI[sha256sum] = "3bbaedb0fa2797cac933a0659d144303e4d09eec6892c65600da987d8707199a"
 
 DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
 
@@ -40,7 +40,7 @@ EXTRA_OECMAKE += " \
 do_configure_append() {
     # poppler macro uses pkg-config to check for g-ir runtimes. Something
     # makes them point to /usr/bin. Align them to sysroot - that's where the
-    # git-wrappers are:
+    # gir-wrappers are:
     sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja
 }
 
-- 
2.20.1

[PATCH 09/11] networkmanager: upgrade 1.14.4 -> 1.16.0

[Andreas Müller]

* license.html was checked: it is still GPLv2. Could not find what changed the
  checksum. Maybe it was generated with a different version of gtk-doc.
* Build tested with just gnutls in PACKAGECONFIG to test nss alternative (and
  setting no crypto won't work)
* Build tested with all entries except gnutls/qt4-x11-free (yes they still
  support it!) in PACKAGECONFIG
* By far the most time was spent on musl patch adjustment. They apply cleanly
  but musl build was not tested due to limited resources.
* Fix build for non systemd by making SYSTEMD_SERVICE conditional

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ....ac-Fix-pkgconfig-sysroot-locations.patch} |  9 ++--
 ...tings-settings-property-documentati.patch} | 27 ++++------
 ...-net-ethernet.h-and-linux-if_ether.h.patch | 19 +++----
 ...net-ethernet.h-seems-to-be-over-spe.patch} | 14 +++--
 ...musl-basic.patch => 0003-musl-basic.patch} | 34 +++++++------
 ...ch => 0004-musl-dlopen-configure-ac.patch} | 10 ++--
 ....patch => 0005-musl-network-support.patch} | 51 +++++++++----------
 ...til.patch => 0006-musl-process-util.patch} | 22 ++++----
 ...r-conflicts-by-including-net-ethern.patch} | 16 +++---
 ...Add-a-strndupa-replacement-for-musl.patch} | 28 +++++-----
 ...ger_1.14.4.bb => networkmanager_1.16.0.bb} | 28 +++++-----
 11 files changed, 119 insertions(+), 139 deletions(-)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch => 0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch} (81%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0003-Do-not-create-settings-settings-property-documentati.patch => 0002-Do-not-create-settings-settings-property-documentati.patch} (69%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{ => musl}/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch (83%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch => musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch} (84%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0001-musl-basic.patch => 0003-musl-basic.patch} (55%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0002-musl-dlopen-configure-ac.patch => 0004-musl-dlopen-configure-ac.patch} (88%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0003-musl-network-support.patch => 0005-musl-network-support.patch} (69%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0004-musl-process-util.patch => 0006-musl-process-util.patch} (79%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0005-musl-avoid-further-conflicts-by-including-net-ethern.patch => 0007-musl-avoid-further-conflicts-by-including-net-ethern.patch} (91%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0006-Add-a-strndupa-replacement-for-musl.patch => 0008-Add-a-strndupa-replacement-for-musl.patch} (60%)
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.14.4.bb => networkmanager_1.16.0.bb} (81%)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
similarity index 81%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
index 351f264cb..302c0292b 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
@@ -1,4 +1,4 @@
-From 583f0448fb7e9aba2b410c06eec6f420b41a6a0c Mon Sep 17 00:00:00 2001
+From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001
 From: Pablo Saavedra <psaavedra@igalia.com>
 Date: Tue, 13 Mar 2018 17:36:20 +0100
 Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
@@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 51e5eb6..c9d3e56 100644
+index 967eac0..b914219 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -572,7 +572,7 @@ if test "$have_jansson" = "yes"; then
+@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then
  	AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled])
  
  	AC_CHECK_TOOLS(READELF, [eu-readelf readelf])
@@ -20,6 +20,3 @@ index 51e5eb6..c9d3e56 100644
  	JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[[\([^]]*\)]]/\1/p'`
  
  	if test "$JANSSON_SONAME" = ""; then
--- 
-2.14.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
similarity index 69%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
index c50293c09..5581dd3aa 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
@@ -13,15 +13,15 @@ Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- Makefile.am  | 20 --------------------
+ Makefile.am  | 11 -----------
  configure.ac |  5 -----
- 2 files changed, 25 deletions(-)
+ 2 files changed, 16 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 1e100f6..d31e3c1 100644
+index b180466..1ab4658 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1115,9 +1115,7 @@ EXTRA_DIST += \
+@@ -1298,9 +1298,7 @@ EXTRA_DIST += \
  if HAVE_INTROSPECTION
  
  libnm_noinst_data = \
@@ -31,7 +31,7 @@ index 1e100f6..d31e3c1 100644
  	libnm/nm-settings-keyfile-docs.xml \
  	libnm/nm-settings-ifcfg-rh-docs.xml
  
-@@ -3692,27 +3690,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
+@@ -3930,18 +3928,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
  $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
  
  clients_common_settings_doc_h = clients/common/settings-docs.h
@@ -40,16 +40,7 @@ index 1e100f6..d31e3c1 100644
 -	$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
 -DISTCLEANFILES += $(clients_common_settings_doc_h)
 -check-local-settings-docs: $(clients_common_settings_doc_h)
--	@if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \
--		if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \
--			if test "$$NM_TEST_REGENERATE" == 1 ; then \
--				cp -f "$(builddir)/$(clients_common_settings_doc_h)" "$(srcdir)/$(clients_common_settings_doc_h).in"; \
--			else \
--				echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes". You can also automatically copy the file by rerunning the test with \$$NM_TEST_REGENERATE=1 ; \
--				false; \
--			fi; \
--		fi;\
--	fi
+-	$(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
 -check_local += check-local-settings-docs
 -else
  $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
@@ -60,10 +51,10 @@ index 1e100f6..d31e3c1 100644
  	$(clients_common_settings_doc_h) \
  	$(clients_common_settings_doc_h).in
 diff --git a/configure.ac b/configure.ac
-index 79dc3b9..23d14a6 100644
+index b914219..872c292 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1195,11 +1195,6 @@ GTK_DOC_CHECK(1.0)
+@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0)
  # check if we can build setting property documentation
  build_docs=no
  if test -n "$INTROSPECTION_MAKEFILE"; then
@@ -76,5 +67,5 @@ index 79dc3b9..23d14a6 100644
  	if test -z "$PERL"; then
  		AC_MSG_ERROR([--enable-introspection requires perl])
 -- 
-2.14.5
+2.20.1
 
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
similarity index 83%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
index 0c415bce7..555e5ffcb 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
@@ -1,4 +1,4 @@
-From 3f4b6319701834182304c4079119780f4ae5b49b Mon Sep 17 00:00:00 2001
+From b2cdab746ef64bc25ba0b9cff596ebdddd6e8dc6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 7 Nov 2018 11:30:44 -0800
 Subject: [PATCH] Do not include net/ethernet.h and linux/if_ether.h
@@ -7,6 +7,7 @@ They conflict when used together especially with musl
 removing them still keeps it working so it seems they are redundant
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  shared/n-acd/src/n-acd.c              | 1 -
  src/platform/wpan/nm-wpan-utils.h     | 2 --
@@ -14,19 +15,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  3 files changed, 5 deletions(-)
 
 diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c
-index 9164f95..9538e50 100644
+index def56a2..dd4eb78 100644
 --- a/shared/n-acd/src/n-acd.c
 +++ b/shared/n-acd/src/n-acd.c
-@@ -23,7 +23,6 @@
- #include <errno.h>
+@@ -11,7 +11,6 @@
+ #include <inttypes.h>
  #include <limits.h>
- #include <linux/filter.h>
--#include <linux/if_ether.h>
  #include <linux/if_packet.h>
- #include <net/ethernet.h>
- #include <netinet/if_ether.h>
+-#include <netinet/if_ether.h>
+ #include <netinet/in.h>
+ #include <stdlib.h>
+ #include <string.h>
 diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h
-index f7d0c03..e1c81f5 100644
+index 1b54ec4..ed39938 100644
 --- a/src/platform/wpan/nm-wpan-utils.h
 +++ b/src/platform/wpan/nm-wpan-utils.h
 @@ -20,8 +20,6 @@
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
similarity index 84%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
index 49a07353d..5c59208b4 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
@@ -1,28 +1,29 @@
-From 18f71c1b48730b8602826517f2b5b088283ae948 Mon Sep 17 00:00:00 2001
+From 32dc6cab58912add5bc6495558538953d9344c36 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 31 Mar 2017 16:48:00 -0700
 Subject: [PATCH] sd-lldp.h: Remove net/ethernet.h seems to be over specified
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  src/systemd/src/libsystemd-network/sd-lldp.c | 1 +
  src/systemd/src/systemd/sd-lldp.h            | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/systemd/src/libsystemd-network/sd-lldp.c
-index 31e2448..7721cc2 100644
+index 741128e..62914ae 100644
 --- a/src/systemd/src/libsystemd-network/sd-lldp.c
 +++ b/src/systemd/src/libsystemd-network/sd-lldp.c
 @@ -3,6 +3,7 @@
- #include "nm-sd-adapt.h"
+ #include "nm-sd-adapt-core.h"
  
  #include <arpa/inet.h>
 +#include <net/ethernet.h>
  #include <linux/sockios.h>
+ #include <sys/ioctl.h>
  
- #include "sd-lldp.h"
 diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h
-index 3f35eeb..61b0e45 100644
+index bf3afad..4cace87 100644
 --- a/src/systemd/src/systemd/sd-lldp.h
 +++ b/src/systemd/src/systemd/sd-lldp.h
 @@ -18,7 +18,7 @@
@@ -34,6 +35,3 @@ index 3f35eeb..61b0e45 100644
  #include <sys/types.h>
  
  #include "sd-event.h"
--- 
-2.14.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch
similarity index 55%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch
index 00dda5b18..8d905489f 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch
@@ -1,4 +1,4 @@
-From e92de7409a3e107f90d108a9c5d49bd0418296dd Mon Sep 17 00:00:00 2001
+From ff1a5b849755db67b1778940fff92d6eb8b8b050 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Thu, 22 Mar 2018 17:54:10 +0100
 Subject: [PATCH] Usual fix for musl libc
@@ -6,6 +6,11 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
 Upstream-Status: Pending
 
 Stolen from [1] and prettyfied slightly
@@ -15,14 +20,14 @@ Stolen from [1] and prettyfied slightly
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 
 ---
- src/systemd/src/basic/stdio-util.h | 2 ++
- src/systemd/src/basic/util.h       | 5 +++++
+ shared/systemd/src/basic/stdio-util.h | 2 ++
+ shared/systemd/src/basic/util.h       | 5 +++++
  2 files changed, 7 insertions(+)
 
-diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h
-index 73c0327..e1ce64f 100644
---- a/src/systemd/src/basic/stdio-util.h
-+++ b/src/systemd/src/basic/stdio-util.h
+diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h
+index dc67b6e..6336243 100644
+--- a/shared/systemd/src/basic/stdio-util.h
++++ b/shared/systemd/src/basic/stdio-util.h
 @@ -1,7 +1,9 @@
  /* SPDX-License-Identifier: LGPL-2.1+ */
  #pragma once
@@ -33,12 +38,12 @@ index 73c0327..e1ce64f 100644
  #include <stdarg.h>
  #include <stdio.h>
  #include <sys/types.h>
-diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h
-index b31dfd1..9b7032c 100644
---- a/src/systemd/src/basic/util.h
-+++ b/src/systemd/src/basic/util.h
-@@ -28,6 +28,11 @@
- #include "missing.h"
+diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h
+index dc33d66..8ee2d64 100644
+--- a/shared/systemd/src/basic/util.h
++++ b/shared/systemd/src/basic/util.h
+@@ -27,6 +27,11 @@
+ #include "macro.h"
  #include "time-util.h"
  
 +#if !defined(__GLIBC__)
@@ -49,6 +54,3 @@ index b31dfd1..9b7032c 100644
  size_t page_size(void) _pure_;
  #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
  
--- 
-2.14.3
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch
similarity index 88%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch
index c162c1dfb..419e1be24 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch
@@ -1,4 +1,4 @@
-From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001
+From 7743ea63fbe572b1f82db7d399fe9c5c99521432 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Thu, 22 Mar 2018 18:18:06 +0100
 Subject: [PATCH] musl: dlopen is included so LD_LIBS="" instead of
@@ -14,15 +14,16 @@ Stolen from [1] and prettyfied slightly
 [1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
 ---
  configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/configure.ac b/configure.ac
-index 487a266..96ae4f7 100644
+index b914219..1b2b0ff 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -235,6 +235,7 @@ dnl
+@@ -241,6 +241,7 @@ dnl
  dnl Checks for libdl - on certain platforms its part of libc
  dnl
  AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
@@ -30,6 +31,3 @@ index 487a266..96ae4f7 100644
  AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
  
  PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
--- 
-2.14.3
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch
similarity index 69%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch
index 9a58c0e34..45f607f2c 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch
@@ -1,4 +1,4 @@
-From 714b4731a238653e9c7d885c0dee10677b0a4df3 Mon Sep 17 00:00:00 2001
+From 70ecbc01874bf2f8603ccbdfda634cac0bb83d93 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Thu, 22 Mar 2018 18:24:07 +0100
 Subject: [PATCH] musl: network support
@@ -13,14 +13,15 @@ Stolen from [1] and prettyfied slightly
 [1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
 ---
- libnm-core/nm-utils.h               | 4 ++++
- src/platform/wifi/nm-wifi-utils.h   | 4 ++++
- src/systemd/src/basic/socket-util.h | 5 +++++
- 3 files changed, 13 insertions(+)
+ libnm-core/nm-utils.h                  | 4 ++++
+ shared/systemd/src/basic/socket-util.h | 6 ++++++
+ src/platform/wifi/nm-wifi-utils.h      | 4 ++++
+ 3 files changed, 14 insertions(+)
 
 diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
-index df9284b..2bcf4b8 100644
+index 2b5baba..976850c 100644
 --- a/libnm-core/nm-utils.h
 +++ b/libnm-core/nm-utils.h
 @@ -30,7 +30,11 @@
@@ -35,8 +36,25 @@ index df9284b..2bcf4b8 100644
  #include <linux/if_infiniband.h>
  
  #include "nm-core-enum-types.h"
+diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
+index d2246a8..76f257f 100644
+--- a/shared/systemd/src/basic/socket-util.h
++++ b/shared/systemd/src/basic/socket-util.h
+@@ -13,6 +13,12 @@
+ #include <sys/types.h>
+ #include <sys/un.h>
+ 
++#if !defined(__GLIBC__)
++/* SIOCGSTAMPNS from linux/asm-generic.h
++ * for src/systemd/src/libsystemd-network/sd-lldp.c */
++#include <linux/sockios.h>
++#endif
++
+ #include "macro.h"
+ #include "missing_socket.h"
+ #include "sparse-endian.h"
 diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h
-index 705717b..da3edc4 100644
+index 36148b5..d282eb2 100644
 --- a/src/platform/wifi/nm-wifi-utils.h
 +++ b/src/platform/wifi/nm-wifi-utils.h
 @@ -22,7 +22,11 @@
@@ -51,22 +69,3 @@ index 705717b..da3edc4 100644
  
  #include "nm-dbus-interface.h"
  #include "nm-setting-wireless.h"
-diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h
-index d7e2d85..d109c84 100644
---- a/src/systemd/src/basic/socket-util.h
-+++ b/src/systemd/src/basic/socket-util.h
-@@ -11,6 +11,11 @@
- #include <linux/netlink.h>
- #include <linux/if_infiniband.h>
- #include <linux/if_packet.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing.h"
--- 
-2.14.3
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch
similarity index 79%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch
index 9e5c94336..525e35932 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch
@@ -1,4 +1,4 @@
-From d513c8bfc982dbd976617178b040c512c95710b6 Mon Sep 17 00:00:00 2001
+From 4f2fb1e1f785bad22df8f3d96cb4792acf21f315 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Thu, 25 Oct 2018 09:57:07 +0200
 Subject: [PATCH] musl: process-util
@@ -13,14 +13,15 @@ Stolen from [1] and prettyfied slightly
 [1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
 ---
- src/systemd/src/basic/process-util.c | 9 +++++++++
+ shared/systemd/src/basic/process-util.c | 9 +++++++++
  1 file changed, 9 insertions(+)
 
-diff --git a/src/systemd/src/basic/process-util.c b/src/systemd/src/basic/process-util.c
-index 1412f03..45f5049 100644
---- a/src/systemd/src/basic/process-util.c
-+++ b/src/systemd/src/basic/process-util.c
+diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
+index b0afb5c..7adc8bd 100644
+--- a/shared/systemd/src/basic/process-util.c
++++ b/shared/systemd/src/basic/process-util.c
 @@ -21,6 +21,9 @@
  #include <sys/wait.h>
  #include <syslog.h>
@@ -31,7 +32,7 @@ index 1412f03..45f5049 100644
  #if 0 /* NM_IGNORED */
  #if HAVE_VALGRIND_VALGRIND_H
  #include <valgrind/valgrind.h>
-@@ -1153,11 +1156,13 @@ void reset_cached_pid(void) {
+@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
          cached_pid = CACHED_PID_UNSET;
  }
  
@@ -40,12 +41,12 @@ index 1412f03..45f5049 100644
   * 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 void* __dso_handle _weak_;
 +#endif
  
  pid_t getpid_cached(void) {
          static bool installed = false;
-@@ -1186,7 +1191,11 @@ pid_t getpid_cached(void) {
+@@ -1201,7 +1206,11 @@ pid_t getpid_cached(void) {
                           * only half-documented (glibc doesn't document it but LSB does — though only superficially)
                           * we'll check for errors only in the most generic fashion possible. */
  
@@ -57,6 +58,3 @@ index 1412f03..45f5049 100644
                                  /* OOM? Let's try again later */
                                  cached_pid = CACHED_PID_UNSET;
                                  return new_pid;
--- 
-2.14.5
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch
similarity index 91%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch
index 6bca95e18..211a2da94 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch
@@ -1,4 +1,4 @@
-From b3b4fe35018c98ad176719b2d9ffb867974fc7c3 Mon Sep 17 00:00:00 2001
+From 4232a34064e33b52f07cca51b902b93699800f72 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Mon, 16 Apr 2018 14:45:44 +0200
 Subject: [PATCH] musl: avoid further conflicts by including net/ethernet.h
@@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit
 Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
 ---
  src/systemd/src/systemd/sd-dhcp-client.h  | 2 ++
  src/systemd/src/systemd/sd-dhcp-lease.h   | 2 ++
@@ -17,7 +18,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  4 files changed, 8 insertions(+)
 
 diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h
-index e388552..9c4dde8 100644
+index bd0d429..c935fe1 100644
 --- a/src/systemd/src/systemd/sd-dhcp-client.h
 +++ b/src/systemd/src/systemd/sd-dhcp-client.h
 @@ -20,7 +20,9 @@
@@ -29,9 +30,9 @@ index e388552..9c4dde8 100644
 +#endif
  #include <netinet/in.h>
  #include <sys/types.h>
- 
+ #include <stdbool.h>
 diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h
-index 2a60145..19d1814 100644
+index d299c79..991e67e 100644
 --- a/src/systemd/src/systemd/sd-dhcp-lease.h
 +++ b/src/systemd/src/systemd/sd-dhcp-lease.h
 @@ -19,7 +19,9 @@
@@ -45,7 +46,7 @@ index 2a60145..19d1814 100644
  #include <sys/types.h>
  
 diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h
-index fa36dca..2d25010 100644
+index 43d38f5..57ab487 100644
 --- a/src/systemd/src/systemd/sd-dhcp6-client.h
 +++ b/src/systemd/src/systemd/sd-dhcp6-client.h
 @@ -20,7 +20,9 @@
@@ -55,9 +56,9 @@ index fa36dca..2d25010 100644
 +#if defined(__GLIBC__)
  #include <net/ethernet.h>
 +#endif
- #include <stdbool.h>
  #include <sys/types.h>
  
+ #include "sd-dhcp6-lease.h"
 diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h
 index 71bd4cf..1c667ba 100644
 --- a/src/systemd/src/systemd/sd-ipv4ll.h
@@ -72,6 +73,3 @@ index 71bd4cf..1c667ba 100644
  #include <netinet/in.h>
  
  #include "sd-event.h"
--- 
-2.14.5
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch
similarity index 60%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch
index 023a4d9ad..885810185 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch
@@ -1,4 +1,4 @@
-From 6db6596e450062601d18b2ae812a4a58d2e03a53 Mon Sep 17 00:00:00 2001
+From cdd69321ec97ed19e66a747a968a1637a251b9e6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Mon, 16 Apr 2018 15:07:20 +0200
 Subject: [PATCH] Add a strndupa replacement for musl
@@ -9,15 +9,16 @@ Content-Transfer-Encoding: 8bit
 Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
 ---
- src/systemd/src/basic/in-addr-util.c | 1 +
- src/systemd/src/basic/string-util.h  | 5 +++++
+ shared/systemd/src/basic/in-addr-util.c | 1 +
+ shared/systemd/src/basic/string-util.h  | 5 +++++
  2 files changed, 6 insertions(+)
 
-diff --git a/src/systemd/src/basic/in-addr-util.c b/src/systemd/src/basic/in-addr-util.c
-index 2a02d90..a57c360 100644
---- a/src/systemd/src/basic/in-addr-util.c
-+++ b/src/systemd/src/basic/in-addr-util.c
+diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
+index 5ced350..c6b52b8 100644
+--- a/shared/systemd/src/basic/in-addr-util.c
++++ b/shared/systemd/src/basic/in-addr-util.c
 @@ -13,6 +13,7 @@
  #include "in-addr-util.h"
  #include "macro.h"
@@ -26,11 +27,11 @@ index 2a02d90..a57c360 100644
  #include "util.h"
  
  bool in4_addr_is_null(const struct in_addr *a) {
-diff --git a/src/systemd/src/basic/string-util.h b/src/systemd/src/basic/string-util.h
-index 4c94b18..a6dc446 100644
---- a/src/systemd/src/basic/string-util.h
-+++ b/src/systemd/src/basic/string-util.h
-@@ -26,6 +26,11 @@
+diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
+index 38070ab..6b918e0 100644
+--- a/shared/systemd/src/basic/string-util.h
++++ b/shared/systemd/src/basic/string-util.h
+@@ -27,6 +27,11 @@
  #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
  #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
  
@@ -42,6 +43,3 @@ index 4c94b18..a6dc446 100644
  int strcmp_ptr(const char *a, const char *b) _pure_;
  
  static inline bool streq_ptr(const char *a, const char *b) {
--- 
-2.14.3
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb
similarity index 81%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb
index 26c40a5fe..bdf60ee7c 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb
@@ -5,7 +5,7 @@ SECTION = "net/misc"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
                     file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
-                    file://docs/api/html/license.html;md5=2d56a1b0c42e388aa86aef59b154e8c3 \
+                    file://docs/api/html/license.html;md5=233931303ef80eded167add1f60a50c1 \
 "
 
 DEPENDS = " \
@@ -24,19 +24,19 @@ inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introsp
 
 SRC_URI = " \
     ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
-    file://0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
-    file://0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
-    file://0003-Do-not-create-settings-settings-property-documentati.patch \
-    file://0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch \
-    file://musl/0001-musl-basic.patch \
-    file://musl/0002-musl-dlopen-configure-ac.patch \
-    file://musl/0003-musl-network-support.patch \
-    file://musl/0004-musl-process-util.patch \
-    file://musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch \
-    file://musl/0006-Add-a-strndupa-replacement-for-musl.patch \
+    file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
+    file://0002-Do-not-create-settings-settings-property-documentati.patch \
+    file://musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch \
+    file://musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
+    file://musl/0003-musl-basic.patch \
+    file://musl/0004-musl-dlopen-configure-ac.patch \
+    file://musl/0005-musl-network-support.patch \
+    file://musl/0006-musl-process-util.patch \
+    file://musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch \
+    file://musl/0008-Add-a-strndupa-replacement-for-musl.patch \
 "
-SRC_URI[md5sum] = "54ce62f0aa18ef6c5e754eaac47494ac"
-SRC_URI[sha256sum] = "35a3ede4c7d12d6212033c9e44cb82b7692f38063b53a067567f02f5937c8c18"
+SRC_URI[md5sum] = "10abacaafb162a67d2942adf03e7e9e4"
+SRC_URI[sha256sum] = "8e962833b6ca03edda1bc57ed6614a7b8c2339531b44acef098d05f2324c5d2c"
 
 UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.10/"
 UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P<pver>1\.10(\.\d+)+).tar.xz"
@@ -136,7 +136,7 @@ FILES_${PN}-nmtui-doc = " \
     ${mandir}/man1/nmtui* \
 "
 
-SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service"
+SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}"
 
 do_install_append() {
     rm -rf ${D}/run ${D}${localstatedir}/run
-- 
2.20.1

Re: [PATCH 09/11] networkmanager: upgrade 1.14.4 -> 1.16.0

[Khem Raj]

On Fri, Mar 22, 2019 at 3:23 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> * license.html was checked: it is still GPLv2. Could not find what changed the
>   checksum. Maybe it was generated with a different version of gtk-doc.
> * Build tested with just gnutls in PACKAGECONFIG to test nss alternative (and
>   setting no crypto won't work)
> * Build tested with all entries except gnutls/qt4-x11-free (yes they still
>   support it!) in PACKAGECONFIG
> * By far the most time was spent on musl patch adjustment. They apply cleanly
>   but musl build was not tested due to limited resources.
> * Fix build for non systemd by making SYSTEMD_SERVICE conditional
>


https://errors.yoctoproject.org/Errors/Details/234221/

../NetworkManager-1.16.0/shared/systemd/src/basic/util.h:75:18: error:
unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'?


> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  ....ac-Fix-pkgconfig-sysroot-locations.patch} |  9 ++--
>  ...tings-settings-property-documentati.patch} | 27 ++++------
>  ...-net-ethernet.h-and-linux-if_ether.h.patch | 19 +++----
>  ...net-ethernet.h-seems-to-be-over-spe.patch} | 14 +++--
>  ...musl-basic.patch => 0003-musl-basic.patch} | 34 +++++++------
>  ...ch => 0004-musl-dlopen-configure-ac.patch} | 10 ++--
>  ....patch => 0005-musl-network-support.patch} | 51 +++++++++----------
>  ...til.patch => 0006-musl-process-util.patch} | 22 ++++----
>  ...r-conflicts-by-including-net-ethern.patch} | 16 +++---
>  ...Add-a-strndupa-replacement-for-musl.patch} | 28 +++++-----
>  ...ger_1.14.4.bb => networkmanager_1.16.0.bb} | 28 +++++-----
>  11 files changed, 119 insertions(+), 139 deletions(-)
>  rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch => 0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch} (81%)
>  rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0003-Do-not-create-settings-settings-property-documentati.patch => 0002-Do-not-create-settings-settings-property-documentati.patch} (69%)
>  rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{ => musl}/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch (83%)
>  rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch => musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch} (84%)
>  rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0001-musl-basic.patch => 0003-musl-basic.patch} (55%)
>  rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0002-musl-dlopen-configure-ac.patch => 0004-musl-dlopen-configure-ac.patch} (88%)
>  rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0003-musl-network-support.patch => 0005-musl-network-support.patch} (69%)
>  rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0004-musl-process-util.patch => 0006-musl-process-util.patch} (79%)
>  rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0005-musl-avoid-further-conflicts-by-including-net-ethern.patch => 0007-musl-avoid-further-conflicts-by-including-net-ethern.patch} (91%)
>  rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0006-Add-a-strndupa-replacement-for-musl.patch => 0008-Add-a-strndupa-replacement-for-musl.patch} (60%)
>  rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.14.4.bb => networkmanager_1.16.0.bb} (81%)
>
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> similarity index 81%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> index 351f264cb..302c0292b 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> @@ -1,4 +1,4 @@
> -From 583f0448fb7e9aba2b410c06eec6f420b41a6a0c Mon Sep 17 00:00:00 2001
> +From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001
>  From: Pablo Saavedra <psaavedra@igalia.com>
>  Date: Tue, 13 Mar 2018 17:36:20 +0100
>  Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
> @@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/configure.ac b/configure.ac
> -index 51e5eb6..c9d3e56 100644
> +index 967eac0..b914219 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -572,7 +572,7 @@ if test "$have_jansson" = "yes"; then
> +@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then
>         AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled])
>
>         AC_CHECK_TOOLS(READELF, [eu-readelf readelf])
> @@ -20,6 +20,3 @@ index 51e5eb6..c9d3e56 100644
>         JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[[\([^]]*\)]]/\1/p'`
>
>         if test "$JANSSON_SONAME" = ""; then
> ---
> -2.14.1
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
> similarity index 69%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
> index c50293c09..5581dd3aa 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
> @@ -13,15 +13,15 @@ Upstream-Status: Inappropriate [OE specific]
>
>  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>  ---
> - Makefile.am  | 20 --------------------
> + Makefile.am  | 11 -----------
>   configure.ac |  5 -----
> - 2 files changed, 25 deletions(-)
> + 2 files changed, 16 deletions(-)
>
>  diff --git a/Makefile.am b/Makefile.am
> -index 1e100f6..d31e3c1 100644
> +index b180466..1ab4658 100644
>  --- a/Makefile.am
>  +++ b/Makefile.am
> -@@ -1115,9 +1115,7 @@ EXTRA_DIST += \
> +@@ -1298,9 +1298,7 @@ EXTRA_DIST += \
>   if HAVE_INTROSPECTION
>
>   libnm_noinst_data = \
> @@ -31,7 +31,7 @@ index 1e100f6..d31e3c1 100644
>         libnm/nm-settings-keyfile-docs.xml \
>         libnm/nm-settings-ifcfg-rh-docs.xml
>
> -@@ -3692,27 +3690,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
> +@@ -3930,18 +3928,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
>   $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
>
>   clients_common_settings_doc_h = clients/common/settings-docs.h
> @@ -40,16 +40,7 @@ index 1e100f6..d31e3c1 100644
>  -      $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
>  -DISTCLEANFILES += $(clients_common_settings_doc_h)
>  -check-local-settings-docs: $(clients_common_settings_doc_h)
> --      @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \
> --              if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \
> --                      if test "$$NM_TEST_REGENERATE" == 1 ; then \
> --                              cp -f "$(builddir)/$(clients_common_settings_doc_h)" "$(srcdir)/$(clients_common_settings_doc_h).in"; \
> --                      else \
> --                              echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes". You can also automatically copy the file by rerunning the test with \$$NM_TEST_REGENERATE=1 ; \
> --                              false; \
> --                      fi; \
> --              fi;\
> --      fi
> +-      $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
>  -check_local += check-local-settings-docs
>  -else
>   $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
> @@ -60,10 +51,10 @@ index 1e100f6..d31e3c1 100644
>         $(clients_common_settings_doc_h) \
>         $(clients_common_settings_doc_h).in
>  diff --git a/configure.ac b/configure.ac
> -index 79dc3b9..23d14a6 100644
> +index b914219..872c292 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -1195,11 +1195,6 @@ GTK_DOC_CHECK(1.0)
> +@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0)
>   # check if we can build setting property documentation
>   build_docs=no
>   if test -n "$INTROSPECTION_MAKEFILE"; then
> @@ -76,5 +67,5 @@ index 79dc3b9..23d14a6 100644
>         if test -z "$PERL"; then
>                 AC_MSG_ERROR([--enable-introspection requires perl])
>  --
> -2.14.5
> +2.20.1
>
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
> similarity index 83%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
> index 0c415bce7..555e5ffcb 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
> @@ -1,4 +1,4 @@
> -From 3f4b6319701834182304c4079119780f4ae5b49b Mon Sep 17 00:00:00 2001
> +From b2cdab746ef64bc25ba0b9cff596ebdddd6e8dc6 Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Wed, 7 Nov 2018 11:30:44 -0800
>  Subject: [PATCH] Do not include net/ethernet.h and linux/if_ether.h
> @@ -7,6 +7,7 @@ They conflict when used together especially with musl
>  removing them still keeps it working so it seems they are redundant
>
>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +
>  ---
>   shared/n-acd/src/n-acd.c              | 1 -
>   src/platform/wpan/nm-wpan-utils.h     | 2 --
> @@ -14,19 +15,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>   3 files changed, 5 deletions(-)
>
>  diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c
> -index 9164f95..9538e50 100644
> +index def56a2..dd4eb78 100644
>  --- a/shared/n-acd/src/n-acd.c
>  +++ b/shared/n-acd/src/n-acd.c
> -@@ -23,7 +23,6 @@
> - #include <errno.h>
> +@@ -11,7 +11,6 @@
> + #include <inttypes.h>
>   #include <limits.h>
> - #include <linux/filter.h>
> --#include <linux/if_ether.h>
>   #include <linux/if_packet.h>
> - #include <net/ethernet.h>
> - #include <netinet/if_ether.h>
> +-#include <netinet/if_ether.h>
> + #include <netinet/in.h>
> + #include <stdlib.h>
> + #include <string.h>
>  diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h
> -index f7d0c03..e1c81f5 100644
> +index 1b54ec4..ed39938 100644
>  --- a/src/platform/wpan/nm-wpan-utils.h
>  +++ b/src/platform/wpan/nm-wpan-utils.h
>  @@ -20,8 +20,6 @@
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
> similarity index 84%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
> index 49a07353d..5c59208b4 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
> @@ -1,28 +1,29 @@
> -From 18f71c1b48730b8602826517f2b5b088283ae948 Mon Sep 17 00:00:00 2001
> +From 32dc6cab58912add5bc6495558538953d9344c36 Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Fri, 31 Mar 2017 16:48:00 -0700
>  Subject: [PATCH] sd-lldp.h: Remove net/ethernet.h seems to be over specified
>
>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +
>  ---
>   src/systemd/src/libsystemd-network/sd-lldp.c | 1 +
>   src/systemd/src/systemd/sd-lldp.h            | 2 +-
>   2 files changed, 2 insertions(+), 1 deletion(-)
>
>  diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/systemd/src/libsystemd-network/sd-lldp.c
> -index 31e2448..7721cc2 100644
> +index 741128e..62914ae 100644
>  --- a/src/systemd/src/libsystemd-network/sd-lldp.c
>  +++ b/src/systemd/src/libsystemd-network/sd-lldp.c
>  @@ -3,6 +3,7 @@
> - #include "nm-sd-adapt.h"
> + #include "nm-sd-adapt-core.h"
>
>   #include <arpa/inet.h>
>  +#include <net/ethernet.h>
>   #include <linux/sockios.h>
> + #include <sys/ioctl.h>
>
> - #include "sd-lldp.h"
>  diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h
> -index 3f35eeb..61b0e45 100644
> +index bf3afad..4cace87 100644
>  --- a/src/systemd/src/systemd/sd-lldp.h
>  +++ b/src/systemd/src/systemd/sd-lldp.h
>  @@ -18,7 +18,7 @@
> @@ -34,6 +35,3 @@ index 3f35eeb..61b0e45 100644
>   #include <sys/types.h>
>
>   #include "sd-event.h"
> ---
> -2.14.1
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch
> similarity index 55%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch
> index 00dda5b18..8d905489f 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch
> @@ -1,4 +1,4 @@
> -From e92de7409a3e107f90d108a9c5d49bd0418296dd Mon Sep 17 00:00:00 2001
> +From ff1a5b849755db67b1778940fff92d6eb8b8b050 Mon Sep 17 00:00:00 2001
>  From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
>  Date: Thu, 22 Mar 2018 17:54:10 +0100
>  Subject: [PATCH] Usual fix for musl libc
> @@ -6,6 +6,11 @@ MIME-Version: 1.0
>  Content-Type: text/plain; charset=UTF-8
>  Content-Transfer-Encoding: 8bit
>
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
>  Upstream-Status: Pending
>
>  Stolen from [1] and prettyfied slightly
> @@ -15,14 +20,14 @@ Stolen from [1] and prettyfied slightly
>  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>
>  ---
> - src/systemd/src/basic/stdio-util.h | 2 ++
> - src/systemd/src/basic/util.h       | 5 +++++
> + shared/systemd/src/basic/stdio-util.h | 2 ++
> + shared/systemd/src/basic/util.h       | 5 +++++
>   2 files changed, 7 insertions(+)
>
> -diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h
> -index 73c0327..e1ce64f 100644
> ---- a/src/systemd/src/basic/stdio-util.h
> -+++ b/src/systemd/src/basic/stdio-util.h
> +diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h
> +index dc67b6e..6336243 100644
> +--- a/shared/systemd/src/basic/stdio-util.h
> ++++ b/shared/systemd/src/basic/stdio-util.h
>  @@ -1,7 +1,9 @@
>   /* SPDX-License-Identifier: LGPL-2.1+ */
>   #pragma once
> @@ -33,12 +38,12 @@ index 73c0327..e1ce64f 100644
>   #include <stdarg.h>
>   #include <stdio.h>
>   #include <sys/types.h>
> -diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h
> -index b31dfd1..9b7032c 100644
> ---- a/src/systemd/src/basic/util.h
> -+++ b/src/systemd/src/basic/util.h
> -@@ -28,6 +28,11 @@
> - #include "missing.h"
> +diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h
> +index dc33d66..8ee2d64 100644
> +--- a/shared/systemd/src/basic/util.h
> ++++ b/shared/systemd/src/basic/util.h
> +@@ -27,6 +27,11 @@
> + #include "macro.h"
>   #include "time-util.h"
>
>  +#if !defined(__GLIBC__)
> @@ -49,6 +54,3 @@ index b31dfd1..9b7032c 100644
>   size_t page_size(void) _pure_;
>   #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
>
> ---
> -2.14.3
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch
> similarity index 88%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch
> index c162c1dfb..419e1be24 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch
> @@ -1,4 +1,4 @@
> -From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001
> +From 7743ea63fbe572b1f82db7d399fe9c5c99521432 Mon Sep 17 00:00:00 2001
>  From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
>  Date: Thu, 22 Mar 2018 18:18:06 +0100
>  Subject: [PATCH] musl: dlopen is included so LD_LIBS="" instead of
> @@ -14,15 +14,16 @@ Stolen from [1] and prettyfied slightly
>  [1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
>
>  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +
>  ---
>   configure.ac | 1 +
>   1 file changed, 1 insertion(+)
>
>  diff --git a/configure.ac b/configure.ac
> -index 487a266..96ae4f7 100644
> +index b914219..1b2b0ff 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -235,6 +235,7 @@ dnl
> +@@ -241,6 +241,7 @@ dnl
>   dnl Checks for libdl - on certain platforms its part of libc
>   dnl
>   AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
> @@ -30,6 +31,3 @@ index 487a266..96ae4f7 100644
>   AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
>
>   PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
> ---
> -2.14.3
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch
> similarity index 69%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch
> index 9a58c0e34..45f607f2c 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch
> @@ -1,4 +1,4 @@
> -From 714b4731a238653e9c7d885c0dee10677b0a4df3 Mon Sep 17 00:00:00 2001
> +From 70ecbc01874bf2f8603ccbdfda634cac0bb83d93 Mon Sep 17 00:00:00 2001
>  From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
>  Date: Thu, 22 Mar 2018 18:24:07 +0100
>  Subject: [PATCH] musl: network support
> @@ -13,14 +13,15 @@ Stolen from [1] and prettyfied slightly
>  [1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
>
>  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +
>  ---
> - libnm-core/nm-utils.h               | 4 ++++
> - src/platform/wifi/nm-wifi-utils.h   | 4 ++++
> - src/systemd/src/basic/socket-util.h | 5 +++++
> - 3 files changed, 13 insertions(+)
> + libnm-core/nm-utils.h                  | 4 ++++
> + shared/systemd/src/basic/socket-util.h | 6 ++++++
> + src/platform/wifi/nm-wifi-utils.h      | 4 ++++
> + 3 files changed, 14 insertions(+)
>
>  diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
> -index df9284b..2bcf4b8 100644
> +index 2b5baba..976850c 100644
>  --- a/libnm-core/nm-utils.h
>  +++ b/libnm-core/nm-utils.h
>  @@ -30,7 +30,11 @@
> @@ -35,8 +36,25 @@ index df9284b..2bcf4b8 100644
>   #include <linux/if_infiniband.h>
>
>   #include "nm-core-enum-types.h"
> +diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
> +index d2246a8..76f257f 100644
> +--- a/shared/systemd/src/basic/socket-util.h
> ++++ b/shared/systemd/src/basic/socket-util.h
> +@@ -13,6 +13,12 @@
> + #include <sys/types.h>
> + #include <sys/un.h>
> +
> ++#if !defined(__GLIBC__)
> ++/* SIOCGSTAMPNS from linux/asm-generic.h
> ++ * for src/systemd/src/libsystemd-network/sd-lldp.c */
> ++#include <linux/sockios.h>
> ++#endif
> ++
> + #include "macro.h"
> + #include "missing_socket.h"
> + #include "sparse-endian.h"
>  diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h
> -index 705717b..da3edc4 100644
> +index 36148b5..d282eb2 100644
>  --- a/src/platform/wifi/nm-wifi-utils.h
>  +++ b/src/platform/wifi/nm-wifi-utils.h
>  @@ -22,7 +22,11 @@
> @@ -51,22 +69,3 @@ index 705717b..da3edc4 100644
>
>   #include "nm-dbus-interface.h"
>   #include "nm-setting-wireless.h"
> -diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h
> -index d7e2d85..d109c84 100644
> ---- a/src/systemd/src/basic/socket-util.h
> -+++ b/src/systemd/src/basic/socket-util.h
> -@@ -11,6 +11,11 @@
> - #include <linux/netlink.h>
> - #include <linux/if_infiniband.h>
> - #include <linux/if_packet.h>
> -+#if !defined(__GLIBC__)
> -+/* SIOCGSTAMPNS from linux/asm-generic.h
> -+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
> -+#include <linux/sockios.h>
> -+#endif
> -
> - #include "macro.h"
> - #include "missing.h"
> ---
> -2.14.3
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch
> similarity index 79%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch
> index 9e5c94336..525e35932 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch
> @@ -1,4 +1,4 @@
> -From d513c8bfc982dbd976617178b040c512c95710b6 Mon Sep 17 00:00:00 2001
> +From 4f2fb1e1f785bad22df8f3d96cb4792acf21f315 Mon Sep 17 00:00:00 2001
>  From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
>  Date: Thu, 25 Oct 2018 09:57:07 +0200
>  Subject: [PATCH] musl: process-util
> @@ -13,14 +13,15 @@ Stolen from [1] and prettyfied slightly
>  [1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
>
>  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +
>  ---
> - src/systemd/src/basic/process-util.c | 9 +++++++++
> + shared/systemd/src/basic/process-util.c | 9 +++++++++
>   1 file changed, 9 insertions(+)
>
> -diff --git a/src/systemd/src/basic/process-util.c b/src/systemd/src/basic/process-util.c
> -index 1412f03..45f5049 100644
> ---- a/src/systemd/src/basic/process-util.c
> -+++ b/src/systemd/src/basic/process-util.c
> +diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
> +index b0afb5c..7adc8bd 100644
> +--- a/shared/systemd/src/basic/process-util.c
> ++++ b/shared/systemd/src/basic/process-util.c
>  @@ -21,6 +21,9 @@
>   #include <sys/wait.h>
>   #include <syslog.h>
> @@ -31,7 +32,7 @@ index 1412f03..45f5049 100644
>   #if 0 /* NM_IGNORED */
>   #if HAVE_VALGRIND_VALGRIND_H
>   #include <valgrind/valgrind.h>
> -@@ -1153,11 +1156,13 @@ void reset_cached_pid(void) {
> +@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
>           cached_pid = CACHED_PID_UNSET;
>   }
>
> @@ -40,12 +41,12 @@ index 1412f03..45f5049 100644
>    * 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 void* __dso_handle _weak_;
>  +#endif
>
>   pid_t getpid_cached(void) {
>           static bool installed = false;
> -@@ -1186,7 +1191,11 @@ pid_t getpid_cached(void) {
> +@@ -1201,7 +1206,11 @@ pid_t getpid_cached(void) {
>                            * only half-documented (glibc doesn't document it but LSB does — though only superficially)
>                            * we'll check for errors only in the most generic fashion possible. */
>
> @@ -57,6 +58,3 @@ index 1412f03..45f5049 100644
>                                   /* OOM? Let's try again later */
>                                   cached_pid = CACHED_PID_UNSET;
>                                   return new_pid;
> ---
> -2.14.5
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch
> similarity index 91%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch
> index 6bca95e18..211a2da94 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch
> @@ -1,4 +1,4 @@
> -From b3b4fe35018c98ad176719b2d9ffb867974fc7c3 Mon Sep 17 00:00:00 2001
> +From 4232a34064e33b52f07cca51b902b93699800f72 Mon Sep 17 00:00:00 2001
>  From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
>  Date: Mon, 16 Apr 2018 14:45:44 +0200
>  Subject: [PATCH] musl: avoid further conflicts by including net/ethernet.h
> @@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit
>  Upstream-Status: Pending
>
>  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +
>  ---
>   src/systemd/src/systemd/sd-dhcp-client.h  | 2 ++
>   src/systemd/src/systemd/sd-dhcp-lease.h   | 2 ++
> @@ -17,7 +18,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>   4 files changed, 8 insertions(+)
>
>  diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h
> -index e388552..9c4dde8 100644
> +index bd0d429..c935fe1 100644
>  --- a/src/systemd/src/systemd/sd-dhcp-client.h
>  +++ b/src/systemd/src/systemd/sd-dhcp-client.h
>  @@ -20,7 +20,9 @@
> @@ -29,9 +30,9 @@ index e388552..9c4dde8 100644
>  +#endif
>   #include <netinet/in.h>
>   #include <sys/types.h>
> -
> + #include <stdbool.h>
>  diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h
> -index 2a60145..19d1814 100644
> +index d299c79..991e67e 100644
>  --- a/src/systemd/src/systemd/sd-dhcp-lease.h
>  +++ b/src/systemd/src/systemd/sd-dhcp-lease.h
>  @@ -19,7 +19,9 @@
> @@ -45,7 +46,7 @@ index 2a60145..19d1814 100644
>   #include <sys/types.h>
>
>  diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h
> -index fa36dca..2d25010 100644
> +index 43d38f5..57ab487 100644
>  --- a/src/systemd/src/systemd/sd-dhcp6-client.h
>  +++ b/src/systemd/src/systemd/sd-dhcp6-client.h
>  @@ -20,7 +20,9 @@
> @@ -55,9 +56,9 @@ index fa36dca..2d25010 100644
>  +#if defined(__GLIBC__)
>   #include <net/ethernet.h>
>  +#endif
> - #include <stdbool.h>
>   #include <sys/types.h>
>
> + #include "sd-dhcp6-lease.h"
>  diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h
>  index 71bd4cf..1c667ba 100644
>  --- a/src/systemd/src/systemd/sd-ipv4ll.h
> @@ -72,6 +73,3 @@ index 71bd4cf..1c667ba 100644
>   #include <netinet/in.h>
>
>   #include "sd-event.h"
> ---
> -2.14.5
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch
> similarity index 60%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch
> index 023a4d9ad..885810185 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch
> @@ -1,4 +1,4 @@
> -From 6db6596e450062601d18b2ae812a4a58d2e03a53 Mon Sep 17 00:00:00 2001
> +From cdd69321ec97ed19e66a747a968a1637a251b9e6 Mon Sep 17 00:00:00 2001
>  From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
>  Date: Mon, 16 Apr 2018 15:07:20 +0200
>  Subject: [PATCH] Add a strndupa replacement for musl
> @@ -9,15 +9,16 @@ Content-Transfer-Encoding: 8bit
>  Upstream-Status: Pending
>
>  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +
>  ---
> - src/systemd/src/basic/in-addr-util.c | 1 +
> - src/systemd/src/basic/string-util.h  | 5 +++++
> + shared/systemd/src/basic/in-addr-util.c | 1 +
> + shared/systemd/src/basic/string-util.h  | 5 +++++
>   2 files changed, 6 insertions(+)
>
> -diff --git a/src/systemd/src/basic/in-addr-util.c b/src/systemd/src/basic/in-addr-util.c
> -index 2a02d90..a57c360 100644
> ---- a/src/systemd/src/basic/in-addr-util.c
> -+++ b/src/systemd/src/basic/in-addr-util.c
> +diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
> +index 5ced350..c6b52b8 100644
> +--- a/shared/systemd/src/basic/in-addr-util.c
> ++++ b/shared/systemd/src/basic/in-addr-util.c
>  @@ -13,6 +13,7 @@
>   #include "in-addr-util.h"
>   #include "macro.h"
> @@ -26,11 +27,11 @@ index 2a02d90..a57c360 100644
>   #include "util.h"
>
>   bool in4_addr_is_null(const struct in_addr *a) {
> -diff --git a/src/systemd/src/basic/string-util.h b/src/systemd/src/basic/string-util.h
> -index 4c94b18..a6dc446 100644
> ---- a/src/systemd/src/basic/string-util.h
> -+++ b/src/systemd/src/basic/string-util.h
> -@@ -26,6 +26,11 @@
> +diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
> +index 38070ab..6b918e0 100644
> +--- a/shared/systemd/src/basic/string-util.h
> ++++ b/shared/systemd/src/basic/string-util.h
> +@@ -27,6 +27,11 @@
>   #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
>   #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
>
> @@ -42,6 +43,3 @@ index 4c94b18..a6dc446 100644
>   int strcmp_ptr(const char *a, const char *b) _pure_;
>
>   static inline bool streq_ptr(const char *a, const char *b) {
> ---
> -2.14.3
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb
> similarity index 81%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb
> index 26c40a5fe..bdf60ee7c 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb
> @@ -5,7 +5,7 @@ SECTION = "net/misc"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
>                      file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
> -                    file://docs/api/html/license.html;md5=2d56a1b0c42e388aa86aef59b154e8c3 \
> +                    file://docs/api/html/license.html;md5=233931303ef80eded167add1f60a50c1 \
>  "
>
>  DEPENDS = " \
> @@ -24,19 +24,19 @@ inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introsp
>
>  SRC_URI = " \
>      ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
> -    file://0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
> -    file://0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
> -    file://0003-Do-not-create-settings-settings-property-documentati.patch \
> -    file://0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch \
> -    file://musl/0001-musl-basic.patch \
> -    file://musl/0002-musl-dlopen-configure-ac.patch \
> -    file://musl/0003-musl-network-support.patch \
> -    file://musl/0004-musl-process-util.patch \
> -    file://musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch \
> -    file://musl/0006-Add-a-strndupa-replacement-for-musl.patch \
> +    file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
> +    file://0002-Do-not-create-settings-settings-property-documentati.patch \
> +    file://musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch \
> +    file://musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
> +    file://musl/0003-musl-basic.patch \
> +    file://musl/0004-musl-dlopen-configure-ac.patch \
> +    file://musl/0005-musl-network-support.patch \
> +    file://musl/0006-musl-process-util.patch \
> +    file://musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch \
> +    file://musl/0008-Add-a-strndupa-replacement-for-musl.patch \
>  "
> -SRC_URI[md5sum] = "54ce62f0aa18ef6c5e754eaac47494ac"
> -SRC_URI[sha256sum] = "35a3ede4c7d12d6212033c9e44cb82b7692f38063b53a067567f02f5937c8c18"
> +SRC_URI[md5sum] = "10abacaafb162a67d2942adf03e7e9e4"
> +SRC_URI[sha256sum] = "8e962833b6ca03edda1bc57ed6614a7b8c2339531b44acef098d05f2324c5d2c"
>
>  UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.10/"
>  UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P<pver>1\.10(\.\d+)+).tar.xz"
> @@ -136,7 +136,7 @@ FILES_${PN}-nmtui-doc = " \
>      ${mandir}/man1/nmtui* \
>  "
>
> -SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service"
> +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}"
>
>  do_install_append() {
>      rm -rf ${D}/run ${D}${localstatedir}/run
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [PATCH 09/11] networkmanager: upgrade 1.14.4 -> 1.16.0

[Adrian Bunk]

On Sun, Mar 24, 2019 at 09:28:14AM -0700, Khem Raj wrote:
> On Fri, Mar 22, 2019 at 3:23 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > * license.html was checked: it is still GPLv2. Could not find what changed the
> >   checksum. Maybe it was generated with a different version of gtk-doc.
> > * Build tested with just gnutls in PACKAGECONFIG to test nss alternative (and
> >   setting no crypto won't work)
> > * Build tested with all entries except gnutls/qt4-x11-free (yes they still
> >   support it!) in PACKAGECONFIG
> > * By far the most time was spent on musl patch adjustment. They apply cleanly
> >   but musl build was not tested due to limited resources.
> > * Fix build for non systemd by making SYSTEMD_SERVICE conditional
> 
> 
> https://errors.yoctoproject.org/Errors/Details/234221/
> 
> ../NetworkManager-1.16.0/shared/systemd/src/basic/util.h:75:18: error:
> unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'?
>...

NM seems to now ship systemd sources for using them as a library.

OE carries 21 (sic) patches to systemd that are
  Upstream-Status: Inappropriate [musl specific]

This specific error seems to be fixed by one of them.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [PATCH 09/11] networkmanager: upgrade 1.14.4 -> 1.16.0

[Khem Raj]

On Tue, Mar 26, 2019 at 5:57 AM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Sun, Mar 24, 2019 at 09:28:14AM -0700, Khem Raj wrote:
> > On Fri, Mar 22, 2019 at 3:23 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
> > >
> > > * license.html was checked: it is still GPLv2. Could not find what changed the
> > >   checksum. Maybe it was generated with a different version of gtk-doc.
> > > * Build tested with just gnutls in PACKAGECONFIG to test nss alternative (and
> > >   setting no crypto won't work)
> > > * Build tested with all entries except gnutls/qt4-x11-free (yes they still
> > >   support it!) in PACKAGECONFIG
> > > * By far the most time was spent on musl patch adjustment. They apply cleanly
> > >   but musl build was not tested due to limited resources.
> > > * Fix build for non systemd by making SYSTEMD_SERVICE conditional
> >
> >
> > https://errors.yoctoproject.org/Errors/Details/234221/
> >
> > ../NetworkManager-1.16.0/shared/systemd/src/basic/util.h:75:18: error:
> > unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'?
> >...
>
> NM seems to now ship systemd sources for using them as a library.
>
> OE carries 21 (sic) patches to systemd that are
>   Upstream-Status: Inappropriate [musl specific]
>
> This specific error seems to be fixed by one of them.
>

Yes, thanks for info,

> cu
> Adrian
>
> --
>
>        "Is there not promise of rain?" Ling Tan asked suddenly out
>         of the darkness. There had been need of rain for many days.
>        "Only a promise," Lao Er said.
>                                        Pearl S. Buck - Dragon Seed
>

Re: [PATCH 09/11] networkmanager: upgrade 1.14.4 -> 1.16.0

[Andreas Müller]

On Tue, Mar 26, 2019 at 5:16 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Tue, Mar 26, 2019 at 5:57 AM Adrian Bunk <bunk@stusta.de> wrote:
> >
> > On Sun, Mar 24, 2019 at 09:28:14AM -0700, Khem Raj wrote:
> > > On Fri, Mar 22, 2019 at 3:23 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
> > > >
> > > > * license.html was checked: it is still GPLv2. Could not find what changed the
> > > >   checksum. Maybe it was generated with a different version of gtk-doc.
> > > > * Build tested with just gnutls in PACKAGECONFIG to test nss alternative (and
> > > >   setting no crypto won't work)
> > > > * Build tested with all entries except gnutls/qt4-x11-free (yes they still
> > > >   support it!) in PACKAGECONFIG
> > > > * By far the most time was spent on musl patch adjustment. They apply cleanly
> > > >   but musl build was not tested due to limited resources.
> > > > * Fix build for non systemd by making SYSTEMD_SERVICE conditional
> > >
> > >
> > > https://errors.yoctoproject.org/Errors/Details/234221/
> > >
> > > ../NetworkManager-1.16.0/shared/systemd/src/basic/util.h:75:18: error:
> > > unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'?
> > >...
> >
> > NM seems to now ship systemd sources for using them as a library.
> >
> > OE carries 21 (sic) patches to systemd that are
> >   Upstream-Status: Inappropriate [musl specific]
> >
> > This specific error seems to be fixed by one of them.
> >
>
> Yes, thanks for info,
>
Maybe some source of inspiration is found in void-linux [1] - they
build for musl either.

[1] https://github.com/void-linux/void-packages/tree/master/srcpkgs/NetworkManager/patches

Andreas

[PATCH 10/11] network-manager-applet: upgrade 1.8.18 -> 1.8.20

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...ager-applet_1.8.18.bb => network-manager-applet_1.8.20.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-connectivity/network-manager-applet/{network-manager-applet_1.8.18.bb => network-manager-applet_1.8.20.bb} (90%)

diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.18.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
similarity index 90%
rename from meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.18.bb
rename to meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
index 01840009e..7181f5ecf 100644
--- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.18.bb
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
@@ -12,8 +12,8 @@ inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introsp
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[archive.md5sum] = "34923579b39360db64649342ee6735d8"
-SRC_URI[archive.sha256sum] = "23dc1404f1e0622b7c4718b6d978b101d5e4d9be0b92133b3863a4dc29786178"
+SRC_URI[archive.md5sum] = "06aafa851762146034351aa72ebb23d4"
+SRC_URI[archive.sha256sum] = "050dbb155566c715239dc0378844d8beed10954e64e71014ecef8ca912df34ec"
 
 PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager"
 PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info"
-- 
2.20.1

[PATCH 11/11] physfs: Fix license checksum

[Andreas Müller]

Copyright year was changed

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb b/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb
index 8dc30bd5f..a0033fab5 100644
--- a/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb
+++ b/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb
@@ -1,7 +1,7 @@
 SUMMARY = "PhysicsFS is a library to provide abstract access to various archives"
 HOMEAPAGE = "http://icculus.org/physfs"
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2668e2fb051c3e564198e146a9a2d9f0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=96801882d1120239dcafbf888e821a6e"
 DEPENDS = "readline zlib"
 
 inherit cmake
-- 
2.20.1