From 804abb58c60d23acbbbf0eee735e870d4231f9d1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Jul 2025 13:59:52 -0700 Subject: openwsman: Upgrade to 2.8.1 release Fixes build with cmake4+ Drop upstreamed patches Signed-off-by: Khem Raj --- .../0001-Link-with-libm-for-floor-function.patch | 71 ---------------------- ...ne-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch | 5 -- .../libssl-is-required-if-eventint-supported.patch | 19 ------ .../recipes-extended/openwsman/openwsman_2.7.2.bb | 70 --------------------- .../recipes-extended/openwsman/openwsman_2.8.1.bb | 67 ++++++++++++++++++++ 5 files changed, 67 insertions(+), 165 deletions(-) delete mode 100644 meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch delete mode 100644 meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch delete mode 100644 meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb create mode 100644 meta-oe/recipes-extended/openwsman/openwsman_2.8.1.bb diff --git a/meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch b/meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch deleted file mode 100644 index 2f47261588..0000000000 --- a/meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 09101da4efaa5584b7f3f3f3bfa5dbb4d1e26948 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 24 Jul 2023 22:09:21 -0700 -Subject: [PATCH] Link with libm for floor() function - -LLD linker finds this missing symbol - -arm-yoe-linux-gnueabi-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: floor ->>> referenced by src/lib/libwsman.so.1.0.0 - -Upstream-Status: Submitted [https://github.com/Openwsman/openwsman/pull/195] -Signed-off-by: Khem Raj ---- - CMakeLists.txt | 10 ++++++++++ - configure.ac | 3 ++- - src/lib/CMakeLists.txt | 4 ++++ - 3 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6e54c66b..507ee633 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -297,6 +297,16 @@ ELSE(HAVE_LIBDL) - SET(HAVE_LIBDL 0) - ENDIF(HAVE_LIBDL) - -+# m -+ -+FIND_LIBRARY( HAVE_LIBM "m" ) -+IF(HAVE_LIBM) -+ SET(M_LIBRARIES ${HAVE_LIBM}) -+ SET(HAVE_LIBM 1) -+ELSE(HAVE_LIBM) -+ SET(HAVE_LIBM 0) -+ENDIF(HAVE_LIBM) -+ - # crypt - - FIND_LIBRARY( HAVE_LIBCRYPT "crypt" ) -diff --git a/configure.ac b/configure.ac -index 125564da..010fa0b6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -128,7 +128,8 @@ daemon \ - va_copy \ - memmove \ - bcopy \ --gmtime_r -+gmtime_r \ -+floor - ) - AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) - AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname)) -diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt -index 5c51781f..496fd672 100644 ---- a/src/lib/CMakeLists.txt -+++ b/src/lib/CMakeLists.txt -@@ -36,6 +36,10 @@ if( HAVE_LIBDL ) - TARGET_LINK_LIBRARIES(wsman ${DL_LIBRARIES}) - endif( HAVE_LIBDL ) - -+if( HAVE_LIBM ) -+TARGET_LINK_LIBRARIES(wsman ${M_LIBRARIES}) -+endif( HAVE_LIBM ) -+ - IF( ENABLE_EVENTING_SUPPORT ) - TARGET_LINK_LIBRARIES( wsman ${WSMAN_CLIENT_PKG} ) - ENDIF( ENABLE_EVENTING_SUPPORT ) --- -2.41.0 - diff --git a/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch b/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch index 0e2349e303..8440793b89 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch +++ b/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch @@ -13,8 +13,6 @@ Upstream-Status: Pending src/lib/u/lock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/lib/u/lock.c b/src/lib/u/lock.c -index 025eea4c..b31c77b5 100644 --- a/src/lib/u/lock.c +++ b/src/lib/u/lock.c @@ -50,7 +50,7 @@ @@ -26,6 +24,3 @@ index 025eea4c..b31c77b5 100644 #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE #endif --- -2.14.1 - diff --git a/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch b/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch deleted file mode 100644 index 71f3d90a81..0000000000 --- a/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Pending - -libssl is required by wsman_client_transport if ENABLE_EVENTING_SUPPORT enabled. - -Signed-off-by: Bian Naimeng - -diff -Nurp openwsman-2.4.12.orig/src/lib/CMakeLists.txt openwsman-2.4.12/src/lib/CMakeLists.txt ---- openwsman-2.4.12.orig/src/lib/CMakeLists.txt 2014-10-28 23:04:47.000000000 +0800 -+++ openwsman-2.4.12/src/lib/CMakeLists.txt 2014-12-31 11:09:20.340428523 +0800 -@@ -56,6 +56,9 @@ TARGET_LINK_LIBRARIES( ${WSMAN_CLIENT_TR - SET_TARGET_PROPERTIES( ${WSMAN_CLIENT_TRANSPORT_PKG} PROPERTIES VERSION 1.0.0 SOVERSION 1) - INSTALL(TARGETS ${WSMAN_CLIENT_TRANSPORT_PKG} DESTINATION ${LIB_INSTALL_DIR}) - -+IF( ENABLE_EVENTING_SUPPORT ) -+TARGET_LINK_LIBRARIES( ${WSMAN_CLIENT_TRANSPORT_PKG} ${OPENSSL_LIBRARIES} ) -+ENDIF( ENABLE_EVENTING_SUPPORT ) - - ############### wsman_client ############### - diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb deleted file mode 100644 index 970d7fb5fc..0000000000 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY = "Opensource Implementation of WS-Management" -DESCRIPTION = "Openwsman is a project intended to provide an open-source \ -implementation of the Web Services Management specipication \ -(WS-Management) and to expose system management information on the \ -Linux operating system using the WS-Management protocol. WS-Management \ -is based on a suite of web services specifications and usage \ -requirements that exposes a set of operations focused on and covers \ -all system management aspects. \ -Openwsman Server and service libraries" -HOMEPAGE = "http://www.openwsman.org/" -SECTION = "Applications/System" - -DEPENDS = "curl libxml2 openssl libpam" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" - -SRCREV = "0120e256faa255d997d9a49d5207662c0b73d430" - -SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https \ - file://libssl-is-required-if-eventint-supported.patch \ - file://openwsmand.service \ - file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ - file://0001-Link-with-libm-for-floor-function.patch \ - " - - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba" - -inherit systemd cmake pkgconfig python3native perlnative - -SYSTEMD_SERVICE:${PN} = "openwsmand.service" -SYSTEMD_AUTO_ENABLE = "disable" - -EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ - -DBUILD_LIBCIM=NO \ - -DBUILD_PERL=YES \ - -DBUILD_PYTHON3=YES \ - -DBUILD_PYTHON=NO \ - -DCMAKE_INSTALL_PREFIX=${prefix} \ - -DLIB=${baselib} \ - " - -do_configure:prepend() { - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} -} - -do_install:append() { - install -d ${D}/${sysconfdir}/init.d - install -m 755 ${B}/etc/init/openwsmand.sh ${D}/${sysconfdir}/init.d/openwsmand - ln -sf ${sysconfdir}/init.d/openwsmand ${D}/${sbindir}/rcopenwsmand - chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${UNPACKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system - - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/openwsmand.service - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/openwsmand.service - sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_unitdir}/system/openwsmand.service - fi -} - -FILES:${PN}-dbg += "${libdir}/openwsman/plugins/.debug/ \ - ${libdir}/openwsman/authenticators/.debug/ \ - " - -INSANE_SKIP:${PN} = "dev-so" -RDEPENDS:${PN} = "ruby" diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.8.1.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.8.1.bb new file mode 100644 index 0000000000..5abe06d07b --- /dev/null +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.8.1.bb @@ -0,0 +1,67 @@ +SUMMARY = "Opensource Implementation of WS-Management" +DESCRIPTION = "Openwsman is a project intended to provide an open-source \ +implementation of the Web Services Management specipication \ +(WS-Management) and to expose system management information on the \ +Linux operating system using the WS-Management protocol. WS-Management \ +is based on a suite of web services specifications and usage \ +requirements that exposes a set of operations focused on and covers \ +all system management aspects. \ +Openwsman Server and service libraries" +HOMEPAGE = "http://www.openwsman.org/" +SECTION = "Applications/System" + +DEPENDS = "curl libxml2 openssl libpam" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "pam" + +SRCREV = "20efbccaf804a5a27a914eb8802b806416c03ece" + +SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https;tag=v${PV} \ + file://openwsmand.service \ + file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ + " + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba" + +inherit systemd cmake pkgconfig python3native perlnative + +SYSTEMD_SERVICE:${PN} = "openwsmand.service" +SYSTEMD_AUTO_ENABLE = "disable" + +EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ + -DBUILD_LIBCIM=NO \ + -DBUILD_PERL=YES \ + -DBUILD_PYTHON3=YES \ + -DBUILD_PYTHON=NO \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DLIB=${baselib} \ + " + +do_configure:prepend() { + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + +do_install:append() { + install -d ${D}/${sysconfdir}/init.d + install -m 755 ${B}/etc/init/openwsmand.sh ${D}/${sysconfdir}/init.d/openwsmand + ln -sf ${sysconfdir}/init.d/openwsmand ${D}/${sbindir}/rcopenwsmand + chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system + + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/openwsmand.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/openwsmand.service + sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_unitdir}/system/openwsmand.service + fi +} + +FILES:${PN}-dbg += "${libdir}/openwsman/plugins/.debug/ \ + ${libdir}/openwsman/authenticators/.debug/ \ + " + +INSANE_SKIP:${PN} = "dev-so" +RDEPENDS:${PN} = "ruby" -- cgit v1.2.3-54-g00ecf