subtree updates

poky: 29afbb5e14..aa6cd06a9f:
  Alejandro Hernandez Samaniego (1):
        testimage: Fix error message to reflect new syntax

  Alex Kiernan (2):
        rust: Upgrade 1.66.1 -> 1.67.0
        rust: Add `update_snapshot` task to generate `rust-snapshot.inc`

  Alexander Kanavin (49):
        oeqa/qemurunner: do not use Popen.poll() when terminating runqemu with a signal
        ifupdown: update 0.8.39 -> 0.8.41
        python3-pip: update 22.3.1 -> 23.0
        diffutils: update 3.8 -> 3.9
        mc: update 4.8.28 -> 4.8.29
        xf86-video-vmware: update 13.3.0 -> 13.4.0
        lttng-tools: update 2.13.8 -> 2.13.9
        rt-tests: update 2.4 -> 2.5
        apr: update 1.7.0 -> 1.7.2
        apr-util: update 1.6.1 -> 1.6.3
        glib-2.0: upgrade 2.74.4 -> 2.74.5
        systemd: update 252.4 -> 252.5
        cmake: upgrade 3.25.1 -> 3.25.2
        python3-setuptools: update 65.7.0 -> 67.2.0
        lighttpd: upgrade 1.4.67 -> 1.4.68
        lsof: upgrade 4.96.5 -> 4.98.0
        igt-gpu-tools: upgrade 1.26 -> 1.27.1
        vulkan-headers: upgrade 1.3.236.0 -> 1.3.239.0
        vulkan-loader: upgrade 1.3.236.0 -> 1.3.239.0
        vulkan-tools: upgrade 1.3.236.0 -> 1.3.239.0
        spirv-tools: upgrade 1.3.236.0 -> 1.3.239.0
        glslang: upgrade 1.3.236.0 -> 1.3.239.0
        spirv-headers: upgrade 1.3.236.0 -> 1.3.239.0
        libxpm: upgrade 3.5.14 -> 3.5.15
        rng-tools: upgrade 6.15 -> 6.16
        fontconfig: upgrade 2.14.1 -> 2.14.2
        ncurses: upgrade 6.3+20220423 -> 6.4
        mpg123: upgrade 1.31.1 -> 1.31.2
        python3-pycryptodomex: upgrade 3.16.0 -> 3.17
        bind: upgrade 9.18.10 -> 9.18.11
        libjpeg-turbo: upgrade 2.1.4 -> 2.1.5
        pkgconf: upgrade 1.9.3 -> 1.9.4
        python3-pycryptodome: upgrade 3.16.0 -> 3.17
        python3-dtschema: upgrade 2022.12 -> 2023.1
        llvm: upgrade 15.0.6 -> 15.0.7
        puzzles: upgrade to latest revision
        dpkg: upgrade 1.21.18 -> 1.21.19
        shaderc: upgrade 2022.4 -> 2023.2
        sysstat: upgrade 12.6.1 -> 12.6.2
        piglit: upgrade to latest revision
        ltp: upgrade 20220930 -> 20230127
        linux-firmware: upgrade 20221214 -> 20230117
        libinput: upgrade 1.22.0 -> 1.22.1
        sudo: upgrade 1.9.12p1 -> 1.9.12p2
        diffoscope: upgrade 230 -> 234
        texinfo: upgrade 7.0.1 -> 7.0.2
        stress-ng: upgrade 0.15.02 -> 0.15.03
        libgit2: upgrade 1.5.0 -> 1.5.1
        python3-pathspec: upgrade 0.10.3 -> 0.11.0

  Andrej Valek (1):
        busybox: 1.35.0 -> 1.36.0

  Arnout Vandecappelle (1):
        python3-pytest: Remove dependency on python3-toml

  Bruce Ashfield (5):
        linux-yocto/6.1: update to v6.1.7
        linux-yocto/5.15: update to v5.15.89
        linux-yocto/6.1: cfg: remove depreciated configs
        linux-yocto/6.1: update to v6.1.9
        linux-yocto/5.15: update to v5.15.91

  Changqing Li (1):
        apt: fix do_package_qa failure

  Chen Qi (1):
        ffmpeg: fix configure failure on noexec /tmp host

  Etienne Cordonnier (1):
        bitbake: siggen: Fix inefficient string concatenation

  George Kelly (1):
        bitbake: fetch2: Add NODE_EXTRA_CA_CERTS to export list

  Harald Seiler (1):
        bootchart2: Fix usrmerge support

  Jan Luebbe (1):
        systemd: add PACKAGECONFIG for pstore

  Khem Raj (6):
        busybox: Make provisions to disable sha256/sha1 accelaration on x86
        nghttp2: Disable python bindings
        scons: Pass MAXLINELENGTH to scons invocation
        scons.bbclass: Make MAXLINELENGTH overridable
        glibc: Upgrade to 2.37 release
        lttng-tools: Update LFS64 patch with upstream feedback

  Louis Rannou (1):
        oeqa/selftest/locales: Add selftest for locale generation/presence

  Markus Volk (3):
        libtiff: add PACKAGECONFIG for libdeflate and zstd
        mesa: add PACKAGECONFIG for video-codecs
        ell: update 0.55 -> 0.56

  Martin Jansa (2):
        meta: remove True option to getVar and getVarFlag calls (again)
        xinetd: move xconv.pl script to separate package

  Mauro Queiros (1):
        image.bbclass: print all QA functions exceptions

  Michael Halstead (1):
        uninative: Upgrade to 3.9 to include glibc 2.37

  Michael Opdenacker (1):
        bitbake: bitbake-user-manual: show how use BB_LOGCONFIG to log warnings

  Mikko Rapeli (1):
        oeqa context.py: fix --target-ip comment to include ssh port number

  Mingli Yu (1):
        glslang: branch rename master -> main

  Pavel Zhukov (1):
        bitbake.conf: Add mercurial to HOSTTOOLS_NONFATAL

  Pedro Baptista (2):
        bitbake: bblayers/query: Replace layer directory name with layer name for show-layers
        bitbake: bblayers/query: Adjust show-layers output layout

  Peter Kjellerstedt (1):
        poky.conf: Switch to post release name/version

  Ravineet Singh (1):
        gnutls: add ptest support

  Richard Purdie (6):
        python3-markupsafe: upgrade 2.1.1 -> 2.1.2
        perf: Fix 6.1 kernel reproducibility issue
        perf: Enable debug/source packaging
        libc-locale: Fix on target locale generation
        oeqa/selftest/locales: Add test for disabled binary locale generation
        valgrind: Workaround glibc upgrade

  Ross Burton (5):
        git: upgrade to 2.39.1
        git: ignore CVE-2022-41953
        sdkext/cases/devtool: pass a logger to HTTPService
        oeqa/utils/httpserver: connect up the request logging
        httpserver: add error handler that write to the logger

  Tim Orling (14):
        libtest-needs-perl: upgrade 0.002009 -> 0.002010
        python3-pytest: upgrade 7.2.0 -> 7.2.1
        python3-hypothesis: upgrade 6.62.0 -> 6.66.0
        python3-poetry-core: upgrade 1.4.0 -> 1.5.0
        python3-iniconfig: upgrade 1.1.1 -> 2.0.0
        python3-pytz: upgrade 2022.7 -> 2022.7.1
        python3-zipp: upgrade 3.11.0 -> 3.12.0
        python3-requests: upgrade 2.28.1 -> 2.28.2
        python3-sphinxcontrib-applehelp: 1.0.3 -> 1.0.4
        python3-sphinxcontrib-htmlhelp: 2.0.0 -> 2.0.1
        python3-pyopenssl: upgrade 22.1.0 -> 23.0.0
        python3-wcwidth: upgrade 0.2.5 -> 0.2.6
        python3-urllib3: upgrade 1.26.13 -> 1.26.14
        python3-sphinx: upgrade 6.0.0 -> 6.1.3

  Tobias Hagelborn (1):
        sstate.bbclass: Fetch non-existing local .sig files if needed

  Ulrich Ölmann (3):
        recipe_sanity: fix old override syntax
        lsof: fix old override syntax
        update-alternatives: fix typos

  Vivek Kumbhar (1):
        openssl: fix CVE-2022-3996 double locking leads to denial of service

  Wang Mingyu (2):
        btrfs-tools: upgrade 6.1.2 -> 6.1.3
        msmtp: upgrade 1.8.22 -> 1.8.23

  Xiaotian Wu (5):
        base: add support for loongarch64
        linux: add loongarch64 support
        binutils: disable gold on loongarch64
        loongarch: disable seccomp from default feature
        uboot: add a loongarch64 entry

meta-security: 7eed4a60f5..3529cfb43e:
  Mikko Rapeli (1):
        linux-yocto: drop version from bbappends

meta-raspberrypi: 6c57b92708..e43af1e3a6:
  Allan Xavier (2):
        linux-raspberrypi: Build eeprom access into kernel
        rpi-eeprom: Add recipe for eeprom update/configuration

  Khem Raj (3):
        linux-raspberrypi: Update to 5.15.90
        linux-raspberrypi: Fix build with gcc13
        linux-raspberrypi: Remove unused patches

  Martin Jansa (1):
        raspidmx, userland, omxplayer: Fix Upstream-Status formatting

meta-arm: aecbb77f72..dc10b73cc5:
  Jon Mason (1):
        arm/linux-yocto: avoid kernel defconfig warning

  Khem Raj (2):
        gator-daemon: Fix build with gcc13
        sbsa: Fix build with gcc13

  Ross Burton (2):
        arm-bsp/corstone*00: disable openssl in kmod
        CI: pin to kas 3.2 as 3.2.1 fails

  Rui Miguel Silva (6):
        meta-arm: add build to gitignore
        kas/corstone1000: move from langdale to master
        arm-bsp/corstone500: bump u-boot version to 2023.01
        arm-bsp/corstone1000: bump u-boot version to 2023.01
        arm-bsp: corstone500: bump kernel version to 6.1
        arm-bsp/corstone1000: bump kernel version to v6.1

meta-openembedded: ea63f13846..cba6df61c7:
  Alex Kiernan (2):
        mdns: Upgrade 1790.60.25 -> 1790.80.10
        dnsmasq: Upgrade 2.88 -> 2.89

  Chen Qi (1):
        syslog-ng: workaround segfault for ppc64le

  Christian Hohnstaedt (1):
        libb64: reactivate BUFFERSIZE patch

  David Bagonyi (1):
        concurrencykit: Make patch compatible with Bourne shell

  Geoff Parker (1):
        python3-pillow: add tk to RDEPENDS ptest pkg only if x11 in DISTRO_FEATURES

  Jan Luebbe (4):
        softhsm: avoid unnecessary check for native sqlite binary
        softhsm: enable objectstore backend
        extract-cert: add recipe
        opensc: fix private key import

  Kai Kang (1):
        crda: remove recipe

  Khem Raj (39):
        rwmem: Update to latest
        pipewire: Split dymanic modules to target recipe alone
        upm: Fix build with gcc13
        openthread: Use __attribute__ ((unused)) instead of removing 't'
        wireshark: Add nghttp2 packageconfig
        rdma-core: Inherit python3targetconfig
        wireshark: Inherit python3targetconfig
        hplip: Inherit python3targetconfig
        hplip: Inherit python3targetconfig
        dante: Add -P to preprocessor flags
        breakpad: Fix build with gcc13
        mongodb: Fix build with gcc13
        mongodb: Upgrade to 4.4.18
        mongodb: Pass MAXLINELENGTH to scons invocation
        perfetto: Disable ccache
        nodejs: Fix build with gcc13
        zeromq: Fix build with gcc13
        python3-greenlet: Fix build with gcc13
        perfetto: Upgrade to 31.0 release
        perfetto: Fix build with gcc13
        ntopng: Add hiredis to depends
        python3-grpcio: Fix build with gcc13
        tesseract: Fix build with gcc13
        lcdproc: Update to latest tip of trunk
        mongodb: Use bfd linker for x86/musl with gcc
        gegl: Depend on openmp when using clang
        pipewire: Do not split modules using PACKAGES_DYNAMIC for native case
        sysdig: Fix build with gcc13
        zfs: Update to 2.1.9
        python3-isort: Upgrade to isort 5.12.0
        minicoredumper: Upgrade to 2.0.2 release
        perfetto: Add missing dependencies.
        vulkan-cts: Rename patch to avoid problems on case insensitive filesytems
        python3-greenlet: Upgrade to 2.0.2
        cups-filters: Fix build with clang16/c++17
        cups-filters: Upgrade to 1.28.17 release
        ltrace: Fix build with clang16
        oprofile: Do not use std::bind2nd
        perfetto: Fix build on musl again

  Markus Volk (7):
        python3-pycups: add recipe
        blueman: add missing runtime dependency, add polkit rule
        system-config-printer: add recipe
        rtkit: add recipe
        xdg-desktop-portal: add runtime dependency on rtkit
        pipewire: update 0.3.64 -> 0.3.65
        xfdesktop: update 4.18.0 -> 4.18.1

  Martin Jansa (3):
        hunspell: move ispellaff2myspell script to separate package
        meta: remove True option to getVar calls (again)
        mctp: fix overrides syntax in SYSTEMD_AUTO_ENABLE:${PN}

  Randy MacLeod (1):
        python3-pillow: add ptest support

  Simone Weiss (1):
        minicoredumper: Add ptest

  Ulrich Ölmann (2):
        initramfs-{debug,kexecboot}-image: fix override syntax in comment
        kexecboot: update homepage

  Wang Mingyu (5):
        byacc: upgrade 20221229 -> 20230201
        ccid: upgrade 1.5.1 -> 1.5.2
        cglm: upgrade 0.8.7 -> 0.8.9
        cmark: upgrade 0.30.2 -> 0.30.3
        apache2: upgrade 2.4.54 -> 2.4.55

  Yi Zhao (2):
        samba: upgrade 4.17.4 -> 4.17.5
        frr: upgrade 8.4.1 -> 8.4.2

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Idbe7ba3bb68f0858849f8abf80cc488f94920dda
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.55.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.55.bb
new file mode 100644
index 0000000..88cef0e
--- /dev/null
+++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.55.bb
@@ -0,0 +1,237 @@
+DESCRIPTION = "The Apache HTTP Server is a powerful, efficient, and \
+extensible web server."
+SUMMARY = "Apache HTTP Server"
+HOMEPAGE = "http://httpd.apache.org/"
+SECTION = "net"
+LICENSE = "Apache-2.0"
+
+SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
+           file://0001-configure-use-pkg-config-for-PCRE-detection.patch \
+           file://0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch \
+           file://0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch \
+           file://0004-apache2-log-the-SELinux-context-at-startup.patch \
+           file://0005-replace-lynx-to-curl-in-apachectl-script.patch \
+           file://0006-apache2-fix-the-race-issue-of-parallel-installation.patch \
+           file://0007-apache2-allow-to-disable-selinux-support.patch \
+           file://0008-Fix-perl-install-directory-to-usr-bin.patch \
+           file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
+           file://0001-make_exports.awk-not-expose-the-path.patch \
+          "
+
+SRC_URI:append:class-target = " \
+           file://0010-apache2-do-not-use-relative-path-for-gen_test_char.patch \
+           file://init \
+           file://apache2-volatile.conf \
+           file://apache2.service \
+           file://volatiles.04_apache2 \
+           "
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
+SRC_URI[sha256sum] = "11d6ba19e36c0b93ca62e47e6ffc2d2f2884942694bce0f23f39c71bdc5f69ac"
+
+S = "${WORKDIR}/httpd-${PV}"
+
+inherit autotools update-rc.d pkgconfig systemd update-alternatives
+
+DEPENDS = "openssl expat pcre apr apr-util apache2-native "
+
+CVE_PRODUCT = "http_server"
+
+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"
+
+CFLAGS:append = " -DPATH_MAX=4096"
+
+EXTRA_OECONF:class-target = "\
+    --enable-layout=Debian \
+    --prefix=${base_prefix} \
+    --exec_prefix=${exec_prefix} \
+    --includedir=${includedir}/${BPN} \
+    --sysconfdir=${sysconfdir}/${BPN} \
+    --datadir=${datadir}/${BPN} \
+    --libdir=${libdir} \
+    --libexecdir=${libexecdir}/${BPN}/modules \
+    --localstatedir=${localstatedir} \
+    --enable-ssl \
+    --with-dbm=sdbm \
+    --with-gdbm=no \
+    --with-ndbm=no \
+    --with-berkeley-db=no \
+    --enable-info \
+    --enable-rewrite \
+    --enable-mpms-shared \
+    ap_cv_void_ptr_lt_long=no \
+    ac_cv_have_threadsafe_pollset=no \
+    "
+
+EXTRA_OECONF:class-native = "\
+    --prefix=${prefix} \
+    --includedir=${includedir}/${BPN} \
+    --sysconfdir=${sysconfdir}/${BPN} \
+    --datadir=${datadir}/${BPN} \
+    --libdir=${libdir} \
+    --libexecdir=${libdir}/${BPN}/modules \
+    --localstatedir=${localstatedir} \
+    "
+
+do_configure:prepend() {
+    sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout
+}
+
+do_install:append:class-target() {
+    install -d ${D}/${sysconfdir}/init.d
+
+    cat ${WORKDIR}/init | \
+        sed -e 's,/usr/sbin/,${sbindir}/,g' \
+            -e 's,/usr/bin/,${bindir}/,g' \
+            -e 's,/usr/lib/,${libdir}/,g' \
+            -e 's,/etc/,${sysconfdir}/,g' \
+            -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${BPN}
+
+    chmod 755 ${D}/${sysconfdir}/init.d/${BPN}
+
+    # Remove the goofy original files...
+    rm -rf ${D}/${sysconfdir}/${BPN}/original
+
+    install -d ${D}${sysconfdir}/${BPN}/conf.d
+    install -d ${D}${sysconfdir}/${BPN}/modules.d
+
+    # Ensure configuration file pulls in conf.d and modules.d
+    printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
+    printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.load" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
+    printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
+
+    # Match with that is in init script
+    printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
+
+    # Set 'ServerName' to fix error messages when restart apache service
+    sed -i 's/^#ServerName www.example.com/ServerName localhost/' ${D}/${sysconfdir}/${BPN}/httpd.conf
+
+    sed -i 's/^ServerRoot/#ServerRoot/' ${D}/${sysconfdir}/${BPN}/httpd.conf
+
+    sed -i -e 's,${STAGING_DIR_TARGET},,g' \
+           -e 's,${DEBUG_PREFIX_MAP},,g' \
+           -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \
+           -e 's,${HOSTTOOLS_DIR}/,,g' \
+           -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \
+           -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk
+
+    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,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \
+           -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/tmpfiles.d/
+        install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
+
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system
+        sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service
+        sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service
+    elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/default/volatiles
+        install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2
+    fi
+
+    rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars*
+    chown -R root:root ${D}
+}
+
+do_install:append:class-native() {
+    install -d ${D}${bindir} ${D}${libdir}
+    install -m 755 server/gen_test_char ${D}${bindir}
+}
+
+SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess"
+
+apache_sysroot_preprocess() {
+    install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
+    install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts}
+    install -d ${SYSROOT_DESTDIR}${sbindir}
+    install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir}
+    sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
+
+    sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+    sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+    sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+    sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+    sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+    sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+    sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+}
+
+# Implications - used by update-rc.d scripts
+INITSCRIPT_NAME = "apache2"
+INITSCRIPT_PARAMS = "defaults 91 20"
+
+SYSTEMD_SERVICE:${PN} = "apache2.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
+
+ALTERNATIVE:${PN}-doc = "htpasswd.1"
+ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1"
+
+PACKAGES = "${PN}-utils ${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
+
+CONFFILES:${PN} = "${sysconfdir}/${BPN}/httpd.conf \
+                   ${sysconfdir}/${BPN}/magic \
+                   ${sysconfdir}/${BPN}/mime.types \
+                   ${sysconfdir}/${BPN}/extra/*"
+
+FILES:${PN}-utils = "${bindir}/ab \
+                     ${bindir}/htdbm \
+                     ${bindir}/htdigest \
+                     ${bindir}/htpasswd \
+                     ${bindir}/logresolve \
+                     ${bindir}/httxt2dbm \
+                     ${sbindir}/htcacheclean \
+                     ${sbindir}/fcgistarter \
+                     ${sbindir}/checkgid \
+                     ${sbindir}/rotatelogs \
+                    "
+
+# We override here rather than append so that .so links are
+# included in the runtime package rather than here (-dev)
+# and to get build, icons, error into the -dev package
+FILES:${PN}-dev = "${datadir}/${BPN}/build \
+                   ${datadir}/${BPN}/icons \
+                   ${datadir}/${BPN}/error \
+                   ${includedir}/${BPN} \
+                   ${bindir}/apxs \
+                  "
+
+# Add the manual to -doc
+FILES:${PN}-doc += " ${datadir}/${BPN}/manual"
+
+FILES:${PN}-scripts += "${bindir}/dbmmanage"
+
+# Override this too - here is the default, less datadir
+FILES:${PN} =  "${bindir} ${sbindir} ${libexecdir} ${libdir} \
+                ${sysconfdir} ${libdir}/${BPN}"
+
+# We want htdocs and cgi-bin to go with the binary
+FILES:${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin"
+
+FILES:${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
+
+RDEPENDS:${PN} += "openssl libgcc ${PN}-utils"
+RDEPENDS:${PN}-scripts += "perl ${PN}"
+RDEPENDS:${PN}-dev = "perl"
+
+BBCLASSEXTEND = "native"
+
+pkg_postinst:${PN}() {
+    if [ -z "$D" ]; then
+        if type systemd-tmpfiles >/dev/null; then
+            systemd-tmpfiles --create
+        elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
+            ${sysconfdir}/init.d/populate-volatile.sh update
+        fi
+    fi
+}