diff --git a/meta-webserver/recipes-httpd/monkey/files/0001-fastcgi-Use-value-instead-of-address-of-sin6_port.patch b/meta-webserver/recipes-httpd/monkey/files/0001-fastcgi-Use-value-instead-of-address-of-sin6_port.patch index f4bab49aa7..6bc0250877 100644 --- a/meta-webserver/recipes-httpd/monkey/files/0001-fastcgi-Use-value-instead-of-address-of-sin6_port.patch +++ b/meta-webserver/recipes-httpd/monkey/files/0001-fastcgi-Use-value-instead-of-address-of-sin6_port.patch @@ -12,19 +12,14 @@ Signed-off-by: Khem Raj plugins/fastcgi/fcgi_handler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/plugins/fastcgi/fcgi_handler.c b/plugins/fastcgi/fcgi_handler.c -index 9e095e3c..e8e1eec1 100644 --- a/plugins/fastcgi/fcgi_handler.c +++ b/plugins/fastcgi/fcgi_handler.c -@@ -245,7 +245,7 @@ static inline int fcgi_add_param_net(struct fcgi_handler *handler) - struct sockaddr_in *s4 = (struct sockaddr_in *)&addr4; +@@ -247,7 +247,7 @@ static inline int fcgi_add_param_net(str + struct sockaddr_in *s4 = (struct sockaddr_in *)&addr4; memset(&addr4, 0, sizeof(addr4)); addr4.sin_family = AF_INET; - addr4.sin_port = &s->sin6_port; + addr4.sin_port = s->sin6_port; - memcpy(&addr4.sin_addr.s_addr, - s->sin6_addr.s6_addr + 12, + memcpy(&addr4.sin_addr.s_addr, + s->sin6_addr.s6_addr + 12, sizeof(addr4.sin_addr.s_addr)); --- -2.37.2 - diff --git a/meta-webserver/recipes-httpd/monkey/files/0001-include-Fix-location-of-mk_core.h-etal.patch b/meta-webserver/recipes-httpd/monkey/files/0001-include-Fix-location-of-mk_core.h-etal.patch new file mode 100644 index 0000000000..a133142f39 --- /dev/null +++ b/meta-webserver/recipes-httpd/monkey/files/0001-include-Fix-location-of-mk_core.h-etal.patch @@ -0,0 +1,36 @@ +From 2dd5ec693b44c1ae6343803e193dea9b3cd2684d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 11 Jul 2025 20:51:07 -0700 +Subject: [PATCH] include: Fix location of mk_core.h etal + +This helps install task find the headers in right source location +Fixes + +| CMake Error at include/cmake_install.cmake:46 (file): +| file INSTALL cannot find +| "/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/monkey/1.8.4/sources/monkey-1.8.4/include/mk_core.h": +| No such file or directory. + +Upstream-Status: Submitted [https://github.com/monkey/monkey/pull/424] +Signed-off-by: Khem Raj +--- + include/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index 78af01bc..dea4083d 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -1,10 +1,10 @@ + # MK_CORE + if(NOT WITHOUT_HEADERS) +- install(FILES "mk_core.h" ++ install(FILES "monkey/mk_core.h" + DESTINATION include/ + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + +- file(GLOB headers "mk_core/*.h") ++ file(GLOB headers "monkey/mk_core/*.h") + install(FILES ${headers} + DESTINATION include/mk_core + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.8.4.bb similarity index 82% rename from meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb rename to meta-webserver/recipes-httpd/monkey/monkey_1.8.4.bb index d593b7092b..126a2a6fa5 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.8.4.bb @@ -7,19 +7,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" SECTION = "net" -SRC_URI = "git://github.com/monkey/monkey;branch=1.6;protocol=https \ +SRC_URI = "git://github.com/monkey/monkey;branch=master;protocol=https \ file://0001-fastcgi-Use-value-instead-of-address-of-sin6_port.patch \ + file://0001-include-Fix-location-of-mk_core.h-etal.patch \ file://monkey.service \ file://monkey.init" -SRCREV = "7999b487fded645381d387ec0e057e92407b0d2c" +SRCREV = "94af273244369e1a8426d0d1f6376475aff90db9" -UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+).tar.gz" +UPSTREAM_CHECK_COMMITS = "1" -EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ +EXTRA_OECMAKE = "-DMK_PATH_LOG=${localstatedir}/log/monkey/ \ -DPID_FILE=/run/monkey.pid \ - -DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \ + -DMK_PATH_CONF=${sysconfdir}/monkey/ \ -DWITH_PLUGINS=* \ -DWITHOUT_PLUGINS=mbedtls \ -DWITH_DEBUG=1 \ @@ -29,22 +29,15 @@ EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ EXTRA_OECMAKE:append:libc-musl = " -DWITH_MUSL=1 " -# GCC-10+ defaults to -fno-common -CFLAGS += "-fcommon" - DISABLE_STATIC = "" inherit cmake pkgconfig update-rc.d systemd -OECMAKE_GENERATOR = "Unix Makefiles" - do_configure:append() { - sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||g' ${S}/include/monkey/mk_env.h + sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||g' ${B}/include/monkey/mk_env.h } do_install:append() { - rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/run ${D}${localstatedir}/log - rmdir --ignore-fail-on-non-empty ${D}${localstatedir} install -Dm 0755 ${UNPACKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey # Create /var/log/monkey in runtime. if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then