diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb index e94c9ff8db4..885cc6eaa64 100644 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb @@ -5,7 +5,7 @@ Additionally, media player software may use Rygel to become a MediaRenderer \ that may be controlled remotely by a UPnP or DLNA Controller." HOMEPAGE = "http://live.gnome.org/Rygel" -LICENSE = "LGPL1.1+" +LICENSE = "LGPL2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstreamer1.0-plugins-base ossp-uuid libgee libsoup-2.4 libmediaart-2.0 libunistring sqlite3 intltool-native" diff --git a/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt new file mode 100644 index 00000000000..1023f6aff3d --- /dev/null +++ b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt @@ -0,0 +1,39 @@ +Checking uname sysname type: "Linux" +Checking uname version type: "# Wed May 20 10:34:39 UTC 2015" +Checking simple C program: "hello world" +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: "1" +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: NO +Checking for HAVE_IFACE_IFCONF: NO +Checking for HAVE_IFACE_IFREQ: NO +Checking for large file support without additional flags: OK +Checking for HAVE_INCOHERENT_MMAP: NO +Checking value of NSIG: "65" +Checking value of _NSIG: "65" +Checking value of SIGRTMAX: "64" +Checking value of SIGRTMIN: "34" +Checking whether the WRFILE -keytab is supported: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking whether POSIX capabilities are available: OK +Checking if can we convert from CP850 to UCS-2LE: OK +Checking if can we convert from UTF-8 to UCS-2LE: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +Checking whether we can use Linux thread-specific credentials: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: OK +Checking whether the realpath function allows a NULL argument: OK +Checking for ftruncate extend: OK +getcwd takes a NULL argument: OK +Checking for small off_t: NO +Checking whether blkcnt_t is 32 bit: NO +Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb similarity index 84% rename from meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb rename to meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb index cb3b5c22f51..885c6c0e2b6 100644 --- a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb +++ b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://dhcpcd.c;endline=26;md5=77c40d671aff804ca91ea99556da8 SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "d4f2f3ed4964197dee7767219c33a9df" -SRC_URI[sha256sum] = "5abd12c4df2947d608f60a35227f9bf8ae8ab9de06ce975cdab1144d8f229b06" +SRC_URI[md5sum] = "2465624b62c1154f0e89dc69c42c849b" +SRC_URI[sha256sum] = "6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e" inherit autotools-brokensep diff --git a/meta-networking/recipes-connectivity/miniupnpd/files/miniupnpd.service b/meta-networking/recipes-connectivity/miniupnpd/files/miniupnpd.service new file mode 100644 index 00000000000..e7bfad0a932 --- /dev/null +++ b/meta-networking/recipes-connectivity/miniupnpd/files/miniupnpd.service @@ -0,0 +1,14 @@ +[Unit] +Description=Lightweight UPnP IGD daemon +Documentation=man:miniupnpd(8) +After=network.target + +[Service] +Type=forking +ExecStartPre=/etc/miniupnpd/iptables_init.sh +ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf +ExecStopPost=/etc/miniupnpd/iptables_removeall.sh +PIDFile=/run/miniupnpd.pid + +[Install] +WantedBy=network.target diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.20180203.bb similarity index 72% rename from meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb rename to meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.20180203.bb index c6f36e1375d..04b5cd589ce 100644 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.20180203.bb @@ -5,16 +5,17 @@ the network." SECTION = "networking" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aa71c78c373ccfe0ff207af0cd966d91" +LIC_FILES_CHKSUM = "file://LICENSE;md5=91ac00c6b9f5c106e89291e196fe0234" -inherit autotools gettext pkgconfig +inherit autotools gettext pkgconfig systemd DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${P}.tar.gz;downloadfilename=${P}.tar.gz \ -" -SRC_URI[md5sum] = "1c07a215dd9b362e75a9efc05e2fb3b4" -SRC_URI[sha256sum] = "d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7" + file://miniupnpd.service" + +SRC_URI[md5sum] = "b4c7c938915edeee6ca4c65dd021f212" +SRC_URI[sha256sum] = "860c15f2f8340fd69546b01cffe4c7fcff3e63a7bdfe5a2af6b2346f0e074bb6" IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" @@ -34,4 +35,9 @@ do_install() { install -m 0644 -b ${S}/miniupnpd.conf ${D}/${sysconfdir}/${BPN} install -d ${D}/${sysconfdir}/init.d install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ } + +SYSTEMD_SERVICE_${PN} = "miniupnpd.service" diff --git a/meta-oe/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch b/meta-networking/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch similarity index 100% rename from meta-oe/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch rename to meta-networking/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch diff --git a/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch b/meta-networking/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch similarity index 100% rename from meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch rename to meta-networking/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch diff --git a/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.init b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init similarity index 100% rename from meta-oe/recipes-connectivity/mosquitto/files/mosquitto.init rename to meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init diff --git a/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.service b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.service similarity index 100% rename from meta-oe/recipes-connectivity/mosquitto/files/mosquitto.service rename to meta-networking/recipes-connectivity/mosquitto/files/mosquitto.service diff --git a/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb similarity index 100% rename from meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch index ced0c7cfffe..194e0372271 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch @@ -1,21 +1,21 @@ -From 047d3bf96b510740f64687480333c378e414995f Mon Sep 17 00:00:00 2001 +From f81abf62c0ae93628df36c27357358523be25fb8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 15:57:05 -0700 -Subject: [PATCH 1/5] adjust net/ headers for musl compatibility +Subject: [PATCH 1/7] adjust net/ headers for musl compatibility Signed-off-by: Khem Raj --- - libnm-core/nm-utils.c | 12 +++++++----- + libnm-core/nm-utils.c | 13 ++++++++----- libnm-core/nm-utils.h | 5 ++--- src/platform/wifi/wifi-utils.h | 2 +- - 3 files changed, 10 insertions(+), 9 deletions(-) + 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c -index df75d56..868224e 100644 +index ebbbfd3..77273df 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c -@@ -19,24 +19,26 @@ - * Copyright 2005 - 2014 Red Hat, Inc. +@@ -19,14 +19,9 @@ + * Copyright 2005 - 2017 Red Hat, Inc. */ -#include "nm-default.h" @@ -29,25 +29,29 @@ index df75d56..868224e 100644 #include #include #include - #include +@@ -34,12 +29,20 @@ #include + #include + #include +//#include +//#include +#include + +#include "nm-default.h" - ++ +#include "nm-utils.h" + #if WITH_JANSSON + #include "nm-json.h" #include #endif + + #include "nm-utils/nm-enum-utils.h" + #include "nm-utils/nm-hash-utils.h" #include "nm-common-macros.h" - #include "nm-utils-private.h" - #include "nm-setting-private.h" diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 407c14e..156ccae 100644 +index df9284b..02e24ea 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -27,11 +27,10 @@ @@ -65,7 +69,7 @@ index 407c14e..156ccae 100644 #include "nm-core-enum-types.h" #include "nm-setting-wireless-security.h" diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h -index 8e2b93f..84f5ce9 100644 +index 705717b..939080f 100644 --- a/src/platform/wifi/wifi-utils.h +++ b/src/platform/wifi/wifi-utils.h @@ -22,7 +22,7 @@ @@ -78,5 +82,5 @@ index 8e2b93f..84f5ce9 100644 #include "nm-dbus-interface.h" -- -2.12.1 +2.14.1 diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch deleted file mode 100644 index bd194a61d26..00000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch +++ /dev/null @@ -1,621 +0,0 @@ -From: Sjoerd Simons -Date: Sun, 21 Aug 2016 21:46:02 +0200 -Subject: [PATCH] dns/resolved: add systemd-resolved backend - -Add initial DNS backend that pushes DNS information into -systemd-resolved. Backend is choosen by default if the systems -resolv.conv is setup to pointing to one of the standard resolved -locations. - -This doesn't handle global dns configuration. - -Signed-off-by: Sjoerd Simons - -https://bugzilla.gnome.org/show_bug.cgi?id=762540 - -Upstream-Status: Backport - ---- - man/NetworkManager.conf.xml | 10 +- - src/Makefile.am | 2 + - src/dns-manager/nm-dns-manager.c | 43 ++- - src/dns-manager/nm-dns-systemd-resolved.c | 427 ++++++++++++++++++++++++++++++ - src/dns-manager/nm-dns-systemd-resolved.h | 45 ++++ - 5 files changed, 523 insertions(+), 4 deletions(-) - create mode 100644 src/dns-manager/nm-dns-systemd-resolved.c - create mode 100644 src/dns-manager/nm-dns-systemd-resolved.h - -diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml -index 6295b82..0a67ae5 100644 ---- a/man/NetworkManager.conf.xml -+++ b/man/NetworkManager.conf.xml -@@ -275,10 +275,12 @@ no-auto-default=* - - dns - Set the DNS (resolv.conf) processing mode. -- default: The default if the key is -- not specified. NetworkManager will update -+ default: NetworkManager will update - resolv.conf to reflect the nameservers -- provided by currently active connections. -+ provided by currently active connections. This is the default -+ if the key is not specified, unless the system is configured -+ to use systemd-resolved; in this case the default is -+ systemd-resolved - dnsmasq: NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update -@@ -288,6 +290,8 @@ no-auto-default=* - to unbound and dnssec-triggerd, providing a "split DNS" - configuration with DNSSEC support. The /etc/resolv.conf - will be managed by dnssec-trigger daemon. -+ systemd-resolved: NetworkManager will -+ push the DNS configuration to systemd-resolved - none: NetworkManager will not - modify resolv.conf. This implies - rc-manager unmanaged -diff --git a/src/Makefile.am b/src/Makefile.am -index 8d29b19..10f63de 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -345,6 +345,8 @@ libNetworkManager_la_SOURCES = \ - \ - dns-manager/nm-dns-dnsmasq.c \ - dns-manager/nm-dns-dnsmasq.h \ -+ dns-manager/nm-dns-systemd-resolved.c \ -+ dns-manager/nm-dns-systemd-resolved.h \ - dns-manager/nm-dns-unbound.c \ - dns-manager/nm-dns-unbound.h \ - dns-manager/nm-dns-manager.c \ -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index 5a758a9..38bc786 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -45,6 +45,7 @@ - - #include "nm-dns-plugin.h" - #include "nm-dns-dnsmasq.h" -+#include "nm-dns-systemd-resolved.h" - #include "nm-dns-unbound.h" - - #if WITH_LIBSOUP -@@ -1588,6 +1589,37 @@ _check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager) - - NM_DEFINE_SINGLETON_GETTER (NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER); - -+static gboolean -+_resolvconf_resolved_managed (void) -+{ -+ static const char *const resolved_paths[] = { -+ "/run/systemd/resolve/resolv.conf", -+ "/lib/systemd/resolv.conf", -+ "/usr/lib/systemd/resolv.conf", -+ }; -+ GFile *f; -+ GFileInfo *info; -+ gboolean ret = FALSE; -+ -+ f = g_file_new_for_path (_PATH_RESCONF); -+ info = g_file_query_info (f, -+ G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK","\ -+ G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET, -+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, -+ NULL, NULL); -+ -+ if (info && g_file_info_get_is_symlink (info)) { -+ ret = _nm_utils_strv_find_first ((gchar **) resolved_paths, -+ G_N_ELEMENTS (resolved_paths), -+ g_file_info_get_symlink_target (info)) >= 0; -+ } -+ -+ g_clear_object(&info); -+ g_clear_object(&f); -+ -+ return ret; -+} -+ - static void - init_resolv_conf_mode (NMDnsManager *self, gboolean force_reload_plugin) - { -@@ -1633,7 +1665,16 @@ again: - - rc_manager = _check_resconf_immutable (rc_manager); - -- if (nm_streq0 (mode, "dnsmasq")) { -+ if ( (!mode && _resolvconf_resolved_managed ()) -+ || nm_streq0 (mode, "systemd-resolved")) { -+ if ( force_reload_plugin -+ || !NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) { -+ _clear_plugin (self); -+ priv->plugin = nm_dns_systemd_resolved_new (); -+ plugin_changed = TRUE; -+ } -+ mode = "systemd-resolved"; -+ } else if (nm_streq0 (mode, "dnsmasq")) { - if (force_reload_plugin || !NM_IS_DNS_DNSMASQ (priv->plugin)) { - _clear_plugin (self); - priv->plugin = nm_dns_dnsmasq_new (); -diff --git a/src/dns-manager/nm-dns-systemd-resolved.c b/src/dns-manager/nm-dns-systemd-resolved.c -new file mode 100644 -index 0000000..6bdd5f6 ---- /dev/null -+++ b/src/dns-manager/nm-dns-systemd-resolved.c -@@ -0,0 +1,427 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* -+ * Copyright (C) 2010 Dan Williams -+ * Copyright (C) 2016 Sjoerd Simons -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ */ -+ -+#include "nm-default.h" -+ -+#include "nm-dns-systemd-resolved.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "nm-core-internal.h" -+#include "nm-platform.h" -+#include "nm-utils.h" -+#include "nm-ip4-config.h" -+#include "nm-ip6-config.h" -+#include "nm-bus-manager.h" -+#include "nm-manager.h" -+#include "nm-device.h" -+#include "NetworkManagerUtils.h" -+ -+G_DEFINE_TYPE (NMDnsSystemdResolved, nm_dns_systemd_resolved, NM_TYPE_DNS_PLUGIN) -+ -+#define NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE(o) \ -+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_SYSTEMD_RESOLVED, \ -+ NMDnsSystemdResolvedPrivate)) -+ -+#define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1" -+#define SYSTEMD_RESOLVED_DBUS_PATH "/org/freedesktop/resolve1" -+ -+typedef struct { -+ int ifindex; -+ GList *configs; -+} InterfaceConfig; -+ -+typedef struct { -+ GDBusProxy *resolve; -+ GCancellable *init_cancellable; -+ GCancellable *update_cancellable; -+ GQueue dns_updates; -+ GQueue domain_updates; -+} NMDnsSystemdResolvedPrivate; -+ -+/*****************************************************************************/ -+ -+#define _NMLOG_DOMAIN LOGD_DNS -+#define _NMLOG_PREFIX_NAME "systemd-resolved" -+#define _NMLOG(level, ...) \ -+ G_STMT_START { \ -+ nm_log ((level), _NMLOG_DOMAIN, \ -+ "%s[%p]: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ -+ _NMLOG_PREFIX_NAME, \ -+ (self) \ -+ _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ -+ } G_STMT_END -+ -+/*****************************************************************************/ -+ -+static void -+call_done (GObject *source, GAsyncResult *r, gpointer user_data) -+{ -+ GVariant *v; -+ GError *error = NULL; -+ NMDnsSystemdResolved *self = (NMDnsSystemdResolved *) user_data; -+ -+ v = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), r, &error); -+ -+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -+ return; -+ -+ if (error != NULL) { -+ _LOGW ("Failed: %s\n", error->message); -+ g_error_free (error); -+ } -+} -+ -+static void -+add_interface_configuration (NMDnsSystemdResolved *self, -+ GArray *interfaces, -+ const NMDnsIPConfigData *data) -+{ -+ int i; -+ InterfaceConfig *ic = NULL; -+ int ifindex; -+ NMDevice *device; -+ -+ if (NM_IS_IP4_CONFIG (data->config)) -+ ifindex = nm_ip4_config_get_ifindex (data->config); -+ else if (NM_IS_IP6_CONFIG (data->config)) -+ ifindex = nm_ip6_config_get_ifindex (data->config); -+ else -+ g_return_if_reached (); -+ -+ device = nm_manager_get_device_by_ifindex (nm_manager_get (), ifindex); -+ -+ if (!nm_device_get_managed (device, FALSE)) -+ return; -+ -+ for (i = 0; i < interfaces->len; i++) { -+ InterfaceConfig *tic = &g_array_index (interfaces, InterfaceConfig, i); -+ if (ifindex == tic->ifindex) { -+ ic = tic; -+ break; -+ } -+ } -+ -+ if (!ic) { -+ g_array_set_size (interfaces, interfaces->len + 1); -+ ic = &g_array_index (interfaces, InterfaceConfig, -+ interfaces->len - 1); -+ ic->ifindex = ifindex; -+ } -+ -+ ic->configs = g_list_append (ic->configs, data->config); -+} -+ -+static void -+add_domain (GVariantBuilder *domains, -+ const char *domain, -+ gboolean never_default) -+{ -+ /* If this link is never the default (e.g. only used for resources on this -+ * network) add a routing domain. */ -+ g_variant_builder_add (domains, "(sb)", domain, never_default); -+} -+ -+static void -+update_add_ip6_config (NMDnsSystemdResolved *self, -+ GVariantBuilder *dns, -+ GVariantBuilder *domains, -+ const NMIP6Config *config) -+{ -+ guint i, n; -+ -+ n = nm_ip6_config_get_num_nameservers (config); -+ for (i = 0 ; i < n; i++) { -+ const struct in6_addr *ip; -+ -+ g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)")); -+ g_variant_builder_add (dns, "i", AF_INET6); -+ ip = nm_ip6_config_get_nameserver (config, i), -+ -+ g_variant_builder_add_value (dns, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, ip, 16, 1)); -+ g_variant_builder_close (dns); -+ } -+ -+ n = nm_ip6_config_get_num_searches (config); -+ if (n > 0) { -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip6_config_get_search (config, i), -+ nm_ip6_config_get_never_default (config)); -+ } -+ } else { -+ n = nm_ip6_config_get_num_domains (config); -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip6_config_get_domain (config, i), -+ nm_ip6_config_get_never_default (config)); -+ } -+ } -+} -+ -+static void -+update_add_ip4_config (NMDnsSystemdResolved *self, -+ GVariantBuilder *dns, -+ GVariantBuilder *domains, -+ const NMIP4Config *config) -+{ -+ guint i, n; -+ -+ n = nm_ip4_config_get_num_nameservers (config); -+ for (i = 0 ; i < n; i++) { -+ guint32 ns; -+ -+ g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)")); -+ g_variant_builder_add (dns, "i", AF_INET); -+ ns = nm_ip4_config_get_nameserver (config, i), -+ -+ g_variant_builder_add_value (dns, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, &ns, 4, 1)); -+ g_variant_builder_close (dns); -+ } -+ -+ n = nm_ip4_config_get_num_searches (config); -+ if (n > 0) { -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip4_config_get_search (config, i), -+ nm_ip4_config_get_never_default (config)); -+ } -+ } else { -+ n = nm_ip4_config_get_num_domains (config); -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip4_config_get_domain (config, i), -+ nm_ip4_config_get_never_default (config)); -+ } -+ } -+} -+ -+static void -+free_pending_updates (NMDnsSystemdResolved *self) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ GVariant *v; -+ -+ while ((v = g_queue_pop_head (&priv->dns_updates)) != NULL) -+ g_variant_unref (v); -+ -+ while ((v = g_queue_pop_head (&priv->domain_updates)) != NULL) -+ g_variant_unref (v); -+} -+ -+static void -+prepare_one_interface (NMDnsSystemdResolved *self, InterfaceConfig *ic) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ GVariantBuilder dns, domains; -+ GList *l; -+ -+ g_variant_builder_init (&dns, G_VARIANT_TYPE ("(ia(iay))")); -+ g_variant_builder_add (&dns, "i", ic->ifindex); -+ g_variant_builder_open (&dns, G_VARIANT_TYPE ("a(iay)")); -+ -+ g_variant_builder_init (&domains, G_VARIANT_TYPE ("(ia(sb))")); -+ g_variant_builder_add (&domains, "i", ic->ifindex); -+ g_variant_builder_open (&domains, G_VARIANT_TYPE ("a(sb)")); -+ -+ for (l = ic->configs ; l != NULL ; l = g_list_next (l)) { -+ if (NM_IS_IP4_CONFIG (l->data)) -+ update_add_ip4_config (self, &dns, &domains, l->data); -+ else if (NM_IS_IP6_CONFIG (l->data)) -+ update_add_ip6_config (self, &dns, &domains, l->data); -+ else -+ g_assert_not_reached (); -+ } -+ g_variant_builder_close (&dns); -+ g_variant_builder_close (&domains); -+ -+ g_queue_push_tail (&priv->dns_updates, -+ g_variant_ref_sink (g_variant_builder_end (&dns))); -+ g_queue_push_tail (&priv->domain_updates, -+ g_variant_ref_sink (g_variant_builder_end (&domains))); -+} -+ -+static void -+send_updates (NMDnsSystemdResolved *self) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ GVariant *v; -+ -+ nm_clear_g_cancellable (&priv->update_cancellable); -+ -+ if (!priv->resolve) -+ return; -+ -+ priv->update_cancellable = g_cancellable_new (); -+ -+ while ((v = g_queue_pop_head (&priv->dns_updates)) != NULL) { -+ g_dbus_proxy_call (priv->resolve, "SetLinkDNS", v, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, priv->update_cancellable, call_done, self); -+ g_variant_unref (v); -+ } -+ -+ while ((v = g_queue_pop_head (&priv->domain_updates)) != NULL) { -+ g_dbus_proxy_call (priv->resolve, "SetLinkDomains", v, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, priv->update_cancellable, call_done, self); -+ g_variant_unref (v); -+ } -+} -+ -+static gboolean -+update (NMDnsPlugin *plugin, -+ const NMDnsIPConfigData **configs, -+ const NMGlobalDnsConfig *global_config, -+ const char *hostname) -+{ -+ NMDnsSystemdResolved *self = NM_DNS_SYSTEMD_RESOLVED (plugin); -+ GArray *interfaces = g_array_new (TRUE, TRUE, sizeof (InterfaceConfig)); -+ const NMDnsIPConfigData **c; -+ int i; -+ -+ for (c = configs; *c != NULL; c++) -+ add_interface_configuration (self, interfaces, *c); -+ -+ free_pending_updates (self); -+ -+ for (i = 0; i < interfaces->len; i++) { -+ InterfaceConfig *ic = &g_array_index (interfaces, InterfaceConfig, i); -+ -+ prepare_one_interface (self, ic); -+ g_list_free (ic->configs); -+ } -+ -+ g_array_free (interfaces, TRUE); -+ -+ send_updates (self); -+ -+ return TRUE; -+} -+ -+/****************************************************************/ -+ -+static gboolean -+is_caching (NMDnsPlugin *plugin) -+{ -+ return TRUE; -+} -+ -+static const char * -+get_name (NMDnsPlugin *plugin) -+{ -+ return "systemd-resolved"; -+} -+ -+/****************************************************************/ -+ -+NMDnsPlugin * -+nm_dns_systemd_resolved_new (void) -+{ -+ return g_object_new (NM_TYPE_DNS_SYSTEMD_RESOLVED, NULL); -+} -+ -+static void -+resolved_proxy_created (GObject *source, GAsyncResult *r, gpointer user_data) -+{ -+ NMDnsSystemdResolved *self = (NMDnsSystemdResolved *) user_data; -+ NMDnsSystemdResolvedPrivate *priv; -+ gs_free_error GError *error = NULL; -+ GDBusProxy *resolve; -+ -+ resolve = g_dbus_proxy_new_finish (r, &error); -+ if ( !resolve -+ && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -+ return; -+ -+ priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ g_clear_object (&priv->init_cancellable); -+ if (!resolve) { -+ _LOGW ("failed to connect to resolved via DBus: %s", error->message); -+ g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED); -+ return; -+ } -+ -+ priv->resolve = resolve; -+ send_updates (self); -+} -+ -+ -+static void -+nm_dns_systemd_resolved_init (NMDnsSystemdResolved *self) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ NMBusManager *dbus_mgr; -+ GDBusConnection *connection; -+ -+ g_queue_init (&priv->dns_updates); -+ g_queue_init (&priv->domain_updates); -+ -+ dbus_mgr = nm_bus_manager_get (); -+ g_return_if_fail (dbus_mgr); -+ -+ connection = nm_bus_manager_get_connection (dbus_mgr); -+ g_return_if_fail (connection); -+ -+ priv->init_cancellable = g_cancellable_new (); -+ g_dbus_proxy_new (connection, -+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | -+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, -+ NULL, -+ SYSTEMD_RESOLVED_DBUS_SERVICE, -+ SYSTEMD_RESOLVED_DBUS_PATH, -+ SYSTEMD_RESOLVED_DBUS_SERVICE ".Manager", -+ priv->init_cancellable, -+ resolved_proxy_created, -+ self); -+} -+ -+static void -+dispose (GObject *object) -+{ -+ NMDnsSystemdResolved *self = NM_DNS_SYSTEMD_RESOLVED (object); -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ -+ free_pending_updates (self); -+ g_clear_object (&priv->resolve); -+ nm_clear_g_cancellable (&priv->init_cancellable); -+ nm_clear_g_cancellable (&priv->update_cancellable); -+ -+ G_OBJECT_CLASS (nm_dns_systemd_resolved_parent_class)->dispose (object); -+} -+ -+static void -+nm_dns_systemd_resolved_class_init (NMDnsSystemdResolvedClass *dns_class) -+{ -+ NMDnsPluginClass *plugin_class = NM_DNS_PLUGIN_CLASS (dns_class); -+ GObjectClass *object_class = G_OBJECT_CLASS (dns_class); -+ -+ g_type_class_add_private (dns_class, sizeof (NMDnsSystemdResolvedPrivate)); -+ -+ object_class->dispose = dispose; -+ -+ plugin_class->is_caching = is_caching; -+ plugin_class->update = update; -+ plugin_class->get_name = get_name; -+} -+ -diff --git a/src/dns-manager/nm-dns-systemd-resolved.h b/src/dns-manager/nm-dns-systemd-resolved.h -new file mode 100644 -index 0000000..45c64b3 ---- /dev/null -+++ b/src/dns-manager/nm-dns-systemd-resolved.h -@@ -0,0 +1,45 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * Copyright (C) 2016 Sjoerd Simons -+ */ -+ -+#ifndef __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ -+#define __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ -+ -+#include "nm-dns-plugin.h" -+ -+#define NM_TYPE_DNS_SYSTEMD_RESOLVED (nm_dns_systemd_resolved_get_type ()) -+#define NM_DNS_SYSTEMD_RESOLVED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolved)) -+#define NM_DNS_SYSTEMD_RESOLVED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolvedClass)) -+#define NM_IS_DNS_SYSTEMD_RESOLVED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED)) -+#define NM_IS_DNS_SYSTEMD_RESOLVED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_SYSTEMD_RESOLVED)) -+#define NM_DNS_SYSTEMD_RESOLVED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolvedClass)) -+ -+typedef struct { -+ NMDnsPlugin parent; -+} NMDnsSystemdResolved; -+ -+typedef struct { -+ NMDnsPluginClass parent; -+} NMDnsSystemdResolvedClass; -+ -+GType nm_dns_systemd_resolved_get_type (void); -+ -+NMDnsPlugin *nm_dns_systemd_resolved_new (void); -+ -+#endif /* __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ */ -+ diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch deleted file mode 100644 index ca7e4a496fc..00000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6f799f1f0e68cc7bf89c0a56aec5ecf46937619d Mon Sep 17 00:00:00 2001 -From: Ricardo Salveti -Date: Thu, 15 Jun 2017 10:02:38 -0300 -Subject: [PATCH] dns/resolved: also check for /etc/resolv-conf.systemd - -OE specific resolv.conf path, so it can be enabled by default if available. - -Upstream-Status: Inappropriate [OE config specific] - -Signed-off-by: Ricardo Salveti ---- - src/dns-manager/nm-dns-manager.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index c1d2bf7..d70d4b4 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -1596,6 +1596,7 @@ _resolvconf_resolved_managed (void) - "/run/systemd/resolve/resolv.conf", - "/lib/systemd/resolv.conf", - "/usr/lib/systemd/resolv.conf", -+ "/etc/resolv-conf.systemd", - }; - GFile *f; - GFileInfo *info; --- -2.7.4 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch deleted file mode 100644 index 5c9ed92b80b..00000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7dd40db6606c3b3559365a03944cb99aee5ceabc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 4 Apr 2013 12:57:58 +0200 -Subject: [PATCH] don't try to run /sbin/dhclient to get the version number, - this break cross-compiling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [build system specific] - -Signed-off-by: Andreas Müller ---- - configure.ac | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cc66e9b..7163287 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -488,12 +488,6 @@ AS_IF([test -z "$with_dhcpcd"], with_dhcpcd=yes) - # Search and check the executables - if test "$with_dhclient" = "yes"; then - AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin) -- if test "$with_dhclient" != "no"; then -- if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then -- AC_MSG_WARN([Cannot use dhclient, version 4.x is required]) -- with_dhclient=no -- fi -- fi - fi - if test "$with_dhcpcd" = "yes"; then - AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin) --- -1.7.6.5 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch deleted file mode 100644 index 4234e2be2d4..00000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a9bfe6f2029d75caf28fcdf3e740843cf6359615 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 07:31:25 -0700 -Subject: [PATCH 1/2] systemd: xlocale.h is dropped by newer glibc - -Signed-off-by: Khem Raj ---- - src/systemd/src/basic/parse-util.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c -index 9c21e5a..dd95d1f 100644 ---- a/src/systemd/src/basic/parse-util.c -+++ b/src/systemd/src/basic/parse-util.c -@@ -25,11 +25,7 @@ - #include - #include - #include --#ifdef __GLIBC__ --#include --#else - #include --#endif - #include "alloc-util.h" - #include "extract-word.h" - #include "macro.h" --- -2.13.2 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch deleted file mode 100644 index aa57c832cb3..00000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 7274bbadd398a69b8babf47431f80d35e0228c42 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer -Date: Mon, 18 Jan 2016 08:53:26 +0100 -Subject: [PATCH] Fix nm-version-macro includes - -nm-version-macros.h cannot be found since include directive has -been changed from " to <. This breaks for example gnome-panel -build: -/usr/include/NetworkManager/NetworkManager.h:31:31: -fatal error: nm-version-macros.h: No such file or directory. ---- - libnm-core/nm-version.h | 2 +- - libnm-util/NetworkManager.h | 2 +- - libnm-util/nm-version.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h -index 730330a..d751bc1 100644 ---- a/libnm-core/nm-version.h -+++ b/libnm-core/nm-version.h -@@ -23,7 +23,7 @@ - - #include - --#include -+#include "nm-version-macros.h" - - /* Deprecation / Availability macros */ - -diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h -index d83e4ab..3a964fc 100644 ---- a/libnm-util/NetworkManager.h -+++ b/libnm-util/NetworkManager.h -@@ -28,7 +28,7 @@ - - /* This header must not include glib or libnm. */ - --#include -+#include "nm-version-macros.h" - - /* - * dbus services details -diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h -index 63895dd..41101a4 100644 ---- a/libnm-util/nm-version.h -+++ b/libnm-util/nm-version.h -@@ -23,7 +23,7 @@ - - #include - --#include -+#include "nm-version-macros.h" - - /* Deprecation / Availability macros */ - --- -2.5.0 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch index 22bc6e8bda9..cdcd397d73b 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch @@ -1,7 +1,7 @@ -From 98d7e3ae5b15e30af1bf5dd1d279e1a774bf2b86 Mon Sep 17 00:00:00 2001 +From 7f0e0613abe8aa1861946e2cc25397690da7128b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 16:05:05 -0700 -Subject: [PATCH 2/5] socket-util.h: Include linux/sockios.h on musl +Subject: [PATCH 2/7] socket-util.h: Include linux/sockios.h on musl Signed-off-by: Khem Raj --- @@ -9,11 +9,11 @@ Signed-off-by: Khem Raj 1 file changed, 6 insertions(+) diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h -index 2536b08..76d6107 100644 +index d7e2d85..2e7f7b6 100644 --- a/src/systemd/src/basic/socket-util.h +++ b/src/systemd/src/basic/socket-util.h -@@ -29,6 +29,12 @@ - #include +@@ -30,6 +30,12 @@ + #include #include +#if !defined(__GLIBC__) @@ -23,8 +23,8 @@ index 2536b08..76d6107 100644 +#endif + #include "macro.h" + #include "missing.h" #include "util.h" - -- -2.12.1 +2.14.1 diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch deleted file mode 100644 index e32b5c00ddf..00000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch +++ /dev/null @@ -1,67 +0,0 @@ -From adc0668b854289a11cfc29597b5566ba1869d17e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 07:32:09 -0700 -Subject: [PATCH 2/2] user format string in g_dbus_message_new_method_error () - -This fixes format errors with -Werror=format-security - -Signed-off-by: Khem Raj ---- - src/nm-manager.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/nm-manager.c b/src/nm-manager.c -index c3d65cd..e814912 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -4871,6 +4871,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (error || (result != NM_AUTH_CALL_RESULT_YES)) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Not authorized to perform this operation")); - if (error) - error_message = error->message; -@@ -4882,6 +4883,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (!object) { - reply = g_dbus_message_new_method_error (pfd->message, - "org.freedesktop.DBus.Error.UnknownObject", -+ "%s", - (error_message = "Object doesn't exist.")); - goto done; - } -@@ -4890,6 +4892,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (!nm_exported_object_get_interface_by_type (object, pfd->interface_type)) { - reply = g_dbus_message_new_method_error (pfd->message, - "org.freedesktop.DBus.Error.InvalidArgs", -+ "%s", - (error_message = "Object is of unexpected type.")); - goto done; - } -@@ -4905,6 +4908,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (global_dns && !nm_global_dns_config_is_internal (global_dns)) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Global DNS configuration already set via configuration file")); - goto done; - } -@@ -4949,6 +4953,7 @@ do_set_property_check (gpointer user_data) - if (!pfd->subject) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Could not determine request UID.")); - goto out; - } -@@ -4958,6 +4963,7 @@ do_set_property_check (gpointer user_data) - if (!chain) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Could not authenticate request.")); - goto out; - } --- -2.13.2 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch index 236914f756e..549e46e0e9e 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch @@ -1,7 +1,7 @@ -From 16c3dc7a407101243d2056d2c93e61dce1a05350 Mon Sep 17 00:00:00 2001 +From d0951fe7da63d8296a305781d7322ce4d3249415 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 16:08:45 -0700 -Subject: [PATCH 3/5] Define ETH_ALEN +Subject: [PATCH 3/7] Define ETH_ALEN Signed-off-by: Khem Raj --- @@ -10,7 +10,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+) diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 156ccae..68e222b 100644 +index 02e24ea..5ff279c 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -29,6 +29,7 @@ @@ -22,7 +22,7 @@ index 156ccae..68e222b 100644 #include diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h -index 84f5ce9..33a838d 100644 +index 939080f..2274408 100644 --- a/src/platform/wifi/wifi-utils.h +++ b/src/platform/wifi/wifi-utils.h @@ -24,6 +24,8 @@ @@ -35,5 +35,5 @@ index 84f5ce9..33a838d 100644 typedef struct WifiData WifiData; -- -2.12.1 +2.14.1 diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch index 27c9ae96242..b56f6a37d87 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch @@ -1,22 +1,22 @@ -From 2153109e60e362e0d09215d529bf00176f31a3e7 Mon Sep 17 00:00:00 2001 +From c9e0f112a90b6b1ade87a698608dca8d6fbe89cc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 16:09:41 -0700 -Subject: [PATCH 4/5] Define missing features to cater for musl +Subject: [PATCH 4/7] Define missing features to cater for musl Signed-off-by: Khem Raj --- src/systemd/sd-adapt/nm-sd-adapt.h | 2 +- - src/systemd/src/basic/parse-util.c | 5 ++++- + src/systemd/src/basic/parse-util.c | 4 ++++ src/systemd/src/basic/stdio-util.h | 2 ++ src/systemd/src/basic/util.h | 5 +++++ src/systemd/src/systemd/sd-event.h | 4 ---- - 5 files changed, 12 insertions(+), 6 deletions(-) + 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h -index cf27c1a..72c1b89 100644 +index 0d291e2..d88dd9b 100644 --- a/src/systemd/sd-adapt/nm-sd-adapt.h +++ b/src/systemd/sd-adapt/nm-sd-adapt.h -@@ -119,7 +119,7 @@ G_STMT_START { \ +@@ -134,7 +134,7 @@ G_STMT_START { \ # ifdef HAVE___SECURE_GETENV # define secure_getenv __secure_getenv # else @@ -26,22 +26,21 @@ index cf27c1a..72c1b89 100644 #endif diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c -index 2738663..9c21e5a 100644 +index 6d978e9..e74e84b 100644 --- a/src/systemd/src/basic/parse-util.c +++ b/src/systemd/src/basic/parse-util.c -@@ -25,8 +25,11 @@ - #include - #include - #include +@@ -21,7 +21,11 @@ + + #include + #include +#ifdef __GLIBC__ - #include -- ++#include +#else -+#include + #include +#endif - #include "alloc-util.h" - #include "extract-word.h" - #include "macro.h" + #include + #include + #include diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h index bd1144b..c92e935 100644 --- a/src/systemd/src/basic/stdio-util.h @@ -57,7 +56,7 @@ index bd1144b..c92e935 100644 #include #include diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h -index bb2fc31..fe074a5 100644 +index b31dfd1..9b7032c 100644 --- a/src/systemd/src/basic/util.h +++ b/src/systemd/src/basic/util.h @@ -46,6 +46,11 @@ @@ -73,14 +72,14 @@ index bb2fc31..fe074a5 100644 #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h -index cc26b7d..c7e0004 100644 +index f8cb895..c7e0004 100644 --- a/src/systemd/src/systemd/sd-event.h +++ b/src/systemd/src/systemd/sd-event.h @@ -69,11 +69,7 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata); typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata); typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata); typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata); --#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED +-#if defined _GNU_SOURCE || _POSIX_C_SOURCE >= 199309L typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata); -#else -typedef void* sd_event_child_handler_t; @@ -89,5 +88,5 @@ index cc26b7d..c7e0004 100644 int sd_event_default(sd_event **e); -- -2.12.1 +2.14.1 diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch index f4a04c782cb..7194423192c 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch @@ -1,18 +1,31 @@ -From 9e9e5814456ec23b9fc669d342bf9d8f7ee49fc2 Mon Sep 17 00:00:00 2001 +From 18f71c1b48730b8602826517f2b5b088283ae948 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 16:48:00 -0700 -Subject: [PATCH 5/5] sd-lldp.h: Remove net/ethernet.h seems to be over +Subject: [PATCH 5/7] sd-lldp.h: Remove net/ethernet.h seems to be over specified Signed-off-by: Khem Raj --- - src/systemd/src/systemd/sd-lldp.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/systemd/src/libsystemd-network/sd-lldp.c | 1 + + src/systemd/src/systemd/sd-lldp.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h -=================================================================== ---- NetworkManager-1.4.2.orig/src/systemd/src/systemd/sd-lldp.h -+++ NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h +diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/systemd/src/libsystemd-network/sd-lldp.c +index 31e2448..7721cc2 100644 +--- a/src/systemd/src/libsystemd-network/sd-lldp.c ++++ b/src/systemd/src/libsystemd-network/sd-lldp.c +@@ -21,6 +21,7 @@ + #include "nm-sd-adapt.h" + + #include ++#include + #include + + #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 +--- a/src/systemd/src/systemd/sd-lldp.h ++++ b/src/systemd/src/systemd/sd-lldp.h @@ -22,7 +22,7 @@ ***/ @@ -22,15 +35,6 @@ Index: NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h #include #include "sd-event.h" -Index: NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c -=================================================================== ---- NetworkManager-1.4.2.orig/src/systemd/src/libsystemd-network/sd-lldp.c -+++ NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c -@@ -21,6 +21,7 @@ - #include "nm-sd-adapt.h" - - #include -+#include - - #include "sd-lldp.h" - +-- +2.14.1 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch similarity index 77% rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch index 26f380bf98c..6adb84baa83 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch @@ -1,7 +1,7 @@ -From 05e8bd664d0244cb8ab4376b962830b97860f6bf Mon Sep 17 00:00:00 2001 +From f24d958fc85f9a43ac13abc85f74c4ae233dc8a4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 18:37:19 -0700 -Subject: [PATCH] check for strndupa before using it +Subject: [PATCH 6/7] check for strndupa before using it musl does not have strndupa @@ -13,10 +13,10 @@ Signed-off-by: Khem Raj 3 files changed, 17 insertions(+) diff --git a/config.h.in b/config.h.in -index db8c135..c4229ed 100644 +index edec211..0799030 100644 --- a/config.h.in +++ b/config.h.in -@@ -41,6 +41,10 @@ +@@ -34,6 +34,10 @@ */ #undef HAVE_DCGETTEXT @@ -24,14 +24,14 @@ index db8c135..c4229ed 100644 + don't. */ +#undef HAVE_DECL_STRNDUPA + - /* Define to 1 if you have the header file. */ - #undef HAVE_DLFCN_H - + /* Define to 1 if you have the declaration of `explicit_bzero', and to 0 if + you don't. */ + #undef HAVE_DECL_EXPLICIT_BZERO diff --git a/configure.ac b/configure.ac -index 2630f8d..d0a57fd 100644 +index 8a066ad..51e5eb6 100644 --- a/configure.ac +++ b/configure.ac -@@ -54,6 +54,7 @@ AC_SUBST(NM_VERSION) +@@ -56,6 +56,7 @@ AC_SUBST(NM_VERSION) GIT_SHA_RECORD(NM_GIT_SHA) @@ -40,7 +40,7 @@ index 2630f8d..d0a57fd 100644 dnl Checks for typedefs, structures, and compiler characteristics. dnl diff --git a/src/systemd/src/basic/alloc-util.h b/src/systemd/src/basic/alloc-util.h -index ceeee51..924b59c 100644 +index 0a89691..1e95260 100644 --- a/src/systemd/src/basic/alloc-util.h +++ b/src/systemd/src/basic/alloc-util.h @@ -25,6 +25,18 @@ @@ -63,5 +63,5 @@ index ceeee51..924b59c 100644 #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n))) -- -2.12.1 +2.14.1 diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch new file mode 100644 index 00000000000..28848d3543c --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch @@ -0,0 +1,25 @@ +From 583f0448fb7e9aba2b410c06eec6f420b41a6a0c Mon Sep 17 00:00:00 2001 +From: Pablo Saavedra +Date: Tue, 13 Mar 2018 17:36:20 +0100 +Subject: [PATCH 7/7] Fixed configure.ac: Fix pkgconfig sysroot locations + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 51e5eb6..c9d3e56 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -669,7 +669,7 @@ else + AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) + + AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) +- JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson` ++ JANSSON_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable=libdir jansson` + 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_1.4.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb similarity index 81% rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb index d5f456f37b7..6538e7b8231 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.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=8eb8e72bab097b9d11763002cb003697 \ + file://docs/api/html/license.html;md5=77b9e362690c149da196aefe7712db30 \ " DEPENDS = " \ @@ -20,6 +20,7 @@ DEPENDS = " \ libnewt \ polkit \ jansson \ + curl \ " inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection @@ -27,21 +28,15 @@ inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introsp GI_DATA_ENABLED_libc-musl = "False" SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ - file://0002-Fix-nm-version-macro-includes.patch \ file://0001-adjust-net-headers-for-musl-compatibility.patch \ file://0002-socket-util.h-Include-linux-sockios.h-on-musl.patch \ file://0003-Define-ETH_ALEN.patch \ - file://0004-Define-missing-features-to-cater-for-musl.patch \ file://0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ - file://0001-check-for-strndupa-before-using-it.patch \ - file://0001-dns-resolved-add-systemd-resolved-backend.patch \ - file://0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch \ - file://0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch \ - file://0002-user-format-string-in-g_dbus_message_new_method_erro.patch \ + file://0006-check-for-strndupa-before-using-it.patch \ + file://0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ " -SRC_URI[md5sum] = "63f1e0d6d7e9099499d062c84c927a75" -SRC_URI[sha256sum] = "829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309" +SRC_URI[md5sum] = "de3c7147a693da6f80eb22f126086a14" +SRC_URI[sha256sum] = "6af0b1e856a3725f88791f55c4fbb04105dc0b20dbf182aaec8aad16481fac76" S = "${WORKDIR}/NetworkManager-${PV}" @@ -49,6 +44,7 @@ EXTRA_OECONF = " \ --disable-ifcfg-rh \ --disable-ifnet \ --disable-ifcfg-suse \ + --disable-introspection \ --disable-more-warnings \ --with-iptables=${sbindir}/iptables \ --with-tests \ @@ -73,7 +69,6 @@ PACKAGECONFIG[systemd] = " \ PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" # consolekit is not picked by shlibs, so add it to RDEPENDS too PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4" PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" # Use full featured dhcp client instead of internal one @@ -101,6 +96,8 @@ FILES_${PN} += " \ ${libexecdir} \ ${libdir}/pppd/*/nm-pppd-plugin.so \ ${libdir}/NetworkManager/*.so \ + ${libdir}/NetworkManager/VPN \ + ${libdir}/NetworkManager/conf.d \ ${datadir}/polkit-1 \ ${datadir}/dbus-1 \ ${base_libdir}/udev/* \ diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch similarity index 73% rename from meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch rename to meta-networking/recipes-connectivity/samba/samba/samba-pam.patch index 6b9ade920e5..0cbacb6c0e1 100644 --- a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch +++ b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch @@ -4,12 +4,11 @@ http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch Signed-off-by: Khem Raj - -Index: samba-4.4.5/source3/wscript +Index: samba-4.7.0/source3/wscript =================================================================== ---- samba-4.4.5.orig/source3/wscript -+++ samba-4.4.5/source3/wscript -@@ -873,7 +873,7 @@ msg.msg_accrightslen = sizeof(fd); +--- samba-4.7.0.orig/source3/wscript ++++ samba-4.7.0/source3/wscript +@@ -875,7 +875,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -18,10 +17,10 @@ Index: samba-4.4.5/source3/wscript use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -945,6 +945,15 @@ int i; i = PAM_RADIO_TYPE; - if use_pam: - conf.DEFINE('WITH_PAM', 1) - conf.DEFINE('WITH_PAM_MODULES', 1) +@@ -952,6 +952,17 @@ int i; i = PAM_RADIO_TYPE; + "or headers not found. Use --without-pam to disable " + "PAM support."); + + else: + Logs.warn("PAM disabled") + use_pam=False @@ -31,6 +30,8 @@ Index: samba-4.4.5/source3/wscript + conf.undefine('PAM_RHOST') + conf.undefine('PAM_TTY') + conf.undefine('HAVE_PAM_PAM_APPL_H') - ++ ++ seteuid = False + # diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb similarity index 97% rename from meta-networking/recipes-connectivity/samba/samba_4.7.0.bb rename to meta-networking/recipes-connectivity/samba/samba_4.7.6.bb index 27918d2a0e7..a8517c541ea 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb @@ -26,15 +26,12 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ " SRC_URI_append_libc-musl = " \ - file://samba-4.2.7-pam.patch \ + file://samba-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ " -SRC_URI[md5sum] = "cf5eaf34f510e3d5643c0dcfd49fcc40" -SRC_URI[sha256sum] = "bd16d169988eb513e685a87e9964a5210482498fa9b3a22aaa8287a061e3c936" - -#SRC_URI[md5sum] = "c6ee5c766016d59908c8fb672fbbd445" -#SRC_URI[sha256sum] = "9ef24393de08390f236cabccd6a420b5cea304e959cbf1a99ff317325db3ddfa" +SRC_URI[md5sum] = "0253021a45c479cec1e135b004a0177a" +SRC_URI[sha256sum] = "1eede30fc8ef6504e24602fb72b00baa0a7b73b59f16d25cb0771dc8c7c57d6e" inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch deleted file mode 100644 index 2fd5c08a1cb..00000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch +++ /dev/null @@ -1,135 +0,0 @@ -From eb516ac5f9dddc80564f6becee08a0011e7aa58b Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 10:36:11 -0800 -Subject: [PATCH 1/7] Check for root peer user for iscsiuio IPC - -This fixes a possible vulnerability where a non-root -process could connect with iscsiuio. Fouund by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/Makefile.am | 3 ++- - iscsiuio/src/unix/iscsid_ipc.c | 47 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 49 insertions(+), 1 deletion(-) - -diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am -index 71d5463..a989ef0 100644 ---- a/iscsiuio/src/unix/Makefile.am -+++ b/iscsiuio/src/unix/Makefile.am -@@ -20,7 +20,8 @@ iscsiuio_SOURCES = build_date.c \ - nic_utils.c \ - packet.c \ - iscsid_ipc.c \ -- ping.c -+ ping.c \ -+ ${top_srcdir}/../utils/sysdeps/sysdeps.c - - iscsiuio_CFLAGS = $(AM_CFLAGS) \ - $(LIBNL_CFLAGS) \ -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index a2a59a8..08e49e5 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -37,6 +37,8 @@ - * - */ - -+#define _GNU_SOURCE -+ - #include - #include - #include -@@ -47,6 +49,8 @@ - #include - #include - #include -+#include -+#include - - #define PFX "iscsi_ipc " - -@@ -61,6 +65,7 @@ - #include "iscsid_ipc.h" - #include "uip.h" - #include "uip_mgmt_ipc.h" -+#include "sysdeps.h" - - #include "logger.h" - #include "uip.h" -@@ -102,6 +107,7 @@ struct iface_rec_decode { - uint16_t mtu; - }; - -+#define PEERUSER_MAX 64 - - /****************************************************************************** - * iscsid_ipc Constants -@@ -1029,6 +1035,40 @@ static void iscsid_loop_close(void *arg) - LOG_INFO(PFX "iSCSI daemon socket closed"); - } - -+/* -+ * check that the peer user is privilidged -+ * -+ * return 1 if peer is ok else 0 -+ * -+ * XXX: this function is copied from iscsid_ipc.c and should be -+ * moved into a common library -+ */ -+static int -+mgmt_peeruser(int sock, char *user) -+{ -+ struct ucred peercred; -+ socklen_t so_len = sizeof(peercred); -+ struct passwd *pass; -+ -+ errno = 0; -+ if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &peercred, -+ &so_len) != 0 || so_len != sizeof(peercred)) { -+ /* We didn't get a valid credentials struct. */ -+ LOG_ERR(PFX "peeruser_unux: error receiving credentials: %m"); -+ return 0; -+ } -+ -+ pass = getpwuid(peercred.uid); -+ if (pass == NULL) { -+ LOG_ERR(PFX "peeruser_unix: unknown local user with uid %d", -+ (int) peercred.uid); -+ return 0; -+ } -+ -+ strlcpy(user, pass->pw_name, PEERUSER_MAX); -+ return 1; -+} -+ - /** - * iscsid_loop() - This is the function which will process the broadcast - * messages from iscsid -@@ -1038,6 +1078,7 @@ static void *iscsid_loop(void *arg) - { - int rc; - sigset_t set; -+ char user[PEERUSER_MAX]; - - pthread_cleanup_push(iscsid_loop_close, arg); - -@@ -1077,6 +1118,12 @@ static void *iscsid_loop(void *arg) - continue; - } - -+ if (!mgmt_peeruser(iscsid_opts.fd, user) || strncmp(user, "root", PEERUSER_MAX)) { -+ close(s2); -+ LOG_ERR(PFX "Access error: non-administrative connection rejected"); -+ break; -+ } -+ - process_iscsid_broadcast(s2); - close(s2); - } --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch new file mode 100644 index 00000000000..f5e1bec8ad3 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch @@ -0,0 +1,25 @@ +From cfee58d5863a535b61aa54690ae205b876f57944 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 22:53:29 -0800 +Subject: [PATCH 1/2] libopeniscsiusr: Include limit.h for PATH_MAX + +Signed-off-by: Khem Raj +--- + libopeniscsiusr/iface.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c +index 79898df..a48ef36 100644 +--- a/libopeniscsiusr/iface.c ++++ b/libopeniscsiusr/iface.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include "libopeniscsiusr/libopeniscsiusr.h" + #include "misc.h" +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch new file mode 100644 index 00000000000..174aa50d2b1 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch @@ -0,0 +1,25 @@ +From 197713ad7e3e944102bbd792e1ab9ec4a67100c0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 23:25:21 -0800 +Subject: [PATCH 1/4] qedi.c: Removed unused linux/ethtool.h + +Signed-off-by: Khem Raj +--- + iscsiuio/src/unix/libs/qedi.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c +index b81fecd..24cb89a 100644 +--- a/iscsiuio/src/unix/libs/qedi.c ++++ b/iscsiuio/src/unix/libs/qedi.c +@@ -49,7 +49,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch new file mode 100644 index 00000000000..aecede6eef9 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch @@ -0,0 +1,25 @@ +From 2b39f85dcf020647544002cb0b0e734748391dfb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 23:27:25 -0800 +Subject: [PATCH 2/4] idbm.c: Include fcnl.h for O_RDWR and O_CREAT definitions + +Signed-off-by: Khem Raj +--- + usr/idbm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/usr/idbm.c b/usr/idbm.c +index 5532202..0a51b85 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch deleted file mode 100644 index 1f5202ec027..00000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 035bb16845537351e1bccb16d38981754fd53129 Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 10:37:56 -0800 -Subject: [PATCH 2/7] iscsiuio should ignore bogus iscsid broadcast packets - -When iscsiuio is receiving broadcast packets from iscsid, -if the 'payload_len', carried in the packet, is too -large then ignore the packet and print a message. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 08e49e5..dfdae63 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -950,6 +950,12 @@ int process_iscsid_broadcast(int s2) - - cmd = data->header.command; - payload_len = data->header.payload_len; -+ if (payload_len > sizeof(data->u)) { -+ LOG_ERR(PFX "Data payload length too large (%d). Corrupt payload?", -+ payload_len); -+ rc = -EINVAL; -+ goto error; -+ } - - LOG_DEBUG(PFX "recv iscsid request: cmd: %d, payload_len: %d", - cmd, payload_len); --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch new file mode 100644 index 00000000000..836ed604877 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch @@ -0,0 +1,29 @@ +From 29571f71692e28ce9a17d1450097a98492f3b465 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 22:54:04 -0800 +Subject: [PATCH 2/2] libopeniscsiusr: Add CFLAGS to linker cmdline + +This will ensure that -fPIC is passed to linker as +well + +Signed-off-by: Khem Raj +--- + libopeniscsiusr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index 8b9b523..4f1d0d6 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -49,7 +49,7 @@ LIBADD = + all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc + + $(LIBS): $(OBJS) +- $(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) + ln -sf $@ $(DEVLIB) + + $(LIBS_MAJOR): $(LIBS) +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch deleted file mode 100644 index 825083b7416..00000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 81d3106cf8f09c79fe20ad7d234d7e1dda27bddb Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 11:11:17 -0800 -Subject: [PATCH 3/7] Ensure all fields in iscsiuio IPC response are set - -Make sure all fields in the response strcuture are set, -or info from the stack can be leaked to our caller. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index dfdae63..61e96cc 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -960,6 +960,8 @@ int process_iscsid_broadcast(int s2) - LOG_DEBUG(PFX "recv iscsid request: cmd: %d, payload_len: %d", - cmd, payload_len); - -+ memset(&rsp, 0, sizeof(rsp)); -+ - switch (cmd) { - case ISCSID_UIP_IPC_GET_IFACE: - size = fread(&data->u.iface_rec, payload_len, 1, fd); --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch new file mode 100644 index 00000000000..0ce155f7a2d --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch @@ -0,0 +1,49 @@ +From 9b7a32903b56ce4d41f264a345ca59a0b00d53b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 23:28:33 -0800 +Subject: [PATCH 3/4] bnx2x.c: Reorder the includes to avoid duplicate defines + with musl + +including nic.h before linux/ethtool.h avoids redefinitions of +eth structs + +/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0.876-r0/recipe-sysroot/ +usr/include/netinet/if_ether.h:104:8: error: redefinition of 'struct ethhdr' + struct ethhdr { + ^~~~~~ +In file included from /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0. +876-r0/recipe-sysroot/usr/include/linux/ethtool.h:19:0, + from qedi.c:52: +/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0.876-r0/recipe-sysroot/ +usr/include/linux/if_ether.h:154:8: note: originally defined here + struct ethhdr { + ^~~~~~ + +Signed-off-by: Khem Raj +--- + iscsiuio/src/unix/libs/bnx2x.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iscsiuio/src/unix/libs/bnx2x.c b/iscsiuio/src/unix/libs/bnx2x.c +index 3df6d5f..62530d1 100644 +--- a/iscsiuio/src/unix/libs/bnx2x.c ++++ b/iscsiuio/src/unix/libs/bnx2x.c +@@ -36,6 +36,7 @@ + * bnx2x.c - bnx2x user space driver + * + */ ++#include "nic.h" + #include + #include + #include +@@ -58,7 +59,6 @@ + #include "bnx2x.h" + #include "cnic.h" + #include "logger.h" +-#include "nic.h" + #include "nic_id.h" + #include "nic_utils.h" + #include "options.h" +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch deleted file mode 100644 index 274722c231f..00000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8167e5ce99682f64918a20966ce393cd33ac67ef Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 11:13:29 -0800 -Subject: [PATCH 4/7] Do not double-close IPC file stream to iscsid - -A double-close of a file descriptor and its associated FILE stream -can be an issue in multi-threaded cases. Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 61e96cc..bde8d66 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -913,6 +913,9 @@ early_exit: - /** - * process_iscsid_broadcast() - This function is used to process the - * broadcast messages from iscsid -+ * -+ * s2 is an open file descriptor, which -+ * must not be left open upon return - */ - int process_iscsid_broadcast(int s2) - { -@@ -928,6 +931,7 @@ int process_iscsid_broadcast(int s2) - if (fd == NULL) { - LOG_ERR(PFX "Couldn't open file descriptor: %d(%s)", - errno, strerror(errno)); -+ close(s2); - return -EIO; - } - -@@ -1030,7 +1034,8 @@ int process_iscsid_broadcast(int s2) - } - - error: -- free(data); -+ if (data) -+ free(data); - fclose(fd); - - return rc; -@@ -1132,8 +1137,8 @@ static void *iscsid_loop(void *arg) - break; - } - -+ /* this closes the file descriptor s2 */ - process_iscsid_broadcast(s2); -- close(s2); - } - - pthread_cleanup_pop(0); --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch new file mode 100644 index 00000000000..57bdc8cb60a --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch @@ -0,0 +1,28 @@ +From 6f9c1a04d250388d1574cfaf20a1ff66a64beb48 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 23:42:12 -0800 +Subject: [PATCH 4/4] fwparam_ppc.c: Do not use __compar_fn_t + +__compar_fn_t is not defined in musl + +Signed-off-by: Khem Raj +--- + utils/fwparam_ibft/fwparam_ppc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/fwparam_ibft/fwparam_ppc.c b/utils/fwparam_ibft/fwparam_ppc.c +index c298b8c..391faa2 100644 +--- a/utils/fwparam_ibft/fwparam_ppc.c ++++ b/utils/fwparam_ibft/fwparam_ppc.c +@@ -356,7 +356,7 @@ static int loop_devs(const char *devtree) + * Sort the nics into "natural" order. The proc fs + * device-tree has them in somewhat random, or reversed order. + */ +- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp); ++ qsort(niclist, nic_count, sizeof(char *), nic_cmp); + + snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases"); + dev_count = 0; +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch deleted file mode 100644 index b73b01120e0..00000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch +++ /dev/null @@ -1,78 +0,0 @@ -From c9fc86a50459776d9a7abb609f6503c57d69e034 Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 11:15:26 -0800 -Subject: [PATCH 5/7] Ensure strings from peer are copied correctly. - -The method of using strlen() and strcpy()/strncpy() has -a couple of holes. Do not try to measure the length of -strings supplied from peer, and ensure copied strings are -NULL-terminated. Use the new strlcpy() instead. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 24 ++++++------------------ - 1 file changed, 6 insertions(+), 18 deletions(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index bde8d66..52ae8c6 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -152,10 +152,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird) - struct in_addr ia; - struct in6_addr ia6; - -- if (strlen(in_ipaddr_str) > NI_MAXHOST) -- strncpy(ipaddr_str, in_ipaddr_str, NI_MAXHOST); -- else -- strcpy(ipaddr_str, in_ipaddr_str); -+ strlcpy(ipaddr_str, in_ipaddr_str, NI_MAXHOST); - - /* Find the CIDR if any */ - tmp = strchr(ipaddr_str, '/'); -@@ -287,22 +284,16 @@ static int decode_iface(struct iface_rec_decode *ird, struct iface_rec *rec) - - /* For LL on, ignore the IPv6 addr in the iface */ - if (ird->linklocal_autocfg == IPV6_LL_AUTOCFG_OFF) { -- if (strlen(rec->ipv6_linklocal) > NI_MAXHOST) -- strncpy(ipaddr_str, rec->ipv6_linklocal, -- NI_MAXHOST); -- else -- strcpy(ipaddr_str, rec->ipv6_linklocal); -+ strlcpy(ipaddr_str, rec->ipv6_linklocal, -+ NI_MAXHOST); - inet_pton(AF_INET6, ipaddr_str, - &ird->ipv6_linklocal); - } - - /* For RTR on, ignore the IPv6 addr in the iface */ - if (ird->router_autocfg == IPV6_RTR_AUTOCFG_OFF) { -- if (strlen(rec->ipv6_router) > NI_MAXHOST) -- strncpy(ipaddr_str, rec->ipv6_router, -- NI_MAXHOST); -- else -- strcpy(ipaddr_str, rec->ipv6_router); -+ strlcpy(ipaddr_str, rec->ipv6_router, -+ NI_MAXHOST); - inet_pton(AF_INET6, ipaddr_str, - &ird->ipv6_router); - } -@@ -316,10 +307,7 @@ static int decode_iface(struct iface_rec_decode *ird, struct iface_rec *rec) - calculate_default_netmask( - ird->ipv4_addr.s_addr); - -- if (strlen(rec->gateway) > NI_MAXHOST) -- strncpy(ipaddr_str, rec->gateway, NI_MAXHOST); -- else -- strcpy(ipaddr_str, rec->gateway); -+ strlcpy(ipaddr_str, rec->gateway, NI_MAXHOST); - inet_pton(AF_INET, ipaddr_str, &ird->ipv4_gateway); - } - } else { --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch deleted file mode 100644 index 0fa24cd10d5..00000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a6efed7601c890ac051ad1425582ec67dbd3f5ff Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 11:18:35 -0800 -Subject: [PATCH 6/7] Skip useless strcopy, and validate CIDR length - -Remove a useless strcpy() that copies a string onto itself, -and ensure the CIDR length "keepbits" is not negative. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 52ae8c6..85742da 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -148,7 +148,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird) - char *tmp, *tok; - char ipaddr_str[NI_MAXHOST]; - char str[INET6_ADDRSTRLEN]; -- int keepbits = 0; -+ unsigned long keepbits = 0; - struct in_addr ia; - struct in6_addr ia6; - -@@ -161,8 +161,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird) - tmp = ipaddr_str; - tok = strsep(&tmp, "/"); - LOG_INFO(PFX "in cidr: bitmask '%s' ip '%s'", tmp, tok); -- keepbits = atoi(tmp); -- strcpy(ipaddr_str, tok); -+ keepbits = strtoull(tmp, NULL, 10); - } - - /* Determine if the IP address passed from the iface file is --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch deleted file mode 100644 index c63c0a8d56b..00000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5df60ad8b22194391af34c1a7e54776b0372ffed Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 11:21:15 -0800 -Subject: [PATCH 7/7] Check iscsiuio ping data length for validity - -We do not trust that the received ping packet data length -is correct, so sanity check it. Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 5 +++++ - iscsiuio/src/unix/packet.c | 2 +- - iscsiuio/src/unix/packet.h | 2 ++ - 3 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 85742da..a2caacc 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -333,6 +333,11 @@ static void *perform_ping(void *arg) - - data = (iscsid_uip_broadcast_t *)png_c->data; - datalen = data->u.ping_rec.datalen; -+ if ((datalen > STD_MTU_SIZE) || (datalen < 0)) { -+ LOG_ERR(PFX "Ping datalen invalid: %d", datalen); -+ rc = -EINVAL; -+ goto ping_done; -+ } - - memset(dst_addr, 0, sizeof(uip_ip6addr_t)); - if (nic_iface->protocol == AF_INET) { -diff --git a/iscsiuio/src/unix/packet.c b/iscsiuio/src/unix/packet.c -index ecea09b..3ce2c6b 100644 ---- a/iscsiuio/src/unix/packet.c -+++ b/iscsiuio/src/unix/packet.c -@@ -112,7 +112,7 @@ int alloc_free_queue(nic_t *nic, size_t num_of_packets) - for (i = 0; i < num_of_packets; i++) { - packet_t *pkt; - -- pkt = alloc_packet(1500, 1500); -+ pkt = alloc_packet(STD_MTU_SIZE, STD_MTU_SIZE); - if (pkt == NULL) { - goto done; - } -diff --git a/iscsiuio/src/unix/packet.h b/iscsiuio/src/unix/packet.h -index b63d688..19d1db9 100644 ---- a/iscsiuio/src/unix/packet.h -+++ b/iscsiuio/src/unix/packet.h -@@ -43,6 +43,8 @@ - - #include "nic.h" - -+#define STD_MTU_SIZE 1500 -+ - struct nic; - struct nic_interface; - --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch deleted file mode 100644 index 2c466119cdf..00000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4ebab8add4a549c16ab8b124137546c0a7b46a9b Mon Sep 17 00:00:00 2001 -From: Joe MacDonald -Date: Tue, 15 Nov 2016 11:11:30 -0500 -Subject: [PATCH] Do not clean kernel source - -The default behaviour should not be to attempt to clean the kernel source -tree when building userspace. When not cross-compiling, however, this action is -harmless, but when attempting to build within the sysroot and since this package -is purely userspace, the clean step will fail. - -Removing the clean step eliminates an unnecessary dependency on the kernel build -infrastructure. - -Upstream-status: Inappropriate (embedded specific) - -Signed-off-by: Joe MacDonald ---- - Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index c8cd00e..9576bba 100644 ---- a/Makefile -+++ b/Makefile -@@ -37,7 +37,7 @@ endif - - all: user - --user: iscsiuio/Makefile -+user: - $(MAKE) -C utils/sysdeps - $(MAKE) -C utils/fwparam_ibft - $(MAKE) -C usr -@@ -75,7 +75,6 @@ clean: - $(MAKE) -C utils/fwparam_ibft clean - $(MAKE) -C utils clean - $(MAKE) -C usr clean -- $(MAKE) -C kernel clean - [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio clean - [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio distclean - --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch deleted file mode 100644 index 37d695f49d6..00000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 79bea58a554205dd185509fbc4e76b5fc40f9038 Mon Sep 17 00:00:00 2001 -From: Joe MacDonald -Date: Tue, 15 Nov 2016 12:36:45 -0500 -Subject: [PATCH] fw_context: add include for NI_MAXHOST definiton - -This appears to build successfully with gcc 4.x but fails on gcc 5+, though it's -not immediately clear why NI_MAXHOST isn't being defined from the include -chain. Currently engaging with the upstream devs to determine the best course -of action, but this is an adequate workaround. - -Upstream-status: Pending - -Signed-off-by: Joe MacDonald ---- - include/fw_context.h | 4 + - 1 file changed, 1 insertion(+) - -diff --git a/include/fw_context.h b/include/fw_context.h -index 44053d8..0b05cea 100644 ---- a/include/fw_context.h -+++ b/include/fw_context.h -@@ -21,6 +21,10 @@ - #ifndef FWPARAM_CONTEXT_H_ - #define FWPARAM_CONTEXT_H_ - -+#include -+#ifndef NI_MAXHOST -+#define NI_MAXHOST 1025 -+#endif - #include - #include - --- -2.1.4 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb similarity index 78% rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb index 6c4a867b528..823227c46c7 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb @@ -11,26 +11,22 @@ DEPENDS = "openssl flex-native bison-native open-isns util-linux" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRCREV ?= "8db9717e73d32d2c5131da4f9ad86dfd9065f74b" +SRCREV ?= "24580adc4c174bbc5dde3ae7594a46d57635e906" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ - file://iscsi-initiator-utils-Do-not-clean-kernel-source.patch \ - file://iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \ file://iscsi-initiator.service \ file://iscsi-initiator-targets.service \ file://set_initiatorname \ - file://0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch \ - file://0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch \ - file://0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch \ - file://0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch \ - file://0005-Ensure-strings-from-peer-are-copied-correctly.patch \ - file://0006-Skip-useless-strcopy-and-validate-CIDR-length.patch \ - file://0007-Check-iscsiuio-ping-data-length-for-validity.patch \ + file://0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch \ + file://0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch \ + file://0001-qedi.c-Removed-unused-linux-ethtool.h.patch \ + file://0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch \ + file://0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch \ + file://0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch \ " - S = "${WORKDIR}/git" B = "${WORKDIR}/build" @@ -39,25 +35,15 @@ inherit update-rc.d systemd autotools EXTRA_OECONF = " \ --target=${TARGET_SYS} \ --host=${BUILD_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ " EXTRA_OEMAKE = ' \ - CC="${CC}" \ - AR="${AR}" \ - RANLIB="${RANLIB}" \ - CFLAGS="${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE -I. -I../include -I../../include -I../usr -I../../usr" \ - LDFLAGS="${LDFLAGS}" \ - LD="${LD}" \ OS="${TARGET_SYS}" \ TARGET="${TARGET_OS}" \ BASE="${prefix}" \ MANDIR="${mandir}" \ ' -TARGET_CC_ARCH += "${LDFLAGS}" - do_configure () { cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} } @@ -81,12 +67,14 @@ do_install () { ${D}${localstatedir}/lib/iscsi/isns \ ${D}${localstatedir}/lib/iscsi/slp \ ${D}${localstatedir}/lib/iscsi/ifaces \ - ${D}/${mandir}/man8 + ${D}${libdir} \ + ${D}${mandir}/man8 install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ ${S}/utils/iscsi-iname \ ${S}/usr/iscsistart ${D}/${sbindir} + cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_1.3.5.bb b/meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb similarity index 92% rename from meta-networking/recipes-daemons/keepalived/keepalived_1.3.5.bb rename to meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb index 5e7e6e49f54..36417b72a38 100644 --- a/meta-networking/recipes-daemons/keepalived/keepalived_1.3.5.bb +++ b/meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb @@ -11,9 +11,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz" - -SRC_URI[md5sum] = "9964d295ec9d34ed3408b57d28847b68" -SRC_URI[sha256sum] = "c0114d86ea4c896557beb0d9367819a423ffba772bc5d7c548dc455e6b3bd048" +SRC_URI[md5sum] = "610af6e04071f02d3469191de7499f4e" +SRC_URI[sha256sum] = "4e2d7cc01a6ee29a3955f5c622d47704ba7d9dd758189f15e9def016a2d1faa3" DEPENDS = "libnfnetlink openssl" diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch index 512e246c56c..effe25c85c2 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch @@ -11,10 +11,10 @@ Signed-off-by: Khem Raj 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 -diff --git a/Makefile.am b/Makefile.am -index d63fbbb..1012a2c 100644 ---- a/Makefile.am -+++ b/Makefile.am +Index: opensaf-5.18.02/Makefile.am +=================================================================== +--- opensaf-5.18.02.orig/Makefile.am ++++ opensaf-5.18.02/Makefile.am @@ -52,10 +52,10 @@ AM_CPPFLAGS = \ -pthread \ -D_GNU_SOURCE -DINTERNAL_VERSION_ID='"@INTERNAL_VERSION_ID@"' \ @@ -26,14 +26,14 @@ index d63fbbb..1012a2c 100644 -AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror +AM_CFLAGS = -pipe -std=gnu11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@ +AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@ - AM_LDFLAGS = @OSAF_HARDEN_FLAGS@ -Wl,--as-needed -ldl -lrt -pthread -rdynamic - ACLOCAL_AMFLAGS = -I m4 - OSAF_LIB_FLAGS = -diff --git a/configure.ac b/configure.ac -index 02771c6..b76b0fe 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -557,6 +557,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then + + if ENABLE_GCOV + AM_CFLAGS += --coverage +Index: opensaf-5.18.02/configure.ac +=================================================================== +--- opensaf-5.18.02.orig/configure.ac ++++ opensaf-5.18.02/configure.ac +@@ -593,6 +593,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then fi AC_SUBST(OSAF_HARDEN_FLAGS) @@ -42,11 +42,10 @@ index 02771c6..b76b0fe 100644 ############################################# # List the output Makefiles ############################################# -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 -new file mode 100644 -index 0000000..dcabb92 +Index: opensaf-5.18.02/m4/ax_check_compile_flag.m4 +=================================================================== --- /dev/null -+++ b/m4/ax_check_compile_flag.m4 ++++ opensaf-5.18.02/m4/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html @@ -122,6 +121,3 @@ index 0000000..dcabb92 + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS --- -2.12.2 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.17.07.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb similarity index 95% rename from meta-networking/recipes-daemons/opensaf/opensaf_5.17.07.bb rename to meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb index 74483d77861..4b556ce8cc9 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.17.07.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb @@ -25,8 +25,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ " -SRC_URI[md5sum] = "125bcd9aabd7412aedcbfbf73f4e6196" -SRC_URI[sha256sum] = "3fb2239bb2c9328c8b45368ff8d8de979ea286a27edc9871d218200e88bb91cc" +SRC_URI[md5sum] = "42064f5ddbc7f560bfc5ff93ea9eecc7" +SRC_URI[sha256sum] = "f9e24897f9cfd63bb3115f6275c706de1702d3d9bae2fc423227db72b23c37f0" inherit autotools useradd systemd pkgconfig diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index fa5eef9f55e..a8e7540333c 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -217,6 +217,7 @@ do_install_append_class-native() { do_install_append_class-target() { # Remove references to buildmachine paths in target makedefs.out sed -i 's:-fdebug-prefix-map[^ ]*::g; s:--sysroot=${STAGING_DIR_TARGET}::g' ${D}/etc/postfix/makedefs.out + sed -i 's:-I${STAGING_DIR_TARGET}:-I:g' ${D}/etc/postfix/makedefs.out } ALTERNATIVE_${PN} = "sendmail" @@ -239,15 +240,20 @@ pkg_postinst_${PN} () { touch /etc/postfix/virtual_alias postmap /etc/postfix/virtual_alias else - touch $D/etc/aliases - newaliases -C $D/etc/postfix/main.cf -oA$D/etc/aliases - touch $D/etc/postfix/virtual_alias - postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias - if ${@'true' if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False) else 'false'}; then # /usr/lib/sendmail is required by LSB core test [ ! -L $D/usr/lib/sendmail ] && ln -sf ${sbindir}/sendmail $D/usr/lib/ fi + + touch $D/etc/aliases + # This can fail depending on host setup + if ! newaliases -C $D/etc/postfix/main.cf -oA$D/etc/aliases; then + $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} + exit 0 + fi + touch $D/etc/postfix/virtual_alias + postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias + fi } diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch similarity index 100% rename from meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch rename to meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch similarity index 100% rename from meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch rename to meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch diff --git a/meta-oe/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch b/meta-networking/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch similarity index 100% rename from meta-oe/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch rename to meta-networking/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb similarity index 100% rename from meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb rename to meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index d5e7341a012..b9dce69ba87 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -29,9 +29,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://0007-extensions-Use-stdint-types.patch \ file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ - file://0010-Adjust-header-include-sequence.patch \ " +SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch" + SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d" @@ -42,10 +43,10 @@ inherit update-rc.d systemd python __anonymous () { import re - karch = d.getVar('KARCH') + karch = d.getVar('TARGET_ARCH') multilib = d.getVar('MLPREFIX') - if multilib and karch == 'powerpc64': + if multilib and ( karch == 'powerpc64' or karch == 'arm' ): searchstr = "lib.?32" reg = re.compile(searchstr) if reg.search(multilib): diff --git a/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb b/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb index 92cd24c3ae2..c556eb48e81 100644 --- a/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb +++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb @@ -7,7 +7,9 @@ Accounting needs." HOMEPAGE = "http://www.freediameter.net" -DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools" +DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools virtual/kernel" + +PACKAGE_ARCH = "${MACHINE_ARCH}" fd_pkgname = "freeDiameter" @@ -121,8 +123,8 @@ FILES_${PN} += "${libdir}/${fd_pkgname}/*" RDEPENDS_${PN} = "glib-2.0 gnutls libidn" RDEPENDS_${PN} += "openssl openssl-conf openssl-engines" -RDEPENDS_${PN} += "kernel-module-tipc kernel-module-sctp" -RDEPENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip" +RRECOMMENDS_${PN} += "kernel-module-tipc kernel-module-sctp" +RRECOMMENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip" RDEPENDS_${PN}-ptest = "cmake" INITSCRIPT_PACKAGES = "${PN}" diff --git a/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch b/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch new file mode 100644 index 00000000000..863866d18e5 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch @@ -0,0 +1,42 @@ +From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 21:54:11 -0800 +Subject: [PATCH] nss_mdns: Do not include nss.h when libc != glibc + +Provide nss_status macro instead for non-glibc case +where nss.h is absent + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + mDNSPosix/nss_mdns.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c +index afadb3c..c469584 100755 +--- a/mDNSPosix/nss_mdns.c ++++ b/mDNSPosix/nss_mdns.c +@@ -378,8 +378,19 @@ init_config (); + + #define ENTNAME hostent + #define DATABASE "hosts" +- ++#ifdef __GLIBC__ + #include ++#else ++enum nss_status ++{ ++ NSS_STATUS_TRYAGAIN = -2, ++ NSS_STATUS_UNAVAIL, ++ NSS_STATUS_NOTFOUND, ++ NSS_STATUS_SUCCESS, ++ NSS_STATUS_RETURN ++}; ++#define NETDB_INTERNAL NULL ++#endif + // For nss_status + #include + // For hostent +-- +2.16.1 + diff --git a/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb b/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb index 1a80f7acb64..9a7152fcf09 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb @@ -9,6 +9,7 @@ RPROVIDES_${PN} += "libdns_sd.so" SRC_URI = "http://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ file://build.patch;patchdir=.. \ file://mdns.service \ + file://0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch;patchdir=.. \ " SRC_URI[md5sum] = "4a6bc1628851002634ea3833a4dca317" diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch new file mode 100644 index 00000000000..4597df80a88 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch @@ -0,0 +1,44 @@ +This fixes a compile issue introduced with linux kernel 4.15 + +include/linux/in.h:222:8: error: redefinition of 'struct in_pktinfo' +| struct in_pktinfo { + + +Upstream-Status: Pending +Signed-off-by: Armin Kuster + +Index: openl2tp-1.8/plugins/ppp_unix.c +=================================================================== +--- openl2tp-1.8.orig/plugins/ppp_unix.c ++++ openl2tp-1.8/plugins/ppp_unix.c +@@ -25,9 +25,14 @@ + #include + #include + #include ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + #include + #include + #include ++#endif ++ + #include + #include + #include +@@ -41,12 +46,12 @@ + #define __user + #endif + #include +-#include +-#include + #include + #include ++#include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + #include +- ++#endif + #include "usl.h" + #include "l2tp_private.h" + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index bf6850b17cf..1f6b4ded32b 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -33,6 +33,7 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://openl2tpd.service \ file://openl2tpd-enable-tests.patch \ file://run-ptest \ + file://fix_linux_4.15_compile.patch \ " SRC_URI_append_libc-musl = "\ diff --git a/meta-networking/recipes-protocols/quagga/quagga_1.2.2.bb b/meta-networking/recipes-protocols/quagga/quagga_1.2.2.bb deleted file mode 100644 index 653f46b3630..00000000000 --- a/meta-networking/recipes-protocols/quagga/quagga_1.2.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require quagga.inc - -SRC_URI[md5sum] = "e84be2938c26c0c872792090f1a6a866" -SRC_URI[sha256sum] = "522e22f2beee64e3f0c2cde3d0155f3b8103f4f6fc8abef92cb40bc3a4cc2931" diff --git a/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb b/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb new file mode 100644 index 00000000000..a7697a1ae93 --- /dev/null +++ b/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb @@ -0,0 +1,4 @@ +require quagga.inc + +SRC_URI[md5sum] = "eced21b054d71c9e1b7c6ac43286a166" +SRC_URI[sha256sum] = "e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3" diff --git a/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb b/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb index 49b11ad3358..0fd5f6fed54 100644 --- a/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb +++ b/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb @@ -17,6 +17,9 @@ EXTRA_OECONF = " --with-iptables=/usr/sbin/iptables \ " do_configure () { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/config + aclocal libtoolize --automake --copy --force autoconf diff --git a/meta-networking/recipes-support/geoip/geoip_1.6.9.bb b/meta-networking/recipes-support/geoip/geoip_1.6.11.bb similarity index 98% rename from meta-networking/recipes-support/geoip/geoip_1.6.9.bb rename to meta-networking/recipes-support/geoip/geoip_1.6.11.bb index 9e8e0714f82..3527d0cba79 100644 --- a/meta-networking/recipes-support/geoip/geoip_1.6.9.bb +++ b/meta-networking/recipes-support/geoip/geoip_1.6.11.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/maxmind/geoip-api-c.git \ http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz;apply=no;name=GeoLiteCityv6-dat \ file://run-ptest \ " -SRCREV = "4f487bf95532e0bba7783d591faff178ab0aa462" +SRCREV = "3169a8a88808c8df862e0b0355f99c738cce9f7e" SRC_URI[GeoIP-dat.md5sum] = "37c84ead332dda0362a5ac7b049b72d4" SRC_URI[GeoIP-dat.sha256sum] = "79ff1099e96c2dc1c2539c9a18aaa13a9afd085cae477df60d95f1644d42bc07" diff --git a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf b/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf similarity index 100% rename from meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf rename to meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf diff --git a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron b/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron similarity index 100% rename from meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron rename to meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron diff --git a/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb b/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb similarity index 76% rename from meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb rename to meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb index 3e045bb27dc..f4eb2b799da 100644 --- a/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb +++ b/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb @@ -6,17 +6,17 @@ SECTION = "net" DEPENDS = "zlib curl" -SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.4.0/geoipupdate-2.4.0.tar.gz \ +SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.5.0/geoipupdate-2.5.0.tar.gz \ file://GeoIP.conf \ file://geoipupdate.cron \ " -SRC_URI[md5sum] = "02f9712fb80e8e979d3d54cda7f7704f" -SRC_URI[sha256sum] = "8b4e88ce8d84e9c75bc681704d19ec5c63c54f01e945f7669f97fb0df7e13952" +SRC_URI[md5sum] = "28f633c49ec87ab01ad3c0fb0228a696" +SRC_URI[sha256sum] = "5119fd0e338cd083e886228b26679c64bcbaade8a815be092aecf865a610ab26" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "\ -file://ChangeLog.md;md5=334337b6ecbb65093bae66b3ae21c8c2 \ +file://ChangeLog.md;md5=11d2e31df0de2be3ccc3e2286c4dafcb \ " FILES_${PN} = "/usr/share/GeoIP \ /etc/GeoIP.conf \ diff --git a/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch b/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch new file mode 100644 index 00000000000..38d306475ee --- /dev/null +++ b/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch @@ -0,0 +1,31 @@ +From fd80c0599083013a1b583feba5d7473f52b35938 Mon Sep 17 00:00:00 2001 +From: Mariia Movchan +Date: Tue, 6 Mar 2018 16:03:39 +0200 +Subject: [PATCH] Makefile: pass extra linker flags + +Fixes +ERROR: QA Issue: No GNU_HASH in the elf binary + +Upstream-Status: Pending + +Signed-off-by: Mariia Movchan +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8beff8f..047f02a 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,7 @@ LIBS?= + VERSION=0.2.2 + CC?=gcc + CFLAGS?=-O2 -g -Wall +-LDFLAGS=$(LIBS) ++LDFLAGS+=$(LIBS) + + ifeq ($(USE_GEOIP),yes) + ifeq ($(USE_DYN_GEOIP),yes) +-- +2.15.1 + diff --git a/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb b/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb new file mode 100644 index 00000000000..3e278db6887 --- /dev/null +++ b/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb @@ -0,0 +1,22 @@ +SUMMARY = "Tool to assist in network address calculations for IPv4 and IPv6." +HOMEPAGE = "https://github.com/nmav/ipcalc" + +SECTION = "net" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "\ + https://github.com/nmav/ipcalc/archive/${PV}.tar.gz;downloadfilename=ipcalc-${PV}.tar.gz \ + file://0001-Makefile-pass-extra-linker-flags.patch \ +" + +SRC_URI[md5sum] = "343db932a3ad407328920b7430965faf" +SRC_URI[sha256sum] = "bf1b95eca219e564c85fa4233fe65342963cf3e8a303a7e10b4dd7269c864794" + +export USE_GEOIP = "no" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/ipcalc ${D}/${bindir} +} diff --git a/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch similarity index 83% rename from meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch rename to meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch index 93bd4578e1a..ffe253b63ce 100644 --- a/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch @@ -1,7 +1,7 @@ -From 49dde22e798fd7f39fd59250036c0ae1fe2b9152 Mon Sep 17 00:00:00 2001 +From a4da3ab4d76013aaa731d43d52ccca1ebd37c395 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 21 Sep 2016 10:06:39 +0800 -Subject: [PATCH] ldb: Add configure options for packages +Subject: [PATCH 1/1] ldb: Add configure options for packages Add configure options for the following packages: - acl @@ -16,9 +16,9 @@ Upstream-Status: Inappropriate [oe deterministic build specific] Signed-off-by: Jackie Huang --- lib/replace/system/wscript_configure | 6 ++- - lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- + lib/replace/wscript | 94 +++++++++++++++++++++++++++--------- wscript | 7 +++ - 3 files changed, 80 insertions(+), 18 deletions(-) + 3 files changed, 83 insertions(+), 24 deletions(-) diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure index 2035474..10f9ae7 100644 @@ -37,7 +37,7 @@ index 2035474..10f9ae7 100644 # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index 145300d..8218fa5 100644 +index 2f94d49..68b2d3a 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -23,6 +23,41 @@ def set_options(opt): @@ -124,18 +124,23 @@ index 145300d..8218fa5 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): +@@ -266,22 +316,20 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') +- strlcpy_in_bsd = False +- - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') - - if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') @@ -148,17 +153,28 @@ index 145300d..8218fa5 100644 + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; +@@ -632,7 +680,7 @@ removeea setea + # look for a method of finding the list of network interfaces + for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: + bsd_for_strlcpy = '' +- if strlcpy_in_bsd: ++ if Options.options.enable_libbsd: + bsd_for_strlcpy = ' bsd' + if conf.CHECK_CODE(''' + #define %s 1 diff --git a/wscript b/wscript -index 2af8571..059408b 100755 +index 8ae5be3..a178cc4 100644 --- a/wscript +++ b/wscript -@@ -29,6 +29,13 @@ def set_options(opt): +@@ -31,6 +31,13 @@ def set_options(opt): opt.RECURSE('lib/replace') opt.tool_options('python') # options for disabling pyc or pyo compilation @@ -173,5 +189,5 @@ index 2af8571..059408b 100755 conf.RECURSE('lib/tdb') conf.RECURSE('lib/tevent') -- -2.8.3 +2.16.2 diff --git a/meta-networking/recipes-support/libldb/libldb_1.2.2.bb b/meta-networking/recipes-support/libldb/libldb_1.3.1.bb similarity index 91% rename from meta-networking/recipes-support/libldb/libldb_1.2.2.bb rename to meta-networking/recipes-support/libldb/libldb_1.3.1.bb index cb9ea92838e..7e14cde35f9 100644 --- a/meta-networking/recipes-support/libldb/libldb_1.2.2.bb +++ b/meta-networking/recipes-support/libldb/libldb_1.3.1.bb @@ -8,7 +8,7 @@ RDEPENDS_pyldb += "python" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://do-not-import-target-module-while-cross-compile.patch \ - file://ldb-Add-configure-options-for-packages.patch \ + file://options-1.3.1.patch \ " PACKAGECONFIG ??= "\ @@ -29,8 +29,8 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "91284a12423def99a6592e393e3b7fbb" -SRC_URI[sha256sum] = "0cedeadb75de401c9735127f654dbc1a391c4327a2b83be54078be286fed1113" +SRC_URI[md5sum] = "e5233f202bca27f6ce8474fb8ae65983" +SRC_URI[sha256sum] = "b19f2c9f55ae0f46aa5ebaea0bf1a47ec1ac135e1d78af0f6318cf50bf62cbd2" inherit waf-samba diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch b/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch index 35f8eaf7da9..63f21e77573 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch @@ -25,10 +25,10 @@ Signed-off-by: Joe Slater wscript | 7 ++- 3 files changed, 79 insertions(+), 19 deletions(-) -diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure -index 2035474..10f9ae7 100644 ---- a/lib/replace/system/wscript_configure -+++ b/lib/replace/system/wscript_configure +Index: talloc-2.1.11/lib/replace/system/wscript_configure +=================================================================== +--- talloc-2.1.11.orig/lib/replace/system/wscript_configure ++++ talloc-2.1.11/lib/replace/system/wscript_configure @@ -1,6 +1,10 @@ #!/usr/bin/env python @@ -41,10 +41,10 @@ index 2035474..10f9ae7 100644 conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') # solaris varients of getXXent_r -diff --git a/lib/replace/wscript b/lib/replace/wscript -index fc43e1a..12d2a70 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript +Index: talloc-2.1.11/lib/replace/wscript +=================================================================== +--- talloc-2.1.11.orig/lib/replace/wscript ++++ talloc-2.1.11/lib/replace/wscript @@ -23,6 +23,41 @@ def set_options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -129,38 +129,45 @@ index fc43e1a..12d2a70 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): - +@@ -267,21 +317,21 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') + strlcpy_in_bsd = False +- - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ if Options.options.enable_libbsd: ++ # libbsd on some platforms provides strlcpy and strlcat ++ if not conf.CHECK_FUNCS('strlcpy strlcat'): ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', + checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -- -- if not conf.CHECK_FUNCS('closefrom'): -- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') -+ if Options.options.enable_libbsd: -+ # libbsd on some platforms provides strlcpy and strlcat -+ if not conf.CHECK_FUNCS('strlcpy strlcat'): -+ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -+ checklibc=True) +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') ++ strlcpy_in_bsd = True + if not conf.CHECK_FUNCS('getpeereid'): + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -+ ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; ---- a/wscript -+++ b/wscript +Index: talloc-2.1.11/wscript +=================================================================== +--- talloc-2.1.11.orig/wscript ++++ talloc-2.1.11/wscript @@ -32,7 +32,12 @@ def set_options(opt): opt.add_option('--enable-talloc-compat1', help=("Build talloc 1.x.x compat library [False]"), @@ -172,9 +179,6 @@ index fc43e1a..12d2a70 100644 + opt.add_option('--without-valgrind', + help=("disable use of valgrind"), + action="store_false", dest='enable_valgrind', default=False) - + def configure(conf): conf.RECURSE('lib/replace') --- -2.8.3 - diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb similarity index 93% rename from meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb rename to meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb index 23dca15fd87..848cf4d99b8 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb +++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb @@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6 SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ file://options-2.1.10.patch \ " - -SRC_URI[md5sum] = "48b8822a76797bb143e3e38ed738c320" -SRC_URI[sha256sum] = "c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619" +SRC_URI[md5sum] = "452596f904ca2b10322bdaabf147a721" +SRC_URI[sha256sum] = "639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3" inherit waf-samba diff --git a/meta-networking/recipes-support/libtevent/libtevent/options-0.9.33.patch b/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch similarity index 81% rename from meta-networking/recipes-support/libtevent/libtevent/options-0.9.33.patch rename to meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch index 84b1a36881c..363c5867cc5 100644 --- a/meta-networking/recipes-support/libtevent/libtevent/options-0.9.33.patch +++ b/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch @@ -1,7 +1,7 @@ -From c00f6d35bdc06dffb54daa815e57b44210a5de04 Mon Sep 17 00:00:00 2001 +From c3e2e4f89cf37b27609fd02ad67eb02d0015cc1e Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 21 Sep 2016 09:57:49 +0800 -Subject: [PATCH] tevent: Add configure options for packages +Subject: [PATCH 1/1] tevent: Add configure options for packages Add configure options for the following packages: - acl @@ -19,30 +19,12 @@ Modified to apply to version 0.9.33. Signed-off-by: Joe Slater --- - lib/replace/system/wscript_configure | 6 ++- - lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- - wscript | 7 ++- - 3 files changed, 79 insertions(+), 19 deletions(-) - mode change 100755 => 100644 wscript + lib/replace/wscript | 89 ++++++++++++++++++++++++++++++++++++++++------------- + wscript | 7 ++++- + 2 files changed, 73 insertions(+), 23 deletions(-) -diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure -index 2035474..10f9ae7 100644 ---- a/lib/replace/system/wscript_configure -+++ b/lib/replace/system/wscript_configure -@@ -1,6 +1,10 @@ - #!/usr/bin/env python - --conf.CHECK_HEADERS('sys/capability.h') -+import Options -+ -+if Options.options.enable_libcap: -+ conf.CHECK_HEADERS('sys/capability.h') -+ - conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') - - # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index fc43e1a..12d2a70 100644 +index 2c638b7..079761d 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -23,6 +23,41 @@ def set_options(opt): @@ -118,32 +100,33 @@ index fc43e1a..12d2a70 100644 conf.CHECK_HEADERS('port.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -73,7 +121,9 @@ def configure(conf): - - conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') +@@ -101,7 +149,8 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') + if Options.options.enable_valgrind: + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): +@@ -294,22 +343,18 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') +- strlcpy_in_bsd = False +- - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -- -- if not conf.CHECK_FUNCS('closefrom'): -- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): @@ -153,12 +136,25 @@ index fc43e1a..12d2a70 100644 + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -+ + +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; +@@ -660,7 +705,7 @@ removeea setea + # look for a method of finding the list of network interfaces + for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: + bsd_for_strlcpy = '' +- if strlcpy_in_bsd: ++ if Options.options.enable_libbsd: + bsd_for_strlcpy = ' bsd' + if conf.CHECK_CODE(''' + #define %s 1 +diff --git a/wscript b/wscript +index 94d190f..742f779 100644 --- a/wscript +++ b/wscript @@ -22,7 +22,12 @@ def set_options(opt): @@ -176,5 +172,5 @@ index fc43e1a..12d2a70 100644 def configure(conf): conf.RECURSE('lib/replace') -- -2.8.3 +2.16.2 diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb b/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb similarity index 89% rename from meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb rename to meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb index f5083006925..a83851ea4fd 100644 --- a/meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb +++ b/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb @@ -7,12 +7,12 @@ DEPENDS += "libtalloc" RDEPENDS_python-tevent = "python" SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ - file://options-0.9.33.patch \ + file://options-0.9.36.patch \ " LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" -SRC_URI[md5sum] = "527a43f35b4251e46f28921342895223" -SRC_URI[sha256sum] = "22712ee981fd4298fcd5f3afb27d87a72257cebad37812cfbd3da5d968ed1bdc" +SRC_URI[md5sum] = "87d67bca75b231814435c47bec0aff8a" +SRC_URI[sha256sum] = "bd2b6be3fd1601ed7f176e99111e322c57d58e425cc149ee80c7dd4fed263b4c" inherit waf-samba diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_git.bb b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb index 58f12309b93..cebc1d9cd8d 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_git.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb @@ -20,6 +20,8 @@ inherit autotools gettext EXTRA_OECONF += "PERL=${USRBINPATH}/perl" LDFLAGS += "-fuse-ld=gold" +LDFLAGS_remove_riscv64 = "-fuse-ld=gold" + TOOLCHAIN = "gcc" USE_NLS = "yes" diff --git a/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch b/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch index cb1e2f7341e..d45b7e38b73 100644 --- a/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch +++ b/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch @@ -1,6 +1,16 @@ ---- a/include/ntp_syscall.h.orig 2009-05-19 16:44:55.048156467 -0400 -+++ b/include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400 -@@ -14,6 +14,14 @@ +From 2310898533f059d875dcffd26ab6cf1b280292fd Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 12 Jan 2011 21:38:46 +0100 + +--- + include/ntp_syscall.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/include/ntp_syscall.h b/include/ntp_syscall.h +index d1ce03e..9e18432 100644 +--- a/include/ntp_syscall.h ++++ b/include/ntp_syscall.h +@@ -10,6 +10,14 @@ # include #endif @@ -13,5 +23,5 @@ +#endif + #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) + # ifdef NTP_SYSCALLS_STD + # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb index 719c60b97e0..6db165acecf 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb @@ -109,6 +109,8 @@ PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils" # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms # with wonky clocks (e.g. OpenSlug) RDEPENDS_${PN} = "${PN}-tickadj" +# ntpd require libgcc for execution +RDEPENDS_${PN} += "libgcc" # Handle move from bin to utils package RPROVIDES_${PN}-utils = "${PN}-bin" RREPLACES_${PN}-utils = "${PN}-bin" diff --git a/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch b/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch index da96983e6dc..846e0c6936e 100644 --- a/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch +++ b/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch @@ -50,7 +50,7 @@ index ff33824..bd21446 100644 */ -openssl_diffie_hellman_t *openssl_diffie_hellman_create( +openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom( - diffie_hellman_group_t group, chunk_t g, chunk_t p) + diffie_hellman_group_t group, ...) { private_openssl_diffie_hellman_t *this; @@ -197,5 +197,11 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create( @@ -70,12 +70,12 @@ index 53dc59c..eb69eaa 100644 --- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h +++ b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h @@ -44,8 +44,10 @@ struct openssl_diffie_hellman_t { - * @param p custom prime, if MODP_CUSTOM + * @param ... expects generator and prime as chunk_t if MODP_CUSTOM * @return openssl_diffie_hellman_t object, NULL if not supported */ -openssl_diffie_hellman_t *openssl_diffie_hellman_create( +openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom( - diffie_hellman_group_t group, chunk_t g, chunk_t p); + diffie_hellman_group_t group, ...); +openssl_diffie_hellman_t *openssl_diffie_hellman_create( + diffie_hellman_group_t group); diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb b/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb similarity index 97% rename from meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb rename to meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb index 97ebcd8a575..f2fe1f1cbc0 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb @@ -12,8 +12,8 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ " -SRC_URI[md5sum] = "4afffe3c219bb2e04f09510905af836b" -SRC_URI[sha256sum] = "c5ea54b199174708de11af9b8f4ecf28b5b0743d4bc0e380e741f25b28c0f8d4" +SRC_URI[md5sum] = "46aa3aa18fbc4bd528f9a0345ce79913" +SRC_URI[sha256sum] = "e0a60a30ebf3c534c223559e1686497a21ded709a5d605c5123c2f52bcc22e92" EXTRA_OECONF = " \ --without-lib-prefix \ diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index 196cec7f20c..b71435a0430 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -1,4 +1,4 @@ -From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001 +From 8ee1ab1ac89557d48ac1ab7ddcc3c51be9b734ad Mon Sep 17 00:00:00 2001 From: "Hongjun.Yang" Date: Wed, 22 Oct 2014 10:02:48 +0800 Subject: [PATCH] Add ptest for tcpdump @@ -6,15 +6,16 @@ Subject: [PATCH] Add ptest for tcpdump Upstream-Status: Pending Signed-off-by: Hongjun.Yang + --- Makefile.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -Index: tcpdump-4.9.0/Makefile.in -=================================================================== ---- tcpdump-4.9.0.orig/Makefile.in -+++ tcpdump-4.9.0/Makefile.in -@@ -436,9 +436,17 @@ distclean: +diff --git a/Makefile.in b/Makefile.in +index 0941f0e..3ce40c6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -437,9 +437,17 @@ distclean: tests/failure-outputs.txt rm -rf autom4te.cache tests/DIFF tests/NEW diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch index d7a3ac23b17..8cefadf2846 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch @@ -1,4 +1,7 @@ -unnecessary to check libpcap +From 741d77e42fc4af49804f7ee43b7237e01633cbcd Mon Sep 17 00:00:00 2001 +From: Roy Li +Date: Tue, 8 Jul 2014 13:20:47 +0800 +Subject: [PATCH] unnecessary to check libpcap Upstream-Status: Pending @@ -11,23 +14,21 @@ In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to check if libpcap existed. Signed-off-by: Roy Li + --- - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 06fade1..9125de7 100644 +index b2305a5..b3b5dbf 100644 --- a/configure.in +++ b/configure.in -@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, - dnl AC_CHECK_LIB(z, uncompress) - dnl AC_CHECK_HEADERS(zlib.h) +@@ -418,7 +418,7 @@ dnl Some platforms may need -lnsl for getrpcbynumber. + AC_SEARCH_LIBS(getrpcbynumber, nsl, + AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) +#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) # # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate --- -1.7.9.5 - diff --git a/meta-networking/recipes-support/wireshark/files/libgcrypt.patch b/meta-networking/recipes-support/wireshark/files/libgcrypt.patch new file mode 100644 index 00000000000..2aa58f73c2b --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/libgcrypt.patch @@ -0,0 +1,53 @@ +use OR PKG_CONFIG scheme for libgcrypt + +Upstream-Status: Inappropriate OE specific + +Signed-off-by: Armin Kuster + +Index: wireshark-2.4.4/m4/libgcrypt.m4 +=================================================================== +--- wireshark-2.4.4.orig/m4/libgcrypt.m4 ++++ wireshark-2.4.4/m4/libgcrypt.m4 +@@ -27,11 +27,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") + if test x$libgcrypt_config_prefix != x ; then + if test x${LIBGCRYPT_CONFIG+set} != xset ; then +- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config ++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/libgcrypt.pc + fi + fi + +- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt.pc, no) + tmp=ifelse([$1], ,1:1.2.0,$1) + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +@@ -50,7 +50,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` + req_micro=`echo $min_libgcrypt_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` ++ libgcrypt_config_version=`$PKG_CONFIG --modversion libgcrypt` + major=`echo $libgcrypt_config_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` + minor=`echo $libgcrypt_config_version | \ +@@ -82,7 +82,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + # If we have a recent libgcrypt, we should also check that the + # API is compatible + if test "$req_libgcrypt_api" -gt 0 ; then +- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` ++ tmp=`$PKG_CONFIG --api-version libgcrypt 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + AC_MSG_CHECKING([LIBGCRYPT API version]) + if test "$req_libgcrypt_api" -eq "$tmp" ; then +@@ -95,8 +95,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + fi + fi + if test $ok = yes; then +- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` +- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ++ LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt` ++ LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt` + ifelse([$2], , :, [$2]) + else + LIBGCRYPT_CFLAGS="" diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb b/meta-networking/recipes-support/wireshark/wireshark_2.4.5.bb similarity index 73% rename from meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb rename to meta-networking/recipes-support/wireshark/wireshark_2.4.5.bb index 5eb372e37e5..e330b99d7fb 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_2.4.5.bb @@ -4,14 +4,15 @@ SECTION = "net" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" -DEPENDS = "pcre expat glib-2.0 glib-2.0-native" +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error" -SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" +SRC_URI = "https://1.as.dl.wireshark.org/src/${BP}.tar.xz" +SRC_URI += "file://libgcrypt.patch" -PE = "1" +SRC_URI[md5sum] = "2b6f1f37c72fa15a0a1863016a0abcc0" +SRC_URI[sha256sum] = "b3b2ec29fba0f4a3a590438abe4054e56f19108d440fc2d61492db9d8ff16fd7" -SRC_URI[md5sum] = "a79ba6cda83be2a91bde4110fe194788" -SRC_URI[sha256sum] = "a9f11621e85d7e1d72259157edd94825e72af3fd72e184b8474459f92ad5fc40" +PE = "1" inherit autotools pkgconfig perlnative @@ -19,10 +20,9 @@ ARM_INSTRUCTION_SET = "arm" PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" -#PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" -PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap" -PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_LIBDIR} --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default , libpcap" +PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_DIR_HOST}/usr, --with-libcap=no --enable-pcap-ng-default , libcap" +PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_DIR_HOST}/usr --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default , libpcap" PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" @@ -30,7 +30,6 @@ PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+" PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3" PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no --disable-wireshark," PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" -PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5" PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua" @@ -38,14 +37,15 @@ PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib" PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" PACKAGECONFIG[sbc] = "--with-sbc=yes, --with-sbc=no, sbc" - -PACKAGECONFIG[libssh] = "--with-libssh=${STAGING_LIBDIR}, --with-libssh=no, libssh2" - +PACKAGECONFIG[libssh] = "--with-libssh=${STAGING_DIR_HOST}/usr, --with-libssh=no, libssh2" +PACKAGECONFIG[lz4] = "--with-lz4=${STAGING_DIR_HOST}/usr, --with-lz4=no, lz4" # these next two options require addional layers PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" -EXTRA_OECONF += "--with-qt=no --enable-tshark --enable-rawshark" +EXTRA_OECONF += "--with-libgcrypt-prefix=${PKG_CONFIG_DIR} --with-qt=no --enable-tshark --enable-rawshark" + +LDFLAGS_append = " -lgpg-error" # Currently wireshark does not install header files do_install_append () { diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb index 54c9e7957f6..4f81d222ee2 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb @@ -1,18 +1,10 @@ +SUMMARY = "User space daemon for extended IEEE 802.11 management" HOMEPAGE = "http://w1.fi/hostapd/" SECTION = "kernel/userland" -LICENSE = "GPLv2 | BSD" -LIC_FILES_CHKSUM = "file://${B}/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350" -DEPENDS = "libnl openssl" -SUMMARY = "User space daemon for extended IEEE 802.11 management" - -inherit update-rc.d systemd distro_features_check +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://hostapd/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350" -CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" - -INITSCRIPT_NAME = "hostapd" - -SYSTEMD_SERVICE_${PN} = "hostapd.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +DEPENDS = "libnl openssl" SRC_URI = " \ http://w1.fi/releases/hostapd-${PV}.tar.gz \ @@ -22,16 +14,29 @@ SRC_URI = " \ file://key-replay-cve-multiple.patch \ " +SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7" +SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d" + S = "${WORKDIR}/hostapd-${PV}" B = "${WORKDIR}/hostapd-${PV}/hostapd" -do_configure() { +inherit update-rc.d systemd pkgconfig distro_features_check + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" + +INITSCRIPT_NAME = "hostapd" + +SYSTEMD_SERVICE_${PN} = "hostapd.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" + +do_configure_append() { install -m 0644 ${WORKDIR}/defconfig ${B}/.config } do_compile() { - export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3" - make + export CFLAGS="-MMD -O2 -Wall -g" + export EXTRA_CFLAGS="${CFLAGS}" + make V=1 } do_install() { @@ -45,7 +50,3 @@ do_install() { } CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" - -SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7" -SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d" - diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb index 489861cb7bc..b4a914d9294 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb +++ b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb @@ -16,6 +16,8 @@ SRC_URI[sha256sum] = "d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1 inherit cmake pkgconfig +OECMAKE_GENERATOR = "Unix Makefiles" + PACKAGECONFIG ?= "" # fuse support will need meta-filesystems layer PACKAGECONFIG[fuse] = "-DENABLE_FUSE=ON,-DENABLE_FUSE=OFF,fuse"