From ced143b0e5f588fdd1b9f7852bcc228297016890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 30 Aug 2025 19:31:55 +0700 Subject: [PATCH] monkey: rebuild with cmake --- srcpkgs/monkey/patches/addr-port.patch | 11 +++++++++++ srcpkgs/monkey/patches/filename.patch | 11 +++++++++++ srcpkgs/monkey/template | 21 ++++++++++----------- 3 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 srcpkgs/monkey/patches/addr-port.patch create mode 100644 srcpkgs/monkey/patches/filename.patch diff --git a/srcpkgs/monkey/patches/addr-port.patch b/srcpkgs/monkey/patches/addr-port.patch new file mode 100644 index 00000000000..45ef5223098 --- /dev/null +++ b/srcpkgs/monkey/patches/addr-port.patch @@ -0,0 +1,11 @@ +--- a/plugins/fastcgi/fcgi_handler.c ++++ b/plugins/fastcgi/fcgi_handler.c +@@ -245,7 +245,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, + sizeof(addr4.sin_addr.s_addr)); diff --git a/srcpkgs/monkey/patches/filename.patch b/srcpkgs/monkey/patches/filename.patch new file mode 100644 index 00000000000..33fb31f005a --- /dev/null +++ b/srcpkgs/monkey/patches/filename.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,7 +15,7 @@ include(GNUInstallDirs) + + # Set default compiler options + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra") +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__file__") + + # Monkey Version + set(MK_VERSION_MAJOR 1) diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template index 08f57ec9451..6acd9a87971 100644 --- a/srcpkgs/monkey/template +++ b/srcpkgs/monkey/template @@ -1,14 +1,13 @@ # Template file for 'monkey' pkgname=monkey version=1.6.9 -revision=5 -build_style=configure -configure_args="--prefix=/usr --sbindir=/usr/bin - --libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname - --sysconfdir=/etc/monkey/ --enable-plugins=mbedtls --malloc-libc - --webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey - --pidfile=/var/run/monkey.pid --logdir=/var/log/monkey" -hostmakedepends="cmake" +revision=6 +build_style=cmake +configure_args="-DINSTALL_SYSCONFDIR=/etc/monkey/ -DWITH_PLUGINS=mbedtls + -DWITH_SYSTEM_MALLOC=ON -DINSTALL_WEBROOTDIR=/srv/www/monkey + -DCMAKE_INSTALL_LIBDIR=/usr/lib$XBPS_TARGET_WORDSIZE/monkey + -DDEFAULT_USER=_monkey -DPID_FILE=/var/run/monkey.pid + -DINSTALL_LOGDIR=/var/log/monkey" makedepends="mbedtls2-devel" short_desc="Cross-arch embeddable lightweight HTTP server" maintainer="Orphaned " @@ -34,9 +33,9 @@ make_dirs=" CFLAGS="-fcommon" -case $XBPS_TARGET_MACHINE in - *-musl) configure_args+=" --musl-mode --no-backtrace ";; -esac +if [ $XBPS_TARGET_LIBC = musl ]; then + configure_args+=" -DWITH_MUSL=ON -DWITH_BACKTRACE=OFF" +fi post_install() { vmkdir usr/share/monkey/webroot