From 45b327ba1620febf3dd8a8b415d601c9c9e78bc5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Aug 2020 21:55:54 -0700 Subject: monkey: Upgrade to 1.6.9 Switch to using cmake Use CMake option to select musl support Signed-off-by: Khem Raj --- .../recipes-httpd/monkey/monkey_1.5.6.bb | 77 --------------------- .../recipes-httpd/monkey/monkey_1.6.9.bb | 78 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 77 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb create mode 100644 meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb deleted file mode 100644 index 559d251bdf..0000000000 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY = "Fast and Lightweight HTTP Server for Linux" -HOMEPAGE = "http://monkey-project.com" -BUGTRACKER = "https://github.com/monkey/monkey/issues" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -SECTION = "net" - -DEPENDS_append_libc-musl = " libexecinfo" - -SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \ - file://0001-configure-Respect-LIBS-variable-from-env.patch \ - file://monkey.service \ - file://monkey.init" - -SRC_URI[md5sum] = "9699e4c9ea6ce6b989907c252ae80254" -SRC_URI[sha256sum] = "7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22" - -UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+).tar.gz" - -EXTRA_OECONF = "--plugdir=${libdir}/monkey/ \ - --logdir=${localstatedir}/log/monkey/ \ - --pidfile=${localstatedir}/run/monkey.pid \ - --default-user=www-data \ - --datadir=${localstatedir}/www/monkey/ \ - --sysconfdir=${sysconfdir}/monkey/ \ - --enable-plugins=* \ - --disable-plugins=mbedtls \ - --debug \ - --malloc-libc" - -do_configure_prepend_libc-musl() { - export LIBS="-lexecinfo" -} - -DISABLE_STATIC = "" -CLEANBROKEN = "1" - -inherit autotools-brokensep pkgconfig update-rc.d systemd - -INITSCRIPT_NAME = "monkey" -INITSCRIPT_PARAMS = "defaults 70" - -SYSTEMD_SERVICE_${PN} = "monkey.service" - -FILES_${PN} += "${localstatedir}/www/monkey/" - -CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ - ${sysconfdir}/monkey/sites/default \ - ${sysconfdir}/monkey/monkey.mime \ - ${sysconfdir}/monkey/plugins.load \ - ${sysconfdir}/monkey/plugins/proxy_reverse/proxy_reverse.conf \ - ${sysconfdir}/monkey/plugins/mandril/mandril.conf \ - ${sysconfdir}/monkey/plugins/fastcgi/fastcgi.conf \ - ${sysconfdir}/monkey/plugins/logger/logger.conf \ - ${sysconfdir}/monkey/plugins/cgi/cgi.conf \ - ${sysconfdir}/monkey/plugins/cheetah/cheetah.conf \ - ${sysconfdir}/monkey/plugins/dirlisting/dirhtml.conf \ - ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/header.theme \ - ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/footer.theme \ - ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/entry.theme \ - ${sysconfdir}/monkey/plugins/auth/README \ - ${sysconfdir}/monkey/plugins/auth/monkey.users \ - " - -do_install_append() { - - mkdir -p ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system - fi -} diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb new file mode 100644 index 0000000000..289f069b1e --- /dev/null +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -0,0 +1,78 @@ +SUMMARY = "Fast and Lightweight HTTP Server for Linux" +HOMEPAGE = "http://monkey-project.com" +BUGTRACKER = "https://github.com/monkey/monkey/issues" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +SECTION = "net" + +SRC_URI = "http://monkey-project.com/releases/1.6/monkey-${PV}.tar.gz \ + file://monkey.service \ + file://monkey.init" + +SRC_URI[sha256sum] = "f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb" + +UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" +UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+).tar.gz" + +EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ + -DPID_FILE=${localstatedir}/run/monkey.pid \ + -DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \ + -DWITH_PLUGINS=* \ + -DWITHOUT_PLUGINS=mbedtls \ + -DWITH_DEBUG=1 \ + -DDEFAULT_USER='www-data' \ + -DWITH_SYSTEM_MALLOC=1 \ + " + +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_install_append() { + rm -rf ${D}/run + install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -Dm 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service + fi +} + +INITSCRIPT_NAME = "monkey" +INITSCRIPT_PARAMS = "defaults 70" + +SYSTEMD_SERVICE_${PN} = "monkey.service" + +PACKAGES += "${PN}-plugins" + +FILES_${PN}-plugins = "${libdir}/monkey-*.so" + +FILES_${PN} += "${localstatedir}/www/monkey/ /run" + + +CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ + ${sysconfdir}/monkey/sites/default \ + ${sysconfdir}/monkey/monkey.mime \ + ${sysconfdir}/monkey/plugins.load \ + ${sysconfdir}/monkey/plugins/proxy_reverse/proxy_reverse.conf \ + ${sysconfdir}/monkey/plugins/mandril/mandril.conf \ + ${sysconfdir}/monkey/plugins/fastcgi/fastcgi.conf \ + ${sysconfdir}/monkey/plugins/logger/logger.conf \ + ${sysconfdir}/monkey/plugins/cgi/cgi.conf \ + ${sysconfdir}/monkey/plugins/cheetah/cheetah.conf \ + ${sysconfdir}/monkey/plugins/dirlisting/dirhtml.conf \ + ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/header.theme \ + ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/footer.theme \ + ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/entry.theme \ + ${sysconfdir}/monkey/plugins/auth/README \ + ${sysconfdir}/monkey/plugins/auth/monkey.users \ + " + -- cgit v1.2.3-54-g00ecf