diff options
Diffstat (limited to 'meta-openembedded/meta-networking')
28 files changed, 209 insertions, 284 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch index 00115cfca8..55d1ac94c5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch @@ -20,7 +20,7 @@ https://github.com/blueman-project/blueman/pull/1121 Signed-off-by: Kai Kang <kai.kang@windriver.com> --- - blueman/Functions.py | 12 +++++++++++- + blueman/Functions.py | 10 ++++++++++ blueman/plugins/applet/PowerManager.py | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) @@ -28,24 +28,15 @@ diff --git a/blueman/Functions.py b/blueman/Functions.py index 3b76271..c5eeb27 100644 --- a/blueman/Functions.py +++ b/blueman/Functions.py -@@ -17,7 +17,7 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see <http://www.gnu.org/licenses/>. - # --from time import sleep -+from time import sleep, time - import re - import os - import signal @@ -86,6 +86,16 @@ def check_bluetooth_status(message, exitfunc): return applet.SetBluetoothStatus('(b)', True) + -+ timeout = time() + 10 ++ timeout = time.time() + 10 + while applet.GetRequestStatus(): -+ sleep(0.1) -+ if time() > timeout: ++ time.sleep(0.1) ++ if time.time() > timeout: + # timeout 5s has been set in applet/PowerManager.py + # so it should NOT reach timeout here + logging.warning('Should NOT reach timeout.') diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.3.bb index eca926ee42..9aad510b4e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.3.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://firewalld.init \ " -SRC_URI[sha256sum] = "7e3db6ed84919dd10add39cc7a28d97b5a9e27a53aeb73abf8af01ef082b74f9" +SRC_URI[sha256sum] = "5998894db976d77996ca0a6b700a2f4125b9f283465fb255da9bddfb1640cb27" # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 -DEPENDS = "intltool-native glib-2.0-native" +DEPENDS = "intltool-native glib-2.0-native nftables" inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d @@ -75,7 +75,7 @@ FILES_${PN} += "\ FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" RDEPENDS_${PN} = "\ - nftables \ + nftables-python \ iptables \ python3-core \ python3-io \ @@ -87,5 +87,6 @@ RDEPENDS_${PN} = "\ python3-slip-dbus \ python3-decorator \ python3-pygobject \ - nftables-python \ + python3-json \ + python3-ctypes \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch index 446637b276..ecd13504d3 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch @@ -1,6 +1,6 @@ From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Thu, 22 Mar 2018 11:08:30 +0100 +Date: Sat, 16 Jan 2021 14:27:38 +0100 Subject: [PATCH] Do not create settings settings/property documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -11,38 +11,44 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -It was tried to get this work but gi / GirRepository could not be found by -python. Anyway it is not necessary for us to have the settings/property docs. +It was tried to get this work by adding python3-pygobject-native to DEPENDS but +compile could not find (configure passed) python module gi. +Anyway it is not necessary for us to have the settings/property docs. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - Makefile.am | 11 ----------- + Makefile.am | 13 ------------- configure.ac | 5 ----- - 2 files changed, 16 deletions(-) + 2 files changed, 18 deletions(-) diff --git a/Makefile.am b/Makefile.am -index d5cbcf5..2a1819a 100644 +index 110957a..b4cfbcc 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir +@@ -1587,14 +1587,10 @@ libnm/libnm.typelib: libnm/libnm.gir INTROSPECTION_GIRS += libnm/NM-1.0.gir libnm_noinst_data = \ -- libnm/nm-property-docs.xml \ - libnm/nm-settings-docs-overrides.xml \ -- libnm/nm-settings-docs.xml \ - libnm/nm-settings-keyfile-docs.xml \ - libnm/nm-settings-ifcfg-rh-docs.xml +- clients/cli/generate-docs-nm-settings-nmcli.xml \ + libnm/nm-property-infos-dbus.xml \ + libnm/nm-property-infos-ifcfg-rh.xml \ + libnm/nm-property-infos-keyfile.xml \ + libnm/nm-property-infos-nmcli.xml \ +- libnm/nm-settings-docs-gir.xml \ +- man/nm-settings-docs-dbus.xml \ +- man/nm-settings-docs-nmcli.xml \ + $(NULL) -@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) + noinst_DATA += $(libnm_noinst_data) +@@ -4448,18 +4444,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp clients_common_settings_doc_h = clients/common/settings-docs.h -if HAVE_INTROSPECTION --$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp +-$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-settings-docs-gir.xml clients/common/.dirstamp - $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) -DISTCLEANFILES += $(clients_common_settings_doc_h) -check-local-settings-docs: $(clients_common_settings_doc_h) @@ -57,18 +63,21 @@ index d5cbcf5..2a1819a 100644 $(clients_common_settings_doc_h) \ $(clients_common_settings_doc_h).in diff --git a/configure.ac b/configure.ac -index ad4b0fc..0092092 100644 +index 704b1c1..18bba87 100644 --- a/configure.ac +++ b/configure.ac -@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0) +@@ -1228,11 +1228,6 @@ GTK_DOC_CHECK(1.0) # check if we can build setting property documentation build_docs=no if test -n "$INTROSPECTION_MAKEFILE"; then - # If g-i is installed we know we have python, but we might not have pygobject -- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then +- if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then - AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) - fi - AC_PATH_PROG(PERL, perl) if test -z "$PERL"; then AC_MSG_ERROR([--enable-introspection requires perl]) +-- +2.26.2 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch index 11741897f6..11741897f6 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch index 0a8de54106..2df449f2eb 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch @@ -6,7 +6,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/meson.build +++ b/meson.build @@ -114,7 +114,7 @@ config_h.set10('HAVE_GETRANDOM', use_sys - # FIXME secure_getenv check is not useful? + #include <sys/wait.h>''')) config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv')) config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv')) -config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include <malloc.h>')) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch index c23fc308fd..7807fc77c6 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch @@ -1,4 +1,4 @@ -From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001 +From 9597122867c22e949ef3b69c779e0facebce6eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Tue, 2 Apr 2019 01:34:35 +0200 Subject: [PATCH] Fix build with musl - systemd specific @@ -6,6 +6,11 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + Networkmanager imported some code from systemd. This requires some adjustments for musl. @@ -23,7 +28,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c -index 91d687c..8388304 100644 +index 1ea3e7f..1204393 100644 --- a/shared/systemd/src/basic/in-addr-util.c +++ b/shared/systemd/src/basic/in-addr-util.c @@ -15,6 +15,7 @@ @@ -32,10 +37,10 @@ index 91d687c..8388304 100644 #include "parse-util.h" +#include "string-util.h" #include "random-util.h" + #include "string-util.h" #include "strxcpyx.h" - #include "util.h" diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c -index 1456167..42f51a0 100644 +index 03ca04e..be8bca8 100644 --- a/shared/systemd/src/basic/process-util.c +++ b/shared/systemd/src/basic/process-util.c @@ -17,6 +17,9 @@ @@ -48,7 +53,7 @@ index 1456167..42f51a0 100644 #if 0 /* NM_IGNORED */ #if HAVE_VALGRIND_VALGRIND_H #include <valgrind/valgrind.h> -@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) { +@@ -1152,11 +1155,13 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -62,7 +67,7 @@ index 1456167..42f51a0 100644 pid_t getpid_cached(void) { static bool installed = false; -@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) { +@@ -1185,7 +1190,11 @@ pid_t getpid_cached(void) { * only half-documented (glibc doesn't document it but LSB does — though only superficially) * we'll check for errors only in the most generic fashion possible. */ @@ -75,7 +80,7 @@ index 1456167..42f51a0 100644 cached_pid = CACHED_PID_UNSET; return new_pid; diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h -index a0886e0..da47d14 100644 +index 1ece911..290e94c 100644 --- a/shared/systemd/src/basic/socket-util.h +++ b/shared/systemd/src/basic/socket-util.h @@ -14,6 +14,12 @@ @@ -92,7 +97,7 @@ index a0886e0..da47d14 100644 #include "missing_socket.h" #include "sparse-endian.h" diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h -index e029f86..1e8b6e1 100644 +index a8dc3bb..ff0aa88 100644 --- a/shared/systemd/src/basic/sort-util.h +++ b/shared/systemd/src/basic/sort-util.h @@ -5,15 +5,10 @@ @@ -115,9 +120,9 @@ index e029f86..1e8b6e1 100644 /** * Normal bsearch requires base to be nonnull. Here were require -@@ -54,17 +49,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn +@@ -54,17 +49,3 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, __compar_f int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ - qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ + _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ }) - -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) { @@ -148,7 +153,7 @@ index c3b9448..e80a938 100644 #include <stdio.h> #include <sys/types.h> diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h -index 04cc82b..2cf589a 100644 +index cefbda3..71e4dec 100644 --- a/shared/systemd/src/basic/string-util.h +++ b/shared/systemd/src/basic/string-util.h @@ -26,6 +26,11 @@ @@ -161,5 +166,5 @@ index 04cc82b..2cf589a 100644 +#endif + int strcmp_ptr(const char *a, const char *b) _pure_; + int strcasecmp_ptr(const char *a, const char *b) _pure_; - static inline bool streq_ptr(const char *a, const char *b) { diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch index 196a3358d0..0f43c0c684 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch @@ -1,4 +1,4 @@ -From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001 +From bacc14089c80ec757025789ff054a05e1f9c088d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Mon, 8 Apr 2019 23:10:43 +0200 Subject: [PATCH] Fix build with musl @@ -6,6 +6,11 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + The build issues caused by definition conflicts musl vs linux-libc headers (error: redefinition of ...) can be reduced to two headers: @@ -42,7 +47,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c -index 4ab5932..915248c 100644 +index 692a467..cf9b32e 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c @@ -26,7 +26,6 @@ @@ -54,11 +59,11 @@ index 4ab5932..915248c 100644 #include "nmtui.h" diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 5418a1e..f492da6 100644 +index 9589c51..b82c5cf 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -10,6 +10,10 @@ - #error "Only <NetworkManager.h> can be included directly." + #error "Only <NetworkManager.h> can be included directly." #endif +/* include as early as possible for musl */ @@ -69,10 +74,10 @@ index 5418a1e..f492da6 100644 #include <netinet/in.h> diff --git a/shared/nm-default.h b/shared/nm-default.h -index ace6ede..25357da 100644 +index b322f1d..c287dbe 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h -@@ -182,6 +182,9 @@ +@@ -178,6 +178,9 @@ #endif #include <stdlib.h> @@ -83,7 +88,7 @@ index ace6ede..25357da 100644 /*****************************************************************************/ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index 3bbc975..4e8a3f6 100644 +index 0be05f2..04061f9 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -9,6 +9,7 @@ @@ -100,10 +105,10 @@ index 3bbc975..4e8a3f6 100644 #include <linux/if_addr.h> -#include <linux/if_arp.h> #include <linux/rtnetlink.h> - #include <linux/pkt_sched.h> + #include "nm-std-aux/unaligned.h" diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c -index 7abe4df..9f53147 100644 +index b377c85..87af59a 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -14,7 +14,6 @@ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch deleted file mode 100644 index 62252826e2..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch +++ /dev/null @@ -1,61 +0,0 @@ -From aff5cded8847f3eee59f5cec22afb8630d401a85 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer <adrian.freihofer@siemens.com> -Date: Sat, 7 Mar 2020 14:22:36 +0100 -Subject: [PATCH 3/4] Fix build with musl for n-dhcp4 - ---- - shared/n-dhcp4/src/n-dhcp4-c-probe.c | 8 ++++++++ - shared/n-dhcp4/src/n-dhcp4-private.h | 4 ++++ - 2 files changed, 12 insertions(+) - -diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c -index e4477a7..75713c8 100644 ---- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c -+++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c -@@ -360,8 +360,12 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe - seed16v[1] = (u64 >> 16) ^ (u64 >> 0); - seed16v[2] = (u64 >> 32) ^ (u64 >> 16); - -+#ifdef __GLIBC__ - r = seed48_r(seed16v, &config->entropy); - c_assert(!r); -+#else -+ memcpy(config->entropy, seed16v, sizeof seed16v); -+#endif - } - - /** -@@ -375,10 +379,14 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe - */ - uint32_t n_dhcp4_client_probe_config_get_random(NDhcp4ClientProbeConfig *config) { - long int result; -+#ifdef __GLIBC__ - int r; - - r = mrand48_r(&config->entropy, &result); - c_assert(!r); -+#else -+ result = jrand48(config->entropy); -+#endif - - return result; - }; -diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h -index 436ee80..ffcb4b2 100644 ---- a/shared/n-dhcp4/src/n-dhcp4-private.h -+++ b/shared/n-dhcp4/src/n-dhcp4-private.h -@@ -267,7 +267,11 @@ struct NDhcp4ClientProbeConfig { - bool inform_only; - bool init_reboot; - struct in_addr requested_ip; -+#ifdef __GLIBC__ - struct drand48_data entropy; /* entropy pool */ -+#else -+ unsigned short entropy[3]; /* entropy pool */ -+#endif - uint64_t ms_start_delay; /* max ms to wait before starting probe */ - NDhcp4ClientProbeOption *options[UINT8_MAX + 1]; - int8_t request_parameters[UINT8_MAX + 1]; --- -2.24.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch index 55aa4d2655..5735d51a8c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch @@ -1,14 +1,14 @@ -From 80c7d3391510993cba1a7499bf33a5b2b115280d Mon Sep 17 00:00:00 2001 +From ed748a28076eada9f38e3f4a476f28d7a10ba84b Mon Sep 17 00:00:00 2001 From: Adrian Freihofer <adrian.freihofer@siemens.com> Date: Sat, 7 Mar 2020 14:24:01 +0100 -Subject: [PATCH 4/4] Fix build with musl - systemd specific +Subject: [PATCH] Fix build with musl - systemd specific --- src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c -index e1150f9..2c63bac 100644 +index ec7f1be..31bcd4d 100644 --- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c @@ -7,7 +7,9 @@ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb index aa8ab899bb..dcb23d05c4 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb @@ -19,23 +19,22 @@ DEPENDS = " \ curl \ " -inherit gnomebase gettext update-rc.d systemd bash-completion vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even +inherit gnomebase gettext update-rc.d systemd vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even SRC_URI = " \ ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ file://${BPN}.initd \ file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ file://0002-Do-not-create-settings-settings-property-documentati.patch \ - file://0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ - file://fix_reallocarray_check.patch \ + file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ + file://0004-fix_reallocarray_check.patch \ " SRC_URI_append_libc-musl = " \ file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ file://musl/0002-Fix-build-with-musl.patch \ - file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \ - file://musl/0004-Fix-build-with-musl-systemd-specific.patch \ + file://musl/0003-Fix-build-with-musl-systemd-specific.patch \ " -SRC_URI[sha256sum] = "c6893971936a1ce252ba4fdff830c972d2ae93fec6751b57dcfd3ad9f0c949dd" +SRC_URI[sha256sum] = "3e170e9045e20598d2630e40c5789b2e2c46b942bfe5cb220f36202299253062" S = "${WORKDIR}/NetworkManager-${PV}" @@ -63,11 +62,14 @@ do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" } -PACKAGECONFIG ??= "nss ifupdown dnsmasq \ +PACKAGECONFIG ??= "nss ifupdown dnsmasq nmcli \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ " + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'nmcli', 'bash-completion', '', d)} + PACKAGECONFIG[systemd] = " \ --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ --without-systemdsystemunitdir, \ @@ -82,10 +84,11 @@ PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" -PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" +PACKAGECONFIG[wifi] = "--with-wext=yes --enable-wifi=yes,--with-wext=no --enable-wifi=no,,wpa-supplicant" PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" +PACKAGECONFIG[nmcli] = "--with-nmcli=yes,--with-nmcli=no,readline" PACKAGES =+ " \ ${PN}-nmcli ${PN}-nmcli-doc \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb index 91a6edd241..d447231fc5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb @@ -2,10 +2,10 @@ SUMMARY = "Easy communication with NetworkManager from Python" HOMEPAGE = "https://github.com/seveas/python-networkmanager" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING;md5=8d8bac174bf8422b151200e6cc78ebe4" +LIC_FILES_CHKSUM = "file://COPYING;md5=9f8a5b5844f027357ab19ef3e3c6a956" -SRC_URI[md5sum] = "f638d854a3639fb37c0e06d1092a771e" -SRC_URI[sha256sum] = "aef1e34d98d7bec7cc368e0ca0f2e97493f9b5ebe6d7103f8f6460cfca3dc6fc" +SRC_URI[md5sum] = "7e05d3ca40a4fa50222ba93cda3d0d02" +SRC_URI[sha256sum] = "de6eb921d94aba7549f428ed2b3aa482a5d543ecb6965cbaa0fbb555ab31b9d5" PYPI_PACKAGE = "python-networkmanager" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 1a34c4b348..231d8d4da2 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -112,6 +112,7 @@ RDEPENDS_packagegroup-meta-networking-filter = "\ libnftnl \ conntrack-tools \ ebtables \ + ipset \ libnetfilter-acct \ libnetfilter-conntrack \ libnetfilter-cthelper \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb b/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb index 004433b6b9..119475f25f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb @@ -5,8 +5,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=432040ff3a55670c1dec0c32b209ad69" SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "3a9c2cb42c1f5ee0cb769a4884545641" -SRC_URI[sha256sum] = "d351e623037390f575c1203d9cbb7ba33a8bdef85a3c5e1d2901c5a2a38449a1" +SRC_URI[md5sum] = "5565874d9631103109a72452cecb5ce7" +SRC_URI[sha256sum] = "d1fc244cb2fbbf99f720bda3e841fe59ece9b6919073790b4b892739b1b844eb" UPSTREAM_CHECK_URI = "https://github.com/pali/${BPN}/releases" diff --git a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb new file mode 100644 index 0000000000..95e48f0131 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb @@ -0,0 +1,21 @@ +# Copyright (C) 2017 Aaron Brice <aaron.brice@datasoft.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Administration tool for IP sets" +HOMEPAGE = "http://ipset.netfilter.org" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +SECTION = "base" + +DEPENDS = "libtool libmnl" + +SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2" +SRC_URI[sha256sum] = "b75c13689eddf1d95b396840a69dc04fd7ae4112b10b70594bc0405df7b9b30a" + +inherit autotools pkgconfig module-base + +EXTRA_OECONF += "-with-kbuild=${KBUILD_OUTPUT} --with-ksource=${STAGING_KERNEL_DIR}" + +RRCOMMENDS_${PN} = "\ + kernel-module-ip-set \ +" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.8.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb index f1fd61be7b..5532af8d9c 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.8.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" SECTION = "libs" DEPENDS = "libmnl" -SRCREV = "b2cd6d28fab02934c4ddff0699718d74272eccd3" +SRCREV = "c3fdda6ac8675aea9b35772458544f03157be415" SRC_URI = "git://git.netfilter.org/libnftnl \ file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb index e5dfef92bd..6990ae3aeb 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb @@ -10,11 +10,11 @@ DEPENDS = "libmnl libnftnl bison-native \ UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2" SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "fe6b8a8c326a2c09c02ca162b840d7d4aadb043ce7a367c166d6455b0e112cb0" +SRC_URI[sha256sum] = "60fc004656dae4fefc4901c939c9d64120b4dedb49738e420a9a34989f108fe4" inherit autotools manpages pkgconfig -PACKAGECONFIG ??= "python readline" +PACKAGECONFIG ??= "python readline json" PACKAGECONFIG[json] = "--with-json, --without-json, jansson" PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" @@ -28,4 +28,4 @@ RRECOMMENDS_${PN} += "kernel-module-nf-tables" PACKAGES =+ "${PN}-python" FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" -RDEPENDS_${PN}-python = "python3-core python3-json" +RDEPENDS_${PN}-python = "python3-core python3-json ${PN}" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-mdns-include-stddef.h-for-NULL.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-mdns-include-stddef.h-for-NULL.patch index 3e9be7d6a5..c57ce8fa53 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-mdns-include-stddef.h-for-NULL.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-mdns-include-stddef.h-for-NULL.patch @@ -34,7 +34,7 @@ index 2fbea04..d4b9af5 100755 +#include <stddef.h> /* for NULL */ #include "DNSCommon.h" // Defines general DNS utility routines #include "uDNS.h" // Defines entry points into unicast-specific routines - #include "nsec.h" + -- 2.20.1 diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1096.40.7.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.40.42.bb index 086b408692..445ed87e4c 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1096.40.7.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.40.42.bb @@ -22,8 +22,8 @@ SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${P file://0010-Handle-errors-from-socket-calls.patch;patchdir=.. \ file://0011-Change-a-dynamic-allocation-to-file-scope-variable.patch;patchdir=.. \ " -SRC_URI[md5sum] = "ac766013bbcb323e9db4c80805b2552a" -SRC_URI[sha256sum] = "b86f4816b4145915198e7c5bf0bc56dbbfd960e9a4518bb6486baa40cdcca7e6" +SRC_URI[md5sum] = "dfcfd4d7f29a56ec99e7df1d21db5e7b" +SRC_URI[sha256sum] = "bea29e1616cd56ccb8f88c0fad2bcdc4031f4deb2d899c793e2f27a8384f0b34" CVE_PRODUCT = "apple:mdnsresponder" diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb index 5df1f9340e..bee83c4d13 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb @@ -40,7 +40,7 @@ CCACHE = "" TARGET_CC_ARCH += "${LDFLAGS}" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} des" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} des smux" PACKAGECONFIG[elfutils] = "--with-elf, --without-elf, elfutils" PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl" @@ -49,6 +49,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no,\ perl," PACKAGECONFIG[des] = "--enable-des,--disable-des" +PACKAGECONFIG[smux] = "" EXTRA_OECONF = "--enable-shared \ --disable-manuals \ @@ -57,10 +58,11 @@ EXTRA_OECONF = "--enable-shared \ --with-persistent-directory=${localstatedir}/lib/net-snmp \ ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \ --with-openssl=${STAGING_EXECPREFIXDIR} \ + --with-mib-modules='${MIB_MODULES}' \ " -# net-snmp needs to have mib-modules=smux enabled to enable quagga to support snmp -EXTRA_OECONF += "--with-mib-modules=smux" +MIB_MODULES = "" +MIB_MODULES_append = " ${@bb.utils.filter('PACKAGECONFIG', 'smux', d)}" CACHED_CONFIGUREVARS = " \ ac_cv_header_valgrind_valgrind_h=no \ diff --git a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb index 12b9124f74..c3e4cbbe6d 100644 --- a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb @@ -16,7 +16,7 @@ PV = "0.5.1.3+git${SRCPV}" SRCREV = "5555aae843f57241d005e330b9cb65602d56db0f" -SRC_URI = "git://git.xiph.org/celt.git;branch=compat-v0.5.1;protocol=https \ +SRC_URI = "git://gitlab.xiph.org/xiph/celt.git;branch=compat-v0.5.1;protocol=https \ file://0001-configure.ac-make-tools-support-optional.patch \ file://0001-tests-Include-entcode.c-into-test-sources-to-provide.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch deleted file mode 100644 index 233ae40ce0..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f61f5f8a328207867b5c523b1c6bef6aaecaab88 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@cn.fujitsu.com> -Date: Sat, 15 Feb 2020 16:05:58 +0800 -Subject: [PATCH] Bugfix: Modify the dir of install-exec-hook and - install-data-hook - -Error message: -(cd /sbin && ln -sf mount.cifs mount.smb3) - /yocto/work001/fnst/wangmy/build/tmp/hosttools/install -c mount.cifs -'/yocto/work001/fnst/wangmy/build/tmp/work/core2-64-poky-linux/cifs-utils/6.10-r0/image/sbin' -make install-data-hook -ln: failed to create symbolic link 'mount.smb3': Permission denied - -Upstream-Status: Pending - -Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> ---- - Makefile.am | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fe9cd34..e9be6b3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -119,11 +119,11 @@ endif - SUBDIRS = contrib - - install-exec-hook: -- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) - - install-data-hook: -- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) -+ (test -n "$(man_MANS)" || exit 0; cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) - - uninstall-hook: -- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) -- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3) -+ (test -n "$(man_MANS)" || exit 0; cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8) --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb index de3fbb0947..c68b474cc6 100644 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb @@ -4,7 +4,7 @@ SECTION = "otherosfs" LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRCREV = "ded4e81796a18cde73329e838357f084aa05720f" +SRCREV = "73008e3292e4d46fde3eab5d5f618886210ec4a1" SRC_URI = "git://git.samba.org/cifs-utils.git" S = "${WORKDIR}/git" @@ -20,10 +20,6 @@ PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samb PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" -SRC_URI += " \ - file://0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch \ - " - inherit autotools pkgconfig do_install_append() { diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service index 2980f7def6..ef2f3f7e41 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service @@ -8,7 +8,7 @@ PIDFile=/run/dnsmasq.pid ExecStartPre=/usr/bin/dnsmasq --test ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start -ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop +ExecStop=/usr/bin/dnsmasq-resolvconf-helper stop ExecStop=/bin/kill $MAINPID ExecReload=/bin/kill -HUP $MAINPID diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch index f86235076e..f16f687f24 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch @@ -9,58 +9,65 @@ Upstream-Status: pending Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> --- - configure.ac | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) + m4/glibc.m4 | 6 ++---- + m4/ioloop.m4 | 9 +++------ + 2 files changed, 5 insertions(+), 10 deletions(-) -diff --git a/configure.ac b/configure.ac -index 3b32614..94ec002 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -519,13 +519,10 @@ have_ioloop=no - - if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then - AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[ +diff --git a/m4/glibc.m4 b/m4/glibc.m4 +index 5d722aa..ce088d3 100644 +--- a/m4/glibc.m4 ++++ b/m4/glibc.m4 +@@ -17,7 +17,7 @@ AC_DEFUN([DOVECOT_GLIBC], [ + dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it. + dnl * It may also be broken in AIX. + AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - AC_TRY_RUN([ + AC_TRY_LINK([ - #include <sys/epoll.h> -- -- int main() -- { -- return epoll_create(5) < 1; + #define _XOPEN_SOURCE 600 + #include <stdio.h> + #include <stdlib.h> +@@ -26,7 +26,7 @@ AC_DEFUN([DOVECOT_GLIBC], [ + #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7) + possibly broken posix_fallocate + #endif +- int main() { ++ ], [ + int fd = creat("conftest.temp", 0600); + int ret; + if (fd == -1) { +@@ -35,8 +35,6 @@ AC_DEFUN([DOVECOT_GLIBC], [ + } + ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0; + unlink("conftest.temp"); +- return ret; - } -+ ], [ -+ epoll_create(5) < 1; ], [ - i_cv_epoll_works=yes + i_cv_posix_fallocate_works=yes ], [ -@@ -653,7 +650,7 @@ fi - dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it. - dnl * It may also be broken in AIX. - AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ -- AC_TRY_RUN([ -+ AC_TRY_LINK([ - #define _XOPEN_SOURCE 600 - #include <stdio.h> - #include <stdlib.h> -@@ -662,7 +659,7 @@ AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7) - possibly broken posix_fallocate - #endif -- int main() { -+ ], [ - int fd = creat("conftest.temp", 0600); - int ret; - if (fd == -1) { -@@ -671,8 +668,6 @@ AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - } - ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0; - unlink("conftest.temp"); -- return ret; -- } - ], [ - i_cv_posix_fallocate_works=yes - ], [ +diff --git a/m4/ioloop.m4 b/m4/ioloop.m4 +index 0f7dde0..f40fd62 100644 +--- a/m4/ioloop.m4 ++++ b/m4/ioloop.m4 +@@ -4,13 +4,10 @@ AC_DEFUN([DOVECOT_IOLOOP], [ + + if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then + AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[ +- AC_TRY_RUN([ ++ AC_TRY_LINK([ + #include <sys/epoll.h> +- +- int main() +- { +- return epoll_create(5) < 1; +- } ++ ], [ ++ epoll_create(5) < 1; + ], [ + i_cv_epoll_works=yes + ], [ -- -1.8.4.2 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch deleted file mode 100644 index 65ae9bf910..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From be9b3809b86fe593dbb16f0b981b3d315a27b799 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 22 Oct 2017 22:10:41 -0700 -Subject: [PATCH] doveadm: Fix parallel build - -Sometimes dovetail build fails with errors like - -doveadm-util.o: file not recognized: File truncated -collect2: error: ld returned 1 exit status -make[4]: *** [Makefile:812: test-doveadm-util] Error 1 - -This is partial backport from - -https://github.com/dovecot/core/commit/b200bc3875fa06d42c8619865cc306c3297fcacc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/doveadm/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am -index c644646..6ae9144 100644 ---- a/src/doveadm/Makefile.am -+++ b/src/doveadm/Makefile.am -@@ -180,8 +180,8 @@ test_libs = \ - ../lib/liblib.la - test_deps = $(noinst_LTLIBRARIES) $(test_libs) - --test_doveadm_util_SOURCES = test-doveadm-util.c --test_doveadm_util_LDADD = doveadm-util.o $(test_libs) $(MODULE_LIBS) -+test_doveadm_util_SOURCES = doveadm-util.c test-doveadm-util.c -+test_doveadm_util_LDADD = $(test_libs) $(MODULE_LIBS) - test_doveadm_util_DEPENDENCIES = $(test_deps) - - check: check-am check-test --- -2.14.2 - diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch new file mode 100644 index 0000000000..20ba73a824 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch @@ -0,0 +1,26 @@ +From 8c7d143ff28441c8b74b0f518dd2281239aede3d Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Fri, 15 Jan 2021 11:10:22 +0900 +Subject: [PATCH] not check pandoc + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> +--- + m4/dovecot.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/dovecot.m4 b/m4/dovecot.m4 +index 2b5d895..ece8489 100644 +--- a/m4/dovecot.m4 ++++ b/m4/dovecot.m4 +@@ -447,7 +447,7 @@ AC_DEFUN([DC_PANDOC], [ + dnl Optional tool for making documentation + AC_CHECK_PROGS(PANDOC, [pandoc], [true]) + +- AS_IF([test "$PANDOC" = "true"], [ ++ AS_IF([test "$PANDOC" = "false"], [ + AS_IF([test ! -e README], [ + AC_MSG_ERROR([Cannot produce documentation without pandoc - disable with PANDOC=false ./configure]) + ]) +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.13.bb index bda1740234..c78d283d25 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.13.bb @@ -3,19 +3,19 @@ HOMEPAGE = "https://www.dovecot.org/" DESCRIPTION = "Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like systems, written with security primarily in mind. Dovecot is an excellent choice for both small and large installations. It's fast, simple to set up, requires no special administration and it uses very little memory." SECTION = "mail" LICENSE = "LGPLv2.1 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a981379bd0f1c362f8d1d21515e5b30b" +LIC_FILES_CHKSUM = "file://COPYING;md5=2956560272e5b31d9d64f03111732048" -SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ +SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \ file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ file://dovecot.service \ file://dovecot.socket \ - file://0001-doveadm-Fix-parallel-build.patch \ + file://0001-not-check-pandoc.patch \ " -SRC_URI[md5sum] = "66c4d71858b214afee5b390ee602dee2" -SRC_URI[sha256sum] = "777c61e264869e9b288b8d6603f4ed3ac3aac9ec573908067353f51269dce2fe" +SRC_URI[md5sum] = "f512bf1a4dac9ac994fddfb6bc5068ff" +SRC_URI[sha256sum] = "a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4" -DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc" +DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" CFLAGS += "-I${STAGING_INCDIR}/tirpc" LDFLAGS += "-ltirpc" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb index 65f925ce1f..d284824149 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb @@ -12,7 +12,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "be832fb86d9c455c5be8b225a755cdc77cb0e92356bdfc1fe4b000d93f7d70da" +SRC_URI[sha256sum] = "1e9e239f2449f240a7910ed598084ccaf8ea308b2b46b196c5adbec59612226c" PE = "1" |