diff mbox series

[meta-oe,10/40] ktls-utils: upgrade 1.0.0 -> 1.2.1

Message ID 20250730095456.695-10-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-webserver,01/40] apache2: upgrade 2.4.64 -> 2.4.65 | expand

Commit Message

Wang Mingyu July 30, 2025, 9:54 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch
removed since it's included in 1.2.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...ac-Use-AC_CHECK_HEADER-instead-of-AC.patch | 36 -------------------
 ...tls-utils_1.0.0.bb => ktls-utils_1.2.1.bb} | 10 +++---
 2 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch
 rename meta-oe/recipes-kernel/ktls-utils/{ktls-utils_1.0.0.bb => ktls-utils_1.2.1.bb} (70%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch
deleted file mode 100644
index 6aabb77ee8..0000000000
--- a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-From d170b04dcb8b2b28e370d8b18ffa1f593e8eec11 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@wdc.com>
-Date: Thu, 10 Apr 2025 13:15:16 +1000
-Subject: [PATCH] tlshd: configure.ac: Use AC_CHECK_HEADER instead of
- AC_CHECK_FILE
-
-AC_CHECK_FILE doesn't work when cross-compiling [1], which breaks a lot of
-use cases (like OpenEmbedded for one). Autoconf supports AC_CHECK_HEADER
-which can be used instead and is more robust [2] so let's use that
-instead.
-
-1: https://www.gnu.org/software/autoconf/manual/autoconf-2.68/html_node/Files.html
-2: https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Generic-Headers.html
-
-Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-Upstream-Status: Submitted [https://github.com/oracle/ktls-utils/pull/90]
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2c77fb1..c790d71 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -63,7 +63,7 @@ PKG_CHECK_MODULES([LIBNL_GENL3], libnl-genl-3.0 >= 3.1)
- AC_SUBST([LIBNL_GENL3_CFLAGS])
- AC_SUBST([LIBNL_GENL3_LIBS])
- 
--AC_CHECK_FILE([/usr/include/linux/quic.h],
-+AC_CHECK_HEADER([linux/quic.h],
-               [AC_CHECK_LIB([gnutls], [gnutls_handshake_set_secret_function],
-                             [AC_DEFINE([HAVE_GNUTLS_QUIC], [1], [Define to 1 if QUIC is found.])])])
- 
--- 
-2.49.0
-
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.2.1.bb
similarity index 70%
rename from meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb
rename to meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.2.1.bb
index 1a90dcf998..ce36bda7d1 100644
--- a/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb
+++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.2.1.bb
@@ -7,12 +7,10 @@  RDEPENDS:${PN} += " gnutls"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d568123389d9a12625cca2b089b1728b"
 
-SRCREV = "c787cd26330af457e1ca9cf43232db2c71c03154"
-SRC_URI = " \
-	git://github.com/oracle/ktls-utils.git;nobranch=1;protocol=https \
-	file://0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch \
-	file://0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch \
-	"
+SRCREV = "03abde4ed7f539d77a412a1c98052e1c4d262963"
+SRC_URI = "git://github.com/oracle/ktls-utils.git;nobranch=1;protocol=https;branch=ktls-utils-1.2-fixes \
+           file://0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch \
+           "
 
 
 inherit autotools-brokensep pkgconfig systemd