From: Wang Mingyu <wangmy@...>

0001-configure-Check-for-request_init-API-when-probing-fo.patch
0001-tools-gensiot-Fix-build-with-musl.patch
removed since they're included in 2.6.1

Signed-off-by: Wang Mingyu <wangmy@...>
---
...for-request_init-API-when-probing-fo.patch | 31 -------------------
...01-tools-gensiot-Fix-build-with-musl.patch | 29 -----------------
.../{gensio_2.5.2.bb => gensio_2.6.1.bb} | 7 ++---
3 files changed, 2 insertions(+), 65 deletions(-)
delete mode 100644 meta-oe/recipes-connectivity/gensio/files/0001-configure-Check-for-request_init-API-when-probing-fo.patch
delete mode 100644 meta-oe/recipes-connectivity/gensio/files/0001-tools-gensiot-Fix-build-with-musl.patch
rename meta-oe/recipes-connectivity/gensio/{gensio_2.5.2.bb => gensio_2.6.1.bb} (78%)

diff --git a/meta-oe/recipes-connectivity/gensio/files/0001-configure-Check-for-request_init-API-when-probing-fo.patch b/meta-oe/recipes-connectivity/gensio/files/0001-configure-Check-for-request_init-API-when-probing-fo.patch
deleted file mode 100644
index 3b4caa221..000000000
--- a/meta-oe/recipes-connectivity/gensio/files/0001-configure-Check-for-request_init-API-when-probing-fo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f56e59712d8708c74a4cf66d24b5703fc16b22ae Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@...>
-Date: Thu, 1 Sep 2022 11:31:48 -0700
-Subject: [PATCH] configure: Check for request_init API when probing for
- libwrap
-
-checking for main() is not right check, since this function is not part
-of libwrap but the app. Newer autocof and toolchain may fail
-
-Upstream-Status: Submitted [https://github.com/cminyard/gensio/pull/48]
-Signed-off-by: Khem Raj <raj.khem@...>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 90cfcb6b..1c06d918 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -109,7 +109,7 @@ AC_ARG_WITH(tcp-wrappers,
- if test "$tcp_wrappers" != "no"
- then
- AC_CHECK_HEADERS([tcpd.h])
-- AC_CHECK_LIB(wrap,main)
-+ AC_CHECK_LIB(wrap,request_init)
- fi
-
- AC_ARG_ENABLE([doc],
---
-2.37.3
-
diff --git a/meta-oe/recipes-connectivity/gensio/files/0001-tools-gensiot-Fix-build-with-musl.patch b/meta-oe/recipes-connectivity/gensio/files/0001-tools-gensiot-Fix-build-with-musl.patch
deleted file mode 100644
index 93831c380..000000000
--- a/meta-oe/recipes-connectivity/gensio/files/0001-tools-gensiot-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 823b6754a4d7655480b6e8576a9d0037f842d653 Mon Sep 17 00:00:00 2001
-From: Jan Luebbe <jlu@...>
-Date: Thu, 25 Aug 2022 12:19:16 +0200
-Subject: [PATCH] tools:gensiot: Fix build with musl
-
-According to POSIX getpid() is available in unistd.h, not sys/unistd.h.
-
-Upstream-Status: Submitted [https://github.com/cminyard/gensio/pull/47]
-Signed-off-by: Jan Luebbe <jlu@...>
----
- tools/gensiotool.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/gensiotool.c b/tools/gensiotool.c
-index cac531bb4b74..ab0bb9583f9f 100644
---- a/tools/gensiotool.c
-+++ b/tools/gensiotool.c
-@@ -44,7 +44,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <sys/types.h>
--#include <sys/unistd.h>
-+#include <unistd.h>
- #include <syslog.h>
- #endif
-
---
-2.30.2
-
diff --git a/meta-oe/recipes-connectivity/gensio/gensio_2.5.2.bb b/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb
similarity index 78%
rename from meta-oe/recipes-connectivity/gensio/gensio_2.5.2.bb
rename to meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb
index d6b5f1987..91450e2c7 100644
--- a/meta-oe/recipes-connectivity/gensio/gensio_2.5.2.bb
+++ b/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb
@@ -5,12 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \
file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \
"

-SRCREV = "b6cd354afe6d5f63bc859c94fd3a455a3cdf0449"
+SRCREV = "d512218c4fa5667d4fe15977d3f15f05591f1f1a"

-SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master \
- file://0001-tools-gensiot-Fix-build-with-musl.patch \
- file://0001-configure-Check-for-request_init-API-when-probing-fo.patch \
-"
+SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master"

S = "${WORKDIR}/git"

--
2.25.1