diff options
author | Khem Raj <raj.khem@gmail.com> | 2025-07-11 20:58:16 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-07-12 13:50:00 -0700 |
commit | a7ab25be9ab44ef2a62bf39f71af4bf5202da32b (patch) | |
tree | 5a2e92540296ed7606c18e03982b1e421d5c3754 /meta-webserver/recipes-httpd/monkey | |
parent | 5901e29e37cfbe25b71b66f9bb43ed7065480935 (diff) | |
download | meta-openembedded-a7ab25be9ab44ef2a62bf39f71af4bf5202da32b.tar.gz |
monkey: Upgrade to 1.8.4
Use default cmake backend ( ninja )
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/monkey')
-rw-r--r-- | meta-webserver/recipes-httpd/monkey/files/0001-fastcgi-Use-value-instead-of-address-of-sin6_port.patch | 13 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/monkey/files/0001-include-Fix-location-of-mk_core.h-etal.patch | 36 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/monkey/monkey_1.8.4.bb (renamed from meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb) | 21 |
3 files changed, 47 insertions, 23 deletions
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 <raj.khem@gmail.com> | |||
12 | plugins/fastcgi/fcgi_handler.c | 2 +- | 12 | plugins/fastcgi/fcgi_handler.c | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/plugins/fastcgi/fcgi_handler.c b/plugins/fastcgi/fcgi_handler.c | ||
16 | index 9e095e3c..e8e1eec1 100644 | ||
17 | --- a/plugins/fastcgi/fcgi_handler.c | 15 | --- a/plugins/fastcgi/fcgi_handler.c |
18 | +++ b/plugins/fastcgi/fcgi_handler.c | 16 | +++ b/plugins/fastcgi/fcgi_handler.c |
19 | @@ -245,7 +245,7 @@ static inline int fcgi_add_param_net(struct fcgi_handler *handler) | 17 | @@ -247,7 +247,7 @@ static inline int fcgi_add_param_net(str |
20 | struct sockaddr_in *s4 = (struct sockaddr_in *)&addr4; | 18 | struct sockaddr_in *s4 = (struct sockaddr_in *)&addr4; |
21 | memset(&addr4, 0, sizeof(addr4)); | 19 | memset(&addr4, 0, sizeof(addr4)); |
22 | addr4.sin_family = AF_INET; | 20 | addr4.sin_family = AF_INET; |
23 | - addr4.sin_port = &s->sin6_port; | 21 | - addr4.sin_port = &s->sin6_port; |
24 | + addr4.sin_port = s->sin6_port; | 22 | + addr4.sin_port = s->sin6_port; |
25 | memcpy(&addr4.sin_addr.s_addr, | 23 | memcpy(&addr4.sin_addr.s_addr, |
26 | s->sin6_addr.s6_addr + 12, | 24 | s->sin6_addr.s6_addr + 12, |
27 | sizeof(addr4.sin_addr.s_addr)); | 25 | sizeof(addr4.sin_addr.s_addr)); |
28 | -- | ||
29 | 2.37.2 | ||
30 | |||
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 @@ | |||
1 | From 2dd5ec693b44c1ae6343803e193dea9b3cd2684d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 11 Jul 2025 20:51:07 -0700 | ||
4 | Subject: [PATCH] include: Fix location of mk_core.h etal | ||
5 | |||
6 | This helps install task find the headers in right source location | ||
7 | Fixes | ||
8 | |||
9 | | CMake Error at include/cmake_install.cmake:46 (file): | ||
10 | | file INSTALL cannot find | ||
11 | | "/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/monkey/1.8.4/sources/monkey-1.8.4/include/mk_core.h": | ||
12 | | No such file or directory. | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/monkey/monkey/pull/424] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | include/CMakeLists.txt | 4 ++-- | ||
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt | ||
21 | index 78af01bc..dea4083d 100644 | ||
22 | --- a/include/CMakeLists.txt | ||
23 | +++ b/include/CMakeLists.txt | ||
24 | @@ -1,10 +1,10 @@ | ||
25 | # MK_CORE | ||
26 | if(NOT WITHOUT_HEADERS) | ||
27 | - install(FILES "mk_core.h" | ||
28 | + install(FILES "monkey/mk_core.h" | ||
29 | DESTINATION include/ | ||
30 | PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) | ||
31 | |||
32 | - file(GLOB headers "mk_core/*.h") | ||
33 | + file(GLOB headers "monkey/mk_core/*.h") | ||
34 | install(FILES ${headers} | ||
35 | DESTINATION include/mk_core | ||
36 | 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 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" | |||
7 | 7 | ||
8 | SECTION = "net" | 8 | SECTION = "net" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/monkey/monkey;branch=1.6;protocol=https \ | 10 | SRC_URI = "git://github.com/monkey/monkey;branch=master;protocol=https \ |
11 | file://0001-fastcgi-Use-value-instead-of-address-of-sin6_port.patch \ | 11 | file://0001-fastcgi-Use-value-instead-of-address-of-sin6_port.patch \ |
12 | file://0001-include-Fix-location-of-mk_core.h-etal.patch \ | ||
12 | file://monkey.service \ | 13 | file://monkey.service \ |
13 | file://monkey.init" | 14 | file://monkey.init" |
14 | 15 | ||
15 | SRCREV = "7999b487fded645381d387ec0e057e92407b0d2c" | 16 | SRCREV = "94af273244369e1a8426d0d1f6376475aff90db9" |
16 | 17 | ||
17 | UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" | 18 | UPSTREAM_CHECK_COMMITS = "1" |
18 | UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" | ||
19 | 19 | ||
20 | EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ | 20 | EXTRA_OECMAKE = "-DMK_PATH_LOG=${localstatedir}/log/monkey/ \ |
21 | -DPID_FILE=/run/monkey.pid \ | 21 | -DPID_FILE=/run/monkey.pid \ |
22 | -DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \ | 22 | -DMK_PATH_CONF=${sysconfdir}/monkey/ \ |
23 | -DWITH_PLUGINS=* \ | 23 | -DWITH_PLUGINS=* \ |
24 | -DWITHOUT_PLUGINS=mbedtls \ | 24 | -DWITHOUT_PLUGINS=mbedtls \ |
25 | -DWITH_DEBUG=1 \ | 25 | -DWITH_DEBUG=1 \ |
@@ -29,22 +29,15 @@ EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ | |||
29 | 29 | ||
30 | EXTRA_OECMAKE:append:libc-musl = " -DWITH_MUSL=1 " | 30 | EXTRA_OECMAKE:append:libc-musl = " -DWITH_MUSL=1 " |
31 | 31 | ||
32 | # GCC-10+ defaults to -fno-common | ||
33 | CFLAGS += "-fcommon" | ||
34 | |||
35 | DISABLE_STATIC = "" | 32 | DISABLE_STATIC = "" |
36 | 33 | ||
37 | inherit cmake pkgconfig update-rc.d systemd | 34 | inherit cmake pkgconfig update-rc.d systemd |
38 | 35 | ||
39 | OECMAKE_GENERATOR = "Unix Makefiles" | ||
40 | |||
41 | do_configure:append() { | 36 | do_configure:append() { |
42 | sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||g' ${S}/include/monkey/mk_env.h | 37 | sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||g' ${B}/include/monkey/mk_env.h |
43 | } | 38 | } |
44 | 39 | ||
45 | do_install:append() { | 40 | do_install:append() { |
46 | rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/run ${D}${localstatedir}/log | ||
47 | rmdir --ignore-fail-on-non-empty ${D}${localstatedir} | ||
48 | install -Dm 0755 ${UNPACKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey | 41 | install -Dm 0755 ${UNPACKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey |
49 | # Create /var/log/monkey in runtime. | 42 | # Create /var/log/monkey in runtime. |
50 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then | 43 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then |