diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-daemons')
8 files changed, 89 insertions, 78 deletions
diff --git a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb index 6b73506c2a..a697e983f6 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb @@ -12,9 +12,10 @@ inherit features_check systemd RDEPENDS_${PN} = "python3-pygobject python3-dbus" REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI = "https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/${PV}/networkd-dispatcher-${PV}.tar.bz2" -SRC_URI[md5sum] = "304d7dcc21331ea295e207f8493cb8d8" -SRC_URI[sha256sum] = "21f84c3646a043329dc64787e4e58dfce592b2559b0e3069af82c469805660c2" +SRCREV = "30e278e50749a60a930ceaa0971207c6436b8a0c" +SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1" + +S = "${WORKDIR}/git" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "networkd-dispatcher.service" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch deleted file mode 100644 index 2b03b1800a..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 91c7362834ccd88d1432b3e6c5c51748b72b10ad Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 27 Jul 2019 07:21:16 -0700 -Subject: [PATCH] Add configure time check for gettid API - -glibc 2.30 has added syscalls wrapper for gettid -it should now be checked during configure if C library provides -this API then do not define local function - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 4 ++++ - src/base/logtrace.cc | 3 +++ - src/osaf/config.h.in | 3 +++ - 3 files changed, 10 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 22ab936..90f3da4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -480,6 +480,10 @@ fi - - AC_SUBST([localstatedir]) - -+############################################# -+# Checks for functions. -+############################################# -+AC_CHECK_FUNCS([ gettid ]) - - ############################################# - # Checks for programs. -diff --git a/src/base/logtrace.cc b/src/base/logtrace.cc -index 8908c1f..fe87e8d 100644 ---- a/src/base/logtrace.cc -+++ b/src/base/logtrace.cc -@@ -31,6 +31,7 @@ - #include "base/logtrace_client.h" - #include "base/logtrace_buffer.h" - #include "base/ncsgl_defs.h" -+#include "osaf/config.h" - - namespace global { - -@@ -58,7 +59,9 @@ std::once_flag init_flag; - thread_local LogTraceBuffer gl_thread_buffer{gl_local_thread_trace, - global::thread_trace_buffer_size}; - -+#ifndef HAVE_GETTID - static pid_t gettid() { return syscall(SYS_gettid); } -+#endif - - /** - * USR2 signal handler to enable/disable trace (toggle) -diff --git a/src/osaf/config.h.in b/src/osaf/config.h.in -index d1f6d1a..0a3f27d 100644 ---- a/src/osaf/config.h.in -+++ b/src/osaf/config.h.in -@@ -18,6 +18,9 @@ - /* Define if experimental code is enabled */ - #undef HAVE_EXPERIMENTAL - -+/* Define to 1 if you have the `gettid' function. */ -+#undef HAVE_GETTID -+ - /* SAHPI_INTERFACE_VERSION == A01 */ - #undef HAVE_HPI_A01 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch new file mode 100644 index 0000000000..0e113f533f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch @@ -0,0 +1,36 @@ +From 90f81c1fb3e560cfc99ee7ab9a48a1736e3929cd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Nov 2020 13:22:31 -0800 +Subject: [PATCH] Use correct printf format for __fsblkcnt_t + +This depends on time_t size and on some 32bit architectures e.g. riscv32 +this would be a 64bit value + +Fixes +os_defs.c:920:40: error: format '%ld' expects argument of type 'long int', but argument 3 has type '__fsblkcnt_t' {aka 'long long unsigned int'} [-Werror=format=] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/base/os_defs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/base/os_defs.c b/src/base/os_defs.c +index 83458c2..655c190 100644 +--- a/src/base/os_defs.c ++++ b/src/base/os_defs.c +@@ -917,7 +917,11 @@ uint32_t ncs_os_posix_shm(NCS_OS_POSIX_SHM_REQ_INFO *req) + ((statsvfs.f_bfree - 1) * statsvfs.f_frsize)) { + syslog( + LOG_ERR, ++#if __TIMESIZE == 64 && __WORDSIZE == 32 ++ "Insufficient shared memory (%lld) to write the data of size: %" PRId64 ++#else + "Insufficient shared memory (%ld) to write the data of size: %" PRId64 ++#endif + "\n", + (statsvfs.f_bfree * statsvfs.f_frsize), + req->info.write.i_write_size); +-- +2.29.2 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb index bd972e3466..5516fc43ae 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb @@ -24,13 +24,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ 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 \ - file://0001-Add-configure-time-check-for-gettid-API.patch \ file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ file://0001-immom_python-convert-to-python3.patch \ file://0001-Fix-build-with-fno-common.patch \ + file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ " -SRC_URI[md5sum] = "d56bacf4c234c134e60e9b25f6f26671" -SRC_URI[sha256sum] = "2478e298c0bce3b2cfdeb20875022cc11d7d3b53ecd3255422d22eb64c04953b" +SRC_URI[md5sum] = "02cfe732d194339237da6adce8e54384" +SRC_URI[sha256sum] = "84268b90dc48a6675e5a77e2b20390a04bb59deb48a829102a9dbc4b9ac27483" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch new file mode 100644 index 0000000000..b2caeba2ca --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch @@ -0,0 +1,40 @@ +From 3886219c5c1fdca114dd480b46ce211762e30742 Mon Sep 17 00:00:00 2001 +From: Li Zhou <li.zhou@windriver.com> +Date: Tue, 30 Jun 2020 13:50:11 +0800 +Subject: [PATCH] ptpd: Solve memory leak for function NTPDCrequest + +Solve the memory leak in function NTPDCrequest detected by valgrind tool. + +Memory leak log example: +==619== 21 bytes in 1 blocks are still reachable in loss record 1 of 3 +==619== at 0x4A09DB0: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) +==619== by 0x43512E: NTPDCrequest (ntpdcontrol.c:255) +==619== by 0x43512E: NTPDCquery.isra.1 (ntpdcontrol.c:683) +==619== by 0x4359EE: ntpdInControl (ntpdcontrol.c:807) +==619== by 0x4364F5: ntpServiceUpdate (timingdomain.c:622) +==619== by 0x436935: timingDomainUpdate (timingdomain.c:756) +==619== by 0x4334A7: protocol (protocol.c:263) +==619== by 0x402BAE: main (ptpd.c:131) + +Upstream-Status: Pending + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + src/dep/ntpengine/ntpdcontrol.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dep/ntpengine/ntpdcontrol.c b/src/dep/ntpengine/ntpdcontrol.c +index bfe0b5e..b1973cb 100644 +--- a/src/dep/ntpengine/ntpdcontrol.c ++++ b/src/dep/ntpengine/ntpdcontrol.c +@@ -271,6 +271,7 @@ NTPDCrequest( + + if (!auth) { + qpkt.auth_seq = AUTH_SEQ(0, 0); ++ free(key); + return ntpSend(control, (Octet *)&qpkt, req_pkt_size); + } + +-- +1.9.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb index cab0d9435f..227c9f9170 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb @@ -24,6 +24,7 @@ def get_sub(d): SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${@get_sub(d)}/ptpd-${PV}.tar.gz \ file://ptpd-use-pkgconfig.patch \ file://Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch \ + file://0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch \ file://ptpd.service \ file://ptpd.conf \ " diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.18.bb b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.18.bb deleted file mode 100644 index 6097b209d3..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.18.bb +++ /dev/null @@ -1,5 +0,0 @@ - -require radvd.inc - -SRC_URI[md5sum] = "26ead3a0d5cfbe4c81c3089eaf7b3250" -SRC_URI[sha256sum] = "4f573e36b96ba92d03b5abbbd5f059b9c8994967812c77852f44049ac5a448fd" diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.19.bb b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.19.bb new file mode 100644 index 0000000000..553987e3d0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.19.bb @@ -0,0 +1,5 @@ + +require radvd.inc + +SRC_URI[md5sum] = "e9c425ac48ecb96ea5ea2912c78969f9" +SRC_URI[sha256sum] = "c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0" |