diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 15:28:33 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 19:31:28 +0000 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | blackbird-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.gz blackbird-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.zip |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl')
8 files changed, 168 insertions, 84 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch new file mode 100644 index 000000000..555e5ffcb --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch @@ -0,0 +1,54 @@ +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 + +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 -- + src/settings/nm-settings-connection.h | 2 -- + 3 files changed, 5 deletions(-) + +diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c +index def56a2..dd4eb78 100644 +--- a/shared/n-acd/src/n-acd.c ++++ b/shared/n-acd/src/n-acd.c +@@ -11,7 +11,6 @@ + #include <inttypes.h> + #include <limits.h> + #include <linux/if_packet.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 1b54ec4..ed39938 100644 +--- a/src/platform/wpan/nm-wpan-utils.h ++++ b/src/platform/wpan/nm-wpan-utils.h +@@ -20,8 +20,6 @@ + #ifndef __WPAN_UTILS_H__ + #define __WPAN_UTILS_H__ + +-#include <net/ethernet.h> +- + #include "nm-dbus-interface.h" + #include "platform/nm-netlink.h" + +diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h +index e796b71..c01fef6 100644 +--- a/src/settings/nm-settings-connection.h ++++ b/src/settings/nm-settings-connection.h +@@ -22,8 +22,6 @@ + #ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__ + #define __NETWORKMANAGER_SETTINGS_CONNECTION_H__ + +-#include <net/ethernet.h> +- + #include "nm-dbus-object.h" + #include "nm-connection.h" + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch new file mode 100644 index 000000000..5c59208b4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch @@ -0,0 +1,37 @@ +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 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-core.h" + + #include <arpa/inet.h> ++#include <net/ethernet.h> + #include <linux/sockios.h> + #include <sys/ioctl.h> + +diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h +index bf3afad..4cace87 100644 +--- a/src/systemd/src/systemd/sd-lldp.h ++++ b/src/systemd/src/systemd/sd-lldp.h +@@ -18,7 +18,7 @@ + ***/ + + #include <inttypes.h> +-#include <net/ethernet.h> ++//#include <net/ethernet.h> + #include <sys/types.h> + + #include "sd-event.h" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch index 00dda5b18..8d905489f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch +++ b/meta-openembedded/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-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch index c162c1dfb..419e1be24 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch +++ b/meta-openembedded/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-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch index 9a58c0e34..45f607f2c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch +++ b/meta-openembedded/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-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch index 9e5c94336..525e35932 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch +++ b/meta-openembedded/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-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch index 6bca95e18..211a2da94 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch +++ b/meta-openembedded/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-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch index 023a4d9ad..885810185 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch +++ b/meta-openembedded/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 - |