diff options
Diffstat (limited to 'meta-openembedded/meta-webserver')
14 files changed, 78 insertions, 133 deletions
diff --git a/meta-openembedded/meta-webserver/conf/layer.conf b/meta-openembedded/meta-webserver/conf/layer.conf index 24469115e..94489983e 100644 --- a/meta-openembedded/meta-webserver/conf/layer.conf +++ b/meta-openembedded/meta-webserver/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_webserver = "gatesgarth" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb b/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb index f5d5debe1..e3e68582c 100644 --- a/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb +++ b/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb @@ -19,20 +19,31 @@ RDEPENDS_packagegroup-meta-webserver = "\ " RDEPENDS_packagegroup-meta-webserver-http = "\ - nginx monkey hiawatha nostromo apache-websocket \ - apache2 sthttpd \ + apache-websocket \ + apache2 \ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "cherokee", "", d)} \ - " + hiawatha \ + monkey \ + nginx \ + nginx \ + nostromo \ + sthttpd \ +" RDEPENDS_packagegroup-meta-webserver-php = "\ - phpmyadmin xdebug \ - " + phpmyadmin \ + xdebug \ +" RDEPENDS_packagegroup-meta-webserver-support = "\ - spawn-fcgi fcgi \ - " + spawn-fcgi \ + fcgi \ +" RDEPENDS_packagegroup-meta-webserver-webadmin = "\ - netdata webmin \ - " + cockpit \ + webmin \ + netdata \ +" + EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb index 3cbab22c3..0ef2bd7f4 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb @@ -13,9 +13,9 @@ RDEPENDS_${PN} += "apache2" # fork contains patches from the modules ML and fixes CVE compliance issues SRC_URI = "git://github.com/jchampio/apache-websocket.git" -SRCREV = "6968083264b90b89b1b9597a4ca03ba29e7ea2e1" +SRCREV = "0ee34c77fc78ff08fd548706300b80a7bc7874e4" -PV = "0.1.1+git${SRCPV}" +PV = "0.1.2+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb index a7083d80e..197cb83e6 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb @@ -26,8 +26,8 @@ SRC_URI_append_class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[md5sum] = "791c986b1e70fe61eb44060aacc89a64" -SRC_URI[sha256sum] = "a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43" +SRC_URI[md5sum] = "7d661ea5e736dac5e2761d9f49fe8361" +SRC_URI[sha256sum] = "740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea" S = "${WORKDIR}/httpd-${PV}" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb index ed3df1939..89910841f 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb @@ -10,8 +10,8 @@ SRC_URI = "http://hiawatha-webserver.org/files/${BP}.tar.gz \ file://hiawatha-init \ file://hiawatha.service " -SRC_URI[md5sum] = "3bf2c12c7037ecc3dfdbec72e7a2f04f" -SRC_URI[sha256sum] = "b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9" +SRC_URI[md5sum] = "6dcec72e94facbdc69b103006fa5819f" +SRC_URI[sha256sum] = "79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727" INITSCRIPT_NAME = "hiawatha" INITSCRIPT_PARAMS = "defaults 70" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init index 40b21182e..55446f0e8 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init @@ -1,7 +1,7 @@ #!/bin/sh PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/bin/monkey +DAEMON=/usr/sbin/monkey NAME=monkey DESC="Monkey HTTP Server" OPTS="--daemon" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service index f9aa57f91..4f3b7be4e 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service @@ -4,7 +4,7 @@ After=network.target remote-fs.target [Service] Type=forking -ExecStart=/usr/bin/monkey --daemon +ExecStart=/usr/sbin/monkey --daemon PIDFile=/var/run/monkey.pid.2001 TimeoutSec=10 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index 559d251bd..698f8608f 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -7,45 +7,57 @@ 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 \ +SRC_URI = "http://monkey-project.com/releases/1.6/monkey-${PV}.tar.gz \ file://monkey.service \ file://monkey.init" -SRC_URI[md5sum] = "9699e4c9ea6ce6b989907c252ae80254" -SRC_URI[sha256sum] = "7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22" +SRC_URI[sha256sum] = "f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb" UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" UPSTREAM_CHECK_REGEX = "v(?P<pver>\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" -} +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 = "" -CLEANBROKEN = "1" -inherit autotools-brokensep pkgconfig update-rc.d systemd +inherit cmake pkgconfig update-rc.d systemd + +OECMAKE_GENERATOR = "Unix Makefiles" + +do_install_append() { + rm -rf ${D}/run + rm -rf ${D}${localstatedir}/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" -FILES_${PN} += "${localstatedir}/www/monkey/" +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 \ @@ -65,13 +77,3 @@ CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ ${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-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.7.bb b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb index d13ef74fe..e726c9ac6 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.7.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb @@ -11,8 +11,8 @@ SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ file://nostromo \ " -SRC_URI[md5sum] = "6189714845b3ad5d0fc490f8cf48dacf" -SRC_URI[sha256sum] = "33c635f317fb441e10d5297bb4218ae0ea62c48f2fc3029c08f5d2167c6cdfca" +SRC_URI[md5sum] = "a054eb8e09560082793aaad676e33bd3" +SRC_URI[sha256sum] = "1fad0a28d934835b582cedc98857e12e5adb991b14b87b52b39e6a501f4a9486" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb b/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb index 1d66d1301..808d4528c 100644 --- a/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb +++ b/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb @@ -1,4 +1,4 @@ -SUMMARRY = "spawn-fcgi is used to spawn FastCGI applications" +SUMMARY = "spawn-fcgi is used to spawn FastCGI applications" HOMEPAGE = "http://redmine.lighttpd.net/projects/spawn-fcgi" LICENSE = "BSD-3-Clause" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb index 62b7a188b..f06588a75 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb @@ -10,8 +10,8 @@ SRC_URI += " \ file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \ file://cockpit.pam \ " -SRC_URI[md5sum] = "285383b8744dab93ac8814e5a23e2c3e" -SRC_URI[sha256sum] = "111d477e54737f15467c365fa670f9ac1919be30ad0c93661692467ecd7f12fb" +SRC_URI[md5sum] = "beb88d8e70ee1da6ebd917c956217803" +SRC_URI[sha256sum] = "afc82acc8ef9d51e0f34265a07a2f059f5b71a1df721b299e657a40a098cbb7f" inherit gettext pkgconfig autotools systemd features_check @@ -36,9 +36,14 @@ EXTRA_OECONF = " \ --with-systemdunitdir=${systemd_system_unitdir} \ " +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ +" + PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp" PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" PACKAGECONFIG[storaged] = ",,,udisks2" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" PACKAGES =+ " \ ${PN}-pcp \ diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch deleted file mode 100644 index c4be8270c..000000000 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ccaf4225239c3092a51cf44f2ab0a2141b8a5fa6 Mon Sep 17 00:00:00 2001 -From: Luca Palano <github@lpzone.it> -Date: Wed, 5 Dec 2018 10:36:52 +0100 -Subject: [PATCH 1/2] Correct of timeout issue - -The timeout issue has been disabled - -Signed-off-by: Luca Palano <github@lpzone.it> ---- - collectors/charts.d.plugin/charts.d.plugin.in | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in -index 0df6c30c..63ea4506 100755 ---- a/collectors/charts.d.plugin/charts.d.plugin.in -+++ b/collectors/charts.d.plugin/charts.d.plugin.in -@@ -156,7 +156,7 @@ restart_timeout=$((3600 * 4)) - dryrunner=0 - - # check for timeout command --check_for_timeout=1 -+check_for_timeout=0 - - # the default enable/disable value for all charts - enable_all_charts="yes" -@@ -251,9 +251,10 @@ time_divisor=$((time_divisor)) - # timeout command we use, providing a function that - # can emulate the timeout command we need: - # > timeout SECONDS command ... --if [ $check_for_timeout -eq 1 ]; then -- require_cmd timeout || exit 1 --fi -+#if [ $check_for_timeout -eq 1 ] -+# then -+# require_cmd timeout || exit 1 -+#fi - - # ----------------------------------------------------------------------------- - # internal checks --- -2.20.1 (Apple Git-117) - diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch deleted file mode 100644 index f0887fed0..000000000 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 95e1da77de80e38068bb2739faeaad49105700cf Mon Sep 17 00:00:00 2001 -From: Luca Palano <github@lpzone.it> -Date: Mon, 15 Jul 2019 10:16:32 +0200 -Subject: [PATCH 2/2] Makefiles does not build contrib - -Signed-off-by: Luca Palano <github@lpzone.it> ---- - Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index bc928bba..ba9edc6b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -54,7 +54,6 @@ dist_noinst_DATA= \ - CHANGELOG.md \ - cppcheck.sh \ - configs.signatures \ -- contrib \ - netdata.cppcheck \ - netdata.spec \ - package.json \ --- -2.20.1 (Apple Git-117) diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb index d6a5ce066..ee4a7c1e3 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -3,15 +3,9 @@ SUMMARY = "Real-time performance monitoring" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" -SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \ - file://0002-Makefiles-does-not-build-contrib-dir.patch \ -" -SRCREV = "588ce5a7b18999dfa66698cd3a2f005f7a3c31cf" -PV = "1.17.0" - -# patch to disable timeout because timeout are not available with actual version -# of core-utils -SRC_URI += "file://0001-Correct-timeout-issue.patch" +SRC_URI = "git://github.com/firehol/netdata.git;protocol=https" +SRCREV = "1be9200ba8e11dc81a2101d85a2725137d43f766" +PV = "1.22.1" # default netdata.conf for netdata configuration SRC_URI += "file://netdata.conf" @@ -21,7 +15,7 @@ SRC_URI += "file://netdata.service" S = "${WORKDIR}/git" -DEPENDS += "zlib util-linux" +DEPENDS += "zlib util-linux libuv" inherit pkgconfig autotools-brokensep useradd systemd @@ -58,5 +52,4 @@ do_install_append() { sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf } -FILES_${PN}-dbg += "${libexecdir}/netdata/plugins.d/.debug" RDEPENDS_${PN} = "bash zlib" |