21 files changed, 71 insertions, 317 deletions

diff --git a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
index 4dbf595c19..b93fa2d186 100644
--- a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
+++ b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
@@ -17,7 +17,6 @@ SRCREV = "0ee34c77fc78ff08fd548706300b80a7bc7874e4"
 
 PV = "0.1.2+git"
 
-S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 
diff --git a/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb b/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb
index 5fac0a6ed4..aca6d598f8 100644
--- a/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb
+++ b/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb
@@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 DEPENDS = "apache2 avahi"
 
-SRC_URI = "git://git.0pointer.de/mod_dnssd;protocol=git;branch=master"
+SRC_URI = "git://git.0pointer.net/mod_dnssd.git;protocol=https;branch=master"
 SRCREV = "be2fb9f6158f800685de7a1bc01c39b6cf1fa12c"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF = "--disable-lynx"
 
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch b/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch
index bbe8b325b5..64edeb5936 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch
@@ -1,4 +1,4 @@
-From 5074ab3425e5f1e01fd9cfa2d9b7300ea1b3f38f Mon Sep 17 00:00:00 2001
+From d1f0389e699e64f3e329c0ce509f79d969a76114 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
 Date: Tue, 17 Jul 2012 11:27:39 +0100
 Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory is
@@ -16,10 +16,10 @@ Note: upstreaming was discussed but there are competing desires;
  1 file changed, 19 insertions(+)
 
 diff --git a/server/core.c b/server/core.c
-index 090e397..3020090 100644
+index 843b973..3b50100 100644
 --- a/server/core.c
 +++ b/server/core.c
-@@ -5107,6 +5107,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
+@@ -5143,6 +5143,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
      }
      apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper,
                                apr_pool_cleanup_null);
@@ -45,6 +45,3 @@ index 090e397..3020090 100644
      return OK;
  }
  
--- 
-2.25.1
-
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch b/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch
index 1abbe0c41f..f8fbc4f3c9 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch
@@ -1,4 +1,4 @@
-From e47cc405eadcbe37a579c375e824e20a5c53bfad Mon Sep 17 00:00:00 2001
+From b31cf12566e806e9e9c3aa01029f6bae3ada0729 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
 Date: Tue, 17 Jul 2012 11:27:39 +0100
 Subject: [PATCH] Log the SELinux context at startup.
@@ -14,7 +14,7 @@ Note: unlikely to be any interest in this upstream
  2 files changed, 31 insertions(+)
 
 diff --git a/configure.in b/configure.in
-index 352711a..f58620f 100644
+index 6319903..bffd8a1 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -514,6 +514,11 @@ gettid
@@ -30,7 +30,7 @@ index 352711a..f58620f 100644
    # On Linux before glibc 2.30, gettid() is only usable via syscall()
    AC_CACHE_CHECK([for gettid() via syscall], ap_cv_gettid,
 diff --git a/server/core.c b/server/core.c
-index 30b317e..81f145f 100644
+index 3b50100..e0c7c7f 100644
 --- a/server/core.c
 +++ b/server/core.c
 @@ -65,6 +65,10 @@
@@ -44,7 +44,7 @@ index 30b317e..81f145f 100644
  /* LimitRequestBody handling */
  #define AP_LIMIT_REQ_BODY_UNSET         ((apr_off_t) -1)
  #define AP_DEFAULT_LIMIT_REQ_BODY       ((apr_off_t) 1<<30) /* 1GB */
-@@ -5139,6 +5143,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
+@@ -5162,6 +5166,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
      }
  #endif
  
@@ -73,5 +73,3 @@ index 30b317e..81f145f 100644
      return OK;
  }
  
---
-2.40.0
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch b/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch
index dc5b5c88f2..4bc2ad6d3e 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch
@@ -1,4 +1,4 @@
-From 443d15b91d4e4979d92405610303797663f31102 Mon Sep 17 00:00:00 2001
+From 980eadecc128bbbe1233e5d89268be24d14e1873 Mon Sep 17 00:00:00 2001
 From: echo <fei.geng@windriver.com>
 Date: Tue, 28 Apr 2009 03:11:06 +0000
 Subject: [PATCH] Fix perl install directory to /usr/bin
@@ -16,10 +16,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index 4df3ff3..4eeb609 100644
+index 4ce0fee..0362f52 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -903,10 +903,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
+@@ -936,10 +936,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
  AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
         [Location of the MIME types config file, relative to the Apache root directory])
  
@@ -31,6 +31,3 @@ index 4df3ff3..4eeb609 100644
  AC_SUBST(perlbin)
  
  dnl If we are running on BSD/OS, we need to use the BSD .include syntax.
--- 
-2.25.1
-
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb
index 1632c6ccb1..2b4ae41d95 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb
@@ -27,9 +27,9 @@ SRC_URI:append:class-target = " \
            "
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
-SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323"
+SRC_URI[sha256sum] = "88fc236ab99b2864b248de7d49a008ec2afd7551e64dce8b95f58f32f94c46ab"
 
-S = "${WORKDIR}/httpd-${PV}"
+S = "${UNPACKDIR}/httpd-${PV}"
 
 inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header
 
@@ -37,12 +37,24 @@ DEPENDS = "openssl expat pcre apr apr-util apache2-native "
 
 CVE_PRODUCT = "apache:http_server"
 
+CVE_STATUS[CVE-1999-0289] = "not-applicable-platform: The current version is not affected. It only applies for Windows"
+CVE_STATUS[CVE-1999-0678] = "not-applicable-platform: this CVE is for Debian packaging configuration"
+CVE_STATUS[CVE-1999-1237] = "cpe-incorrect: This is vulnerability of Apache AuthenSmb module, fixed in 0.9"
+CVE_STATUS[CVE-1999-1412] = "not-applicable-platform: this CVE is for MAC OS X specific problem"
+CVE_STATUS[CVE-2007-0086] = "disputed: this CVE is officially disputed by Redhat"
+CVE_STATUS[CVE-2007-0450] = "not-applicable-platform: The current version is not affected. It only applies for Windows."
+CVE_STATUS[CVE-2007-6421] = "cpe-incorrect: The current version is not affected by the CVE which affects versions from 2.2 (incl.) to 2.2.8 (excl.)"
+CVE_STATUS[CVE-2007-6422] = "cpe-incorrect: The current version is not affected by the CVE which affects versions from 2.2 (incl.) to 2.2.8 (excl.)"
+CVE_STATUS[CVE-2007-6423] = "cpe-incorrect: The current version is not affected by the CVE which affects versions from 2.2.x to 2.2.7-dev"
+CVE_STATUS[CVE-2008-2168] = "cpe-incorrect: The current version is not affected by the CVE which affects versions up to 2.2.6 (excl.)"
+CVE_STATUS[CVE-2010-0425] = "not-applicable-platform: The current version is not affected. It only applies for Windows."
+
 SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice"
 
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
 PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap"
-PACKAGECONFIG[zlib] = "--enable-deflate,,zlib,zlib"
+PACKAGECONFIG[zlib] = "--enable-deflate --with-zlib=${STAGING_LIBDIR}/../,,zlib,zlib"
 
 CFLAGS:append = " -DPATH_MAX=4096"
 
@@ -126,7 +138,7 @@ do_install:append:class-target() {
     sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
            -e 's,${DEBUG_PREFIX_MAP},,g' \
            -e 's,${RECIPE_SYSROOT},,g' \
-           -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \
+           -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \
            -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \
            -e 's,${WORKDIR}/recipe-sysroot/,,g' \
            -e 's,".*/configure","configure",g' ${D}${libexecdir}/${PN}/build/config.nice
@@ -182,6 +194,10 @@ INITSCRIPT_PARAMS = "defaults 91 20"
 SYSTEMD_SERVICE:${PN} = "apache2.service"
 SYSTEMD_AUTO_ENABLE:${PN} = "enable"
 
+ALTERNATIVE:${PN} = "httpd"
+ALTERNATIVE_LINK_NAME[httpd] = "${sbindir}/httpd"
+ALTERNATIVE_PRIORITY[httpd] = "60"
+
 ALTERNATIVE:${PN}-doc = "htpasswd.1"
 ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1"
 
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch
deleted file mode 100644
index 0f43842752..0000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c73415021f3f3b2b30062ab74b25fe49c51c2242 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 10 Nov 2019 15:59:44 -0800
-Subject: [PATCH] common-internal.h: Define LLONG_MAX if undefined
-
-time_t can also be long long type, therefore check for that as fallback
-Fixes build on 32bit hosts where time_t is fixed for Y2K38
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- cherokee/common-internal.h | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/cherokee/common-internal.h b/cherokee/common-internal.h
-index 5c28da97..5646ec0f 100644
---- a/cherokee/common-internal.h
-+++ b/cherokee/common-internal.h
-@@ -222,6 +222,16 @@ char *strcasestr(char *s, char *find);
- # endif
- #endif
- 
-+/* Long Long limit
-+ */
-+#ifndef LLONG_MAX
-+# if (__SIZEOF_LONG_LONG__ == 8)
-+#  define LLONG_MAX 0x7fffffffffffffffLL
-+# else
-+#  error "Can't define LLONG_MAX"
-+# endif
-+#endif
-+
- /* time_t limit
-  */
- #ifndef TIME_MAX
-@@ -229,6 +239,8 @@ char *strcasestr(char *s, char *find);
- #  define TIME_MAX ((time_t)INT_MAX)
- # elif (SIZEOF_TIME_T == SIZEOF_LONG)
- #  define TIME_MAX ((time_t)LONG_MAX)
-+# elif (SIZEOF_TIME_T == __SIZEOF_LONG_LONG__)
-+#  define TIME_MAX ((time_t)LLONG_MAX)
- # else
- #  error "Can't define TIME_MAX"
- # endif
--- 
-2.24.0
-
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch
deleted file mode 100644
index b16060f2a1..0000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4591b5b40d66c19edc73b951ad091dac639454c9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 25 Jul 2017 16:00:34 -0700
-Subject: [PATCH] configure.ac: Add foreign to AM_INIT_AUTOMAKE
-
-Fixes errors like
-| Makefile.am: error: required file './README' not found
-| Makefile.am: error: required file './ChangeLog' not found
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d6298f27..98cab791 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ dnl Init autoconf and automake
- AC_INIT([cherokee], [cherokee_version], [http://bugs.cherokee-project.com/], [cherokee])
- AC_CONFIG_SRCDIR([cherokee/server.c])
- AC_CONFIG_MACRO_DIR([m4])
--AM_INIT_AUTOMAKE([no-define])
-+AM_INIT_AUTOMAKE([no-define foreign])
- 
- dnl Define version
- AC_DEFINE(PACKAGE_MAJOR_VERSION, "cherokee_major_version", [Version string])
--- 
-2.13.3
-
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch
deleted file mode 100644
index 1d6a2182bd..0000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e9ae3231ec188df801fe51aa95d6afec2e52db58 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 25 Jul 2017 16:14:19 -0700
-Subject: [PATCH] make: Do not build po files
-
-Target fails to build
-
-Upstream-Status: Inappropriate [Cross-compile specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index f01278c3..eb864c36 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- ## Cherokee: Makefile.am  -*- makefile -*-
- 
--SUBDIRS = po m4 www icons themes qa doc . admin contrib cherokee cget packages dbslayer
-+SUBDIRS = m4 www icons themes qa doc . admin contrib cherokee cget packages dbslayer
- SUFFIXES = .sample.pre .sample .h.pre .h .xml.pre .xml
- ACLOCAL_AMFLAGS = -I m4
- 
--- 
-2.13.3
-
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch
deleted file mode 100644
index 3336f7df79..0000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 98a0f19df0a31d5649ad89d395fd1b8de5591827 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Thu, 3 Apr 2014 21:33:25 +0800
-Subject: [PATCH] admin/Makefile.am: only install configured.py once
-
-Both the two rules install-adminpyDATA and install-generatedDATA will
-install the configured.py to the same location, they can run parallel,
-and they use "install -m", which would might build failures:
-
-/usr/bin/install: setting permissions for `/path/to/configured.py': No such file or directory
-
-This is because the first install is setting the permission while the
-second install is removing the file an re-install.
-
-Only install the configured.py once will fix the problem, I think that
-there is no side effect since it installed the same file to the same
-location twice in the past.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- admin/Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/admin/Makefile.am b/admin/Makefile.am
-index ce5937b..6f96934 100644
---- a/admin/Makefile.am
-+++ b/admin/Makefile.am
-@@ -73,7 +73,6 @@ SystemStatsWidgets.py \
- Wizard.py \
- XMLServerDigest.py \
- config_version.py \
--configured.py \
- consts.py \
- util.py \
- popen.py \
--- 
-1.8.2.1
-
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
deleted file mode 100644
index 93603b84db..0000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/cherokee
-CONFIG=/etc/cherokee/cherokee.conf
-PIDFILE=/var/run/cherokee.pid
-NAME="cherokee"
-DESC="Cherokee http server"
-
-test -r /etc/default/cherokee && . /etc/default/cherokee
-test -x "$DAEMON" || exit 0
-test ! -r "$CONFIG" && exit 0
-        
-case "$1" in
-  start)
-    echo "Starting $DESC: "
-    start-stop-daemon --oknodo -S -x $DAEMON -- -d -C $CONFIG
-    ;;
-
-  stop)
-    echo "Stopping $DESC:"
-    start-stop-daemon -K -p $PIDFILE
-    ;;
-
-  restart)
-    $0 stop >/dev/null 2>&1
-    $0 start
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 0
-    ;;
-esac
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service
deleted file mode 100644
index a2d703185d..0000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Cherokee web server
-After=syslog.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
deleted file mode 100644
index 53d6a85ae7..0000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-SUMMARY = "Cherokee Web Server fast and secure"
-SUMMARY:cget = "Small downloader based in the Cherokee client library"
-HOMEPAGE = "http://www.cherokee-project.com/"
-SECTION = "network"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-
-SRCREV = "9a75e65b876bcc376cb6b379dca1f7ce4a055c59"
-PV = "1.2.104+git"
-SRC_URI = "git://github.com/cherokee/webserver;branch=master;protocol=https \
-           file://cherokee.init \
-           file://cherokee.service \
-           file://cherokee-install-configured.py-once.patch \
-           file://0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch \
-           file://0001-make-Do-not-build-po-files.patch \
-           file://0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch \
-"
-
-S = "${WORKDIR}/git"
-
-inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
-PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav"
-PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
-PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-
-EXTRA_OECONF = "--disable-static \
-                --disable-nls \
-               ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
-               --with-wwwroot=${localstatedir}/www/cherokee \
-"
-
-do_install:append () {
-    install -m 0755 -d ${D}${sysconfdir}/init.d
-    install -m 755 ${UNPACKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee
-
-    # clean up .la files for plugins
-    rm -f ${D}${libdir}/cherokee/*.la
-
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${UNPACKDIR}/cherokee.service ${D}${systemd_unitdir}/system
-    rmdir "${D}${localstatedir}/run"
-    rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
-}
-
-# Put -dev near the front so we can move the .la files into it with a wildcard
-PACKAGES =+ "libcherokee-server libcherokee-client libcherokee-base cget"
-
-FILES:cget = "${bindir}/cget"
-FILES:libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}"
-FILES:libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}"
-FILES:libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}"
-
-# Pack the htdocs
-FILES:${PN} += "${localstatedir}/www/cherokee"
-
-CONFFILES:${PN} = " \
-                   ${sysconfdir}/cherokee/cherokee.conf \
-                   ${sysconfdir}/init.d/cherokee \
-"
-
-INITSCRIPT_NAME = "cherokee"
-INITSCRIPT_PARAMS = "defaults 91 91"
-
-RPROVIDES:${PN} += "${PN}-systemd"
-RREPLACES:${PN} += "${PN}-systemd"
-RCONFLICTS:${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE:${PN} = "cherokee.service"
-
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
-
-CVE_PRODUCT += "cherokee_web_server"
diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.2.bb
index 1111ef6f56..098c07e954 100644
--- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb
+++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.2.bb
@@ -1,17 +1,16 @@
 SUMMARY = "Lightweight secure web server"
-HOMEPAGE = "http://www.hiawatha-webserver.org"
+HOMEPAGE = "https://hiawatha.leisink.net/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS = "libxml2 libxslt virtual/crypt"
 
 SECTION = "net"
 
-SRC_URI = "http://hiawatha-webserver.org/files/hiawatha-10/${BP}.tar.gz \
+SRC_URI = "https://hiawatha.leisink.net/files/hiawatha-${PV}.tar.gz \
            file://hiawatha-init \
            file://hiawatha.service "
 
-SRC_URI[md5sum] = "d9e282be06ed456207726b7ac0df9d48"
-SRC_URI[sha256sum] = "61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d"
+SRC_URI[sha256sum] = "99c64f76927f93469f062ab76b74eb79a397ea4be12da86bf746b2bb57cf1bc5"
 
 INITSCRIPT_NAME = "hiawatha"
 INITSCRIPT_PARAMS = "defaults 70"
@@ -20,6 +19,8 @@ SYSTEMD_SERVICE:${PN} = "hiawatha.service"
 
 inherit cmake update-rc.d systemd
 
+CFLAGS += "-std=gnu17"
+
 EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \
                   -DENABLE_CACHE=OFF \
                   -DENABLE_DEBUG=OFF \
diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb
index 5bf6373a81..d593b7092b 100644
--- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb
+++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Fast and Lightweight HTTP Server for Linux"
-HOMEPAGE = "http://monkey-project.com"
+HOMEPAGE = "https://github.com/monkey/monkey/issues/414"
 BUGTRACKER = "https://github.com/monkey/monkey/issues"
 
 LICENSE = "Apache-2.0"
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/monkey/monkey;branch=1.6;protocol=https \
            file://monkey.init"
 
 SRCREV = "7999b487fded645381d387ec0e057e92407b0d2c"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases"
 UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz"
@@ -90,3 +89,5 @@ CONFFILES:${PN} = "${sysconfdir}/monkey/monkey.conf \
                    ${sysconfdir}/monkey/plugins/auth/monkey.users \
                    "
 
+CVE_STATUS[CVE-2013-2183] = "cpe-incorrect: Current version (1.6.9) is not affected. Issue was addressed in version 1.3.0"
+CVE_STATUS[CVE-2013-1771] = "not-applicable-platform: this is gentoo specific CVE"
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc
index 2714c3d22f..bcc384bd8a 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -38,7 +38,7 @@ NGINX_USER   ?= "www"
 EXTRA_OECONF = ""
 DISABLE_STATIC = ""
 
-PACKAGECONFIG ??= "ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG ??= "ssl fastcgi scgi uwsgi ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 
 PACKAGECONFIG[gunzip] = "--with-http_gunzip_module,,"
 PACKAGECONFIG[http2] = "--with-http_v2_module,,"
@@ -48,7 +48,9 @@ PACKAGECONFIG[ipv6] = "--with-ipv6,,"
 PACKAGECONFIG[webdav] = "--with-http_dav_module,,"
 PACKAGECONFIG[stream] = "--with-stream,,"
 PACKAGECONFIG[http-sub-module] = "--with-http_sub_module,,"
-
+PACKAGECONFIG[fastcgi] = ",--without-http_fastcgi_module,"
+PACKAGECONFIG[scgi] = ",--without-http_scgi_module,"
+PACKAGECONFIG[uwsgi] = ",--without-http_uwsgi_module,"
 PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt"
 
 do_configure () {
@@ -81,9 +83,9 @@ do_configure () {
     --error-log-path=${localstatedir}/log/nginx/error.log \
     --http-client-body-temp-path=/run/nginx/client_body_temp \
     --http-proxy-temp-path=/run/nginx/proxy_temp \
-    --http-fastcgi-temp-path=/run/nginx/fastcgi_temp \
-    --http-uwsgi-temp-path=/run/nginx/uwsgi_temp \
-    --http-scgi-temp-path=/run/nginx/scgi_temp \
+    ${@bb.utils.contains('PACKAGECONFIG', 'fastcgi', '--http-fastcgi-temp-path=/run/nginx/fastcgi_temp', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'scgi', '--http-scgi-temp-path=/run/nginx/scgi_temp', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'uwsgi', '--http-uwsgi-temp-path=/run/nginx/uwsgi_temp', '', d)} \
     --pid-path=/run/nginx/nginx.pid \
     --prefix=${prefix} \
     --with-threads \
@@ -132,6 +134,18 @@ do_install () {
     # cleanup configuration folder
     rm ${D}${sysconfdir}/nginx/*.default
 
+    # remove config files based on packageconfig
+    if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'fastcgi', d)}" ]; then
+        rm -f ${D}${sysconfdir}/nginx/fastcgi.conf
+        rm -f ${D}${sysconfdir}/nginx/fastcgi_params
+    fi
+    if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'scgi', d)}" ]; then
+        rm -f ${D}${sysconfdir}/nginx/scgi_params
+    fi
+    if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'uwsgi', d)}" ]; then
+        rm -f ${D}${sysconfdir}/nginx/uwsgi_params
+    fi
+
     # add additional configuration folders
     install -d ${D}${sysconfdir}/nginx/modules-available
     install -d ${D}${sysconfdir}/nginx/modules-enabled
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
deleted file mode 100644
index d0371dd3cc..0000000000
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require nginx.inc
-
-# 1.24.x branch is the current stable branch, the recommended default
-# 1.25.x is the current mainline branches containing all new features
-DEFAULT_PREFERENCE = "-1"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d"
-
-SRC_URI[sha256sum] = "64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86"
-
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.26.3.bb
index 0ce940d429..7eab7ecdf5 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.26.3.bb
@@ -2,5 +2,5 @@ require nginx.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a6547d7e5628787ee2a9c5a3480eb628"
 
-SRC_URI[sha256sum] = "d2e6c8439d6c6db5015d8eaab2470ab52aef85a7bf363182879977e084370497"
+SRC_URI[sha256sum] = "69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa"
 
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.27.4.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.27.4.bb
new file mode 100644
index 0000000000..6c32ea7315
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.27.4.bb
@@ -0,0 +1,10 @@
+require nginx.inc
+
+# 1.26.x branch is the current stable branch, the recommended default
+# 1.27.x is the current mainline branches containing all new features
+DEFAULT_PREFERENCE = "-1"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3dc49537b08b14c8b66ad247bb4c4593"
+
+SRC_URI[sha256sum] = "294816f879b300e621fa4edd5353dd1ec00badb056399eceb30de7db64b753b2"
+
diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service b/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service
index f1095007c4..f181f30abb 100644
--- a/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service
+++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service
@@ -3,8 +3,8 @@ Description=Tiny/Turbo/Throttling Web Server
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/thttpd -C @@CONFFILE -c cgi-bin/* -i /var/run/thttpd.pid
-PIDFile=/var/run/thttpd.pid
+ExecStart=/usr/sbin/thttpd -C @@CONFFILE -c cgi-bin/* -i /run/thttpd.pid
+PIDFile=/run/thttpd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
index ec188cc482..9ff1772531 100644
--- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
+++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/blueness/${BPN};branch=master;protocol=https \
 UPSTREAM_CHECK_URI = "https://github.com/blueness/sthttpd/releases/"
 UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz"
 
-S = "${WORKDIR}/git"
 
 inherit autotools update-rc.d systemd update-alternatives