From 54a25bdc67d6542670e4a89db2e1c636b6c71c5e Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 6 May 2025 16:03:51 +1000 Subject: ktls-utils: Update to version 1.0 Signed-off-by: Alistair Francis Signed-off-by: Khem Raj --- ...e-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch | 3 +- ...gure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch | 36 ++++++++++++++++++++++ .../recipes-kernel/ktls-utils/ktls-utils_0.11.bb | 24 --------------- .../recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb | 25 +++++++++++++++ 4 files changed, 62 insertions(+), 26 deletions(-) create mode 100644 meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch delete mode 100644 meta-oe/recipes-kernel/ktls-utils/ktls-utils_0.11.bb create mode 100644 meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb (limited to 'meta-oe/recipes-kernel/ktls-utils') diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch index d27e2aa741..954b1393db 100644 --- a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch +++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch @@ -7,8 +7,7 @@ ALLPERMS exists in glibc, but not on musl, so we manually define it if it doesn't exist. This fixes building on musl systems. Signed-off-by: Alistair Francis -Upstream-Status: Submitted -[https://github.com/oracle/ktls-utils/pull/88] +Upstream-Status: Submitted [https://github.com/oracle/ktls-utils/pull/88] --- src/tlshd/config.c | 8 ++++++++ 1 file changed, 8 insertions(+) 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 new file mode 100644 index 0000000000..6aabb77ee8 --- /dev/null +++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch @@ -0,0 +1,36 @@ +From d170b04dcb8b2b28e370d8b18ffa1f593e8eec11 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +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 +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_0.11.bb b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_0.11.bb deleted file mode 100644 index 650b69fcd1..0000000000 --- a/meta-oe/recipes-kernel/ktls-utils/ktls-utils_0.11.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "TLS handshake utilities for in-kernel TLS consumers" -DESCRIPTION = "In-kernel TLS consumers need a mechanism to perform TLS \ -handshakes on a connected socket to negotiate TLS session parameters that \ -can then be programmed into the kernel's TLS record protocol engine." -DEPENDS = "gnutls keyutils glib-2.0 libnl" -RDEPENDS:${PN} += " gnutls" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d568123389d9a12625cca2b089b1728b" - -SRCREV = "5c3314b5728b272cbaf0d98f4d521cca9610b6bf" -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 \ - " - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig systemd - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" - -PACKAGECONFIG[systemd] = "--with-systemd,,systemd" - -SYSTEMD_SERVICE:${PN} = "tlshd.service" 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.0.0.bb new file mode 100644 index 0000000000..ff54d72bca --- /dev/null +++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "TLS handshake utilities for in-kernel TLS consumers" +DESCRIPTION = "In-kernel TLS consumers need a mechanism to perform TLS \ +handshakes on a connected socket to negotiate TLS session parameters that \ +can then be programmed into the kernel's TLS record protocol engine." +DEPENDS = "gnutls keyutils glib-2.0 libnl" +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 \ + " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig systemd + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +PACKAGECONFIG[systemd] = "--with-systemd,,systemd" + +SYSTEMD_SERVICE:${PN} = "tlshd.service" -- cgit v1.2.3-54-g00ecf