From d688a01edf38bfee9e20fd4765d304c529dd3db3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 18 Sep 2020 13:36:00 -0500 Subject: meta-openembedded: subtree update:ae39f2e711..bccd3277e4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alejandro Enedino Hernandez Samaniego (2): emacs: Create a new recipe for emacs weechat: Upgrade to 2.9 Andreas Müller (3): Initial add source-code-pro-fonts 2.030_1.050 gedit: add source-code-pro-fonts to RRECOMMENDS geany: add source-code-pro-fonts to RRECOMMENDS Andrej Valek (1): squid: upgrade 4.12 -> 4.13 Armin Kuster (3): log4cplus: pkg moved to core kea: pkg moved to core dhcpcd: pkg moved to core Arthur She (1): xmlrpc-c: fix Makefile macro error Arturo Buzarra (1): byacc: add nativesdk support Bartosz Golaszewski (1): libgpiod: update v1.4.3 -> v1.4.4 Bjarne Michelsen (1): asio: extend recipe to add native support Diego Rondini (4): libeigen: update SRC_URI to download from gitlab gvfs: adjust fuse packageconfig to fuse3 libeigen: update SRC_URI to use gitlab git hplip: use libexecdir Fabio Berton (2): libqmi: Update 1.26.0 -> 1.26.4 modemmanager: Update 1.12.12 -> 1.14.2 Gianfranco Costamagna (3): dlt-daemon: superseed upstream pr #238 patch with pr #245 due to unexpected behaviour brotli: update to 1.0.9 brotli: set upstream-status for the patch backported from upstream Haiqing Bai (1): rsyslog: fix wrong option of PACKAGECONFIG[valgrind] Hongxu Jia (1): python3-texttable: add recipe Jack Mitchell (1): meta-networking: dhcpcd: backport ALIGN compile error fix Jens Rehsack (1): bearssl: fix missing install Jose Dapena Paz (1): xmlsec1: do not use system libraries for non nss Jugurtha BELKALEM (1): recipe/ettercap : new ettercap recipe Khem Raj (67): valijson: Move it to networking-layer under BBFILES_DYNAMIC linuxptp: Fix cross build kernel-selftest: Tests in 5.8 depend on libhugetlbfs.h wireguard-module: Exlude from world builds Revert "iwd: Module load dir should be relative to root_dir" vboxguestdrivers: Fix build with kernel 5.8 kernel-selftest: Disable vm tests for mips/arm vulkan-cts: Update to 1.2.3.2 nss: Avoid converting enum to void* nss: Disable Werror across all recipe types nss: Upgrade to 3.56 mini-iconv: Remove wvstreams: Update SRC_URI to a fetchable location wvdial: Update SRC_URI to an accessible location packagegroup-meta-oe: Overhaul so it can build meta-oe-image mime-support: Use update-alternatives canutils: Use update-alternatives libusbgx: Use update-alternatives ttf-liberation-sans-narrow: Do not install normal liberation fonts mutter: Add a comment to remove pipewire-0.2 dependency with 3.36 sblim-sfcb: Fix target postinst hexedit: Define update alternatives lmbench: Use update alternatives for stream uml-utilities: Use update alternatives for tunctl imagemagick: Create symlinks for magick-script sharutils: Use update alternatives for uudecode/uuencode layer.conf: fixes icon-theme signature changes layer.conf: Fix for signature change for allarch icon themes properties-cpp: Add recipe packagegroup-meta-filesystems: Update to add new recipes packagegroup-meta-webserver: Update to include new recipes monkey: Remove /var/run monkey: Correct the install path in init services packagegroup-meta-oe: Exclude from world builds networkmanager: Depend on dhcpcd packagegroup-meta-networking: Add new packages bearssl: fix GNU_HASH link error autossh: Depend on ssh instead of hardcoding openssh quagga,pimd: Use update-alternatives for pimd netkit-rpc: Use update alternatives for rpcinfo ssmtp: Use update alternatives for conflicts with esmtp netkit-rwho: Use update-alternatives for tftp netkit-ftp: Use update-alternatives for ftp netkit-rwho: Convert to ontarget postinst schroedinger: Update SRC_URI packagegroup-meta-multimedia: Add new recipes mycroft: rdep on procps imapfilter: Fix linker flags toybox: Add packageconfigs for iconv and getconf tmux: Add -p option to mkdir packagegroup-meta-networking: Remove dhcpcd and kea packagegroup-meta-oe: Remove log4cplus packagegroup-meta-multimedia: Remove projucer on musl packagegroup-meta-perl: Update to represent latest recipes po4a: Switch to github for SRC_URI as alioth one seems to be gone libdata-hexdump-perl: Use update alternatives for hexdump meta-perl-image: Add packagegroup-meta-perl-extended meta-perl-ptest-image: Depend on ptest DISTRO_FEATURE iwd: Upgrade to 1.9 packagegroup-meta-python: Add new packages meta-python-image,meta-python-ptest-image: Use python3 packagegroups android-tools: Support libselinux to build with musl which now has gettid packagegroup-meta-oe.bb: Add cukinia to test packagegroups packagegroup-meta-oe: Add source-code-pro-fonts mongodb: Pass OBJCOPY to scons so it does not use it from host mongodb: Fix libunwind build with -fno-common mongodb: Fix i386 builds for non-glibc systems Leon Anavi (134): python3-pywbem: Upgrade 0.17.4 -> 1.0.2 python3-pydicti: Add recipe python3-yamlloader: Add recipe python3-tabulate: Add recipe python3-asciitree: Add recipe python3-custom-inherit: Add recipe python3-nocasedict: Add recipe python3-nocaselist: Add recipe python3-click-repl: Add recipe python3-click-spinner: Add recipe python3-pywbemtools: Add recipe python3-diskcache: Upgrade 4.1.0 -> 5.0.1 python3-langtable: Upgrade 0.0.51 -> 0.0.52 python3-pint: Upgrade 0.14 -> 0.15 python3-networkx: Upgrade 2.4 -> 2.5 python3-attrs: Upgrade 19.3.0 -> 20.1.0 python3-pychromecast: Upgrade 7.2.0 -> 7.2.1 python3-dominate: Upgrade 2.5.1 -> 2.5.2 python3-pymisp: Upgrade 2.4.128 -> 2.4.130 python3-inflection: Upgrade 0.5.0 -> 0.5.1 python3-typing-extensions: Upgrade 3.7.4.2 -> 3.7.4.3 python3-pandas: Upgrade 1.1.0 -> 1.1.1 python3-msm: Upgrade 0.8.7 -> 0.8.8 lshw: Upgrade 2.18 -> 2.19 mercurial: Upgrade 5.4 -> 5.5 doxygen: Upgrade 1.8.17 -> 1.8.20 python3-bitarray: Upgrade 1.5.2 -> 1.5.3 python3-cryptography-vectors: Upgrade 2.9.2 -> 3.0 python3-openpyxl: Upgrade 3.0.4 -> 3.0.5 python3-cmd2: Upgrade 1.3.3 -> 1.3.4 python3-sentry-sdk: Upgrade 0.16.5 -> 0.17.0 python3-flask: Consolidate in a single file python3-flask: Upgrade 1.1.1 -> 1.1.2 python3-diskcache: Upgrade 5.0.1 -> 5.0.2 python3-cmd2: Upgrade 1.3.4 -> 1.3.5 python3-flask-wtf: Consolidate in a single file python3-flask-wtf: Upgrade 0.14.2 -> 0.14.3 python3-flask-socketio: Consolidate in a single file python3-flask-socketio: Upgrade 4.2.1 -> 4.3.1 python3-google-api-python-client: Upgrade 1.10.0 -> 1.10.1 python3-cryptography: Upgrade 3.0 -> 3.1 python3-twitter: Upgrade 3.8.0 -> 3.9.0 python3-ntplib: Upgrade 0.3.3 -> 0.3.4 python3-flask-babel: Upgrade 1.0.0 -> 2.0.0 python3-flask-migrate: Consolidate in a single file python3-flask-migrate: Upgrade 2.5.2 -> 2.5.3 python3-flask-restful: Consolidate in a single file python3-flask-restful: Upgrade 0.3.7 -> 0.3.8 python3-flask-sqlalchemy: Consolidate in a single file python3-flask-sqlalchemy: Upgrade 2.4.1 -> 2.4.4 php: Upgrade 7.4.4 -> 7.4.9 python3-ecdsa: Upgrade 0.15 -> 0.16.0 python3-luma-core: Upgrade 1.15.0 -> 1.16.0 python3-cryptography-vectors: Upgrade 3.0 -> 3.1 python3-google-api-python-client: Upgrade 1.10.1 -> 1.11.0 python3-flask-user: Consolidate in a single file python3-cmd2: Upgrade 1.3.5 -> 1.3.8 python3-sh: Upgrade 1.13.1 -> 1.14.0 python3-paramiko: Upgrade 2.7.1 - 2.7.2 python3-parse: Upgrade 1.16.0 -> 1.17.0 python3-prompt-toolkit: Upgrade 3.0.6 -> 3.0.7 python3-more-itertools: Upgrade 8.4.0 -> 8.5.0 python3-ipython: Upgrade 7.17.0 -> 7.18.1 python3-hpack: Consolidate in a single file python3-hpack: Upgrade 3.0.0 -> 4.0.0 python3-sentry-sdk: Upgrade 0.17.0 -> 0.17.1 python3-luma-core: Upgrade 1.16.0 -> 1.16.1 python3-traitlets: Upgrade 4.3.3 -> 5.0.0 python3-flask-nav: Consolidate in a single file python3-flask-mail: Consolidate in a single file python3-flask-pymongo: Consolidate in a single file python3-pillow: Upgrade 6.2.1 -> 7.2.0 znc: Upgrade 1.7.5 -> 1.8.1 mosquitto: Upgrade 1.6.11 -> 1.6.12 fping: Upgrade 4.4 -> 5.0 nano: Upgrade 5.1 -> 5.2 hwdata: Upgrade 0.336 -> 0.339 xscreensaver: Add HOMEPAGE python3-meh: Upgrade 0.48 -> 0.49 python3-stevedore: Upgrade 3.2.0 -> 3.2.1 python3-robotframework: Upgrade 3.2.1 -> 3.2.2 python3-sentry-sdk: Upgrade 0.17.1 -> 0.17.2 python3-pycurl: Upgrade 7.43.0.5 -> 7.43.0.6 python3-pyzmq: Upgrade 17.1.0 -> 19.0.2 python3-mccabe: Upgrade 0.2.1 -> 0.6.1 python3-nmap: Upgrade 1.4.7 -> 1.4.8 python3-absl: Upgrade 0.9.0 -> 0.10.0 python3-systemd: Consolidate in a single file python3-gevent: Consolidate in a single file python3-gevent: Upgrade 1.4.0 -> 20.6.2 python3-ruamel-yaml: Upgrade 0.16.10 -> 0.16.11 python3-cmd2: Upgrade 1.3.8 -> 1.3.9 python3-traitlets: 5.0.0 -> 5.0.3 python3-priority: Consolidate in a single file python3-hyperframe: Consolidate in a single file python3-mprpc: Consolidate in a single file python3-gsocketpool: Consolidate in a single file gyp: Consolidate in a single file gyp: Upgrade to latest version python3-fann2: Consolidate in a single file python3-isort: Upgrade 5.4.2 -> 5.5.0 python3-sentry-sdk: Upgrade 0.17.2 -> 0.17.3 python3-hyperframe: Upgrade 5.2.0 -> 6.0.0 python3-traitlets: Upgrade 5.0.3 -> 5.0.4 python3-texttable: Upgrade 1.6.2 -> 1.6.3 python3-iso8601: Upgrade 0.1.12 -> 0.1.13 python3-dbus-next: Upgrade 0.1.3 -> 0.1.4 python3-ujson: Upgrade 3.1.0 -> 3.2.0 python3-trafaret: Upgrade 2.0.2 -> 2.1.0 python3-tqdm: Upgrade 4.48.2 -> 4.49.0 python3-isort: Upgrade 5.5.0 -> 5.5.2 python3-coverage: Upgrade 5.2.1 -> 5.3 python3-diskcache: Upgrade 5.0.2 -> 5.0.3 python3-haversine: Upgrade 2.2.0 -> 2.3.0 python3-pymysql: Upgrade 0.10.0 -> 0.10.1 python3-alembic: Upgrade 1.4.2 -> 1.4.3 python3-nocasedict: Upgrade 0.5.0 -> 1.0.0 python3-pyroute2: Upgrade 0.5.13 -> 0.5.14 python3-pyusb: Upgrade 1.0.2 -> 1.1.0 python3-pandas: Upgrade 1.1.1 -> 1.1.2 python3-pint: Upgrade 0.15 -> 0.16 python3-parse: Upgrade 1.17.0 -> 1.18.0 python3-cffi: Upgrade 1.14.2 -> 1.14.3 python3-google-api-python-client: Upgrade 1.11.0 -> 1.12.1 python3-sentry-sdk: Upgrade 0.17.3 -> 0.17.5 python3-attrs: Upgrade 20.1.0 -> 20.2.0 python3-nocaselist: Upgrade 1.0.1 -> 1.0.2 python3-pymisp: Upgrade 2.4.130 -> 2.4.131 python3-stevedore: Upgrade 3.2.1 -> 3.2.2 python3-matplotlib: Upgrade 3.3.1 -> 3.3.2 python3-pychromecast: Upgrade 7.2.1 -> 7.3.0 python3-pyrsistent: Upgrade 0.16.0 -> 0.17.3 python3-ruamel-yaml: Upgrade 0.16.11 -> 0.16.12 python3-msk: Upgrade 0.3.15 -> 0.3.16 Madhavan Krishnan (1): libcamera: Bumped to latest revision and added pkgconfig to enable gstreamer Marc (1): openocd: Update to latest git version Marek Vasut (1): freerdp: Add missing libxkbcommon WL dependency Martin Jansa (5): fbida: require opengl in DISTRO_FEATURES nss: fix postinst in do_rootfs for target nss: remove signlibs.sh st: add x11 to REQUIRED_DISTRO_FEATURES to suck less st: fix indentation Michael Fitz-Payne (1): python3-greenstalk: add recipe for greenstalk python package. Michael Vetter (2): jasper: Use new repo URL README: Use quotation marks for subject prefix Mikko Rapeli (4): nss: fix postinst script for nativesdk build mdns: update to version 1096.40.7 mdns: set CVE_PRODUCT to "apple:mdnsresponder" mdns: add BSD-3-Clause to LICENSE Mingli Yu (2): mariadb: package executables named with mariadb opencv: improve reproducibility Ola X Nilsson (1): syslog-ng: Drop obsolete variable ONLINE_PACKAGE_MANAGEMENT Oleksandr Kravchuk (1): tesseract: update to 4.1.1 Ovidiu Panait (1): net-snmp: upgrade 5.8 -> 5.9 Richard Leitner (1): liburing: add v0.7 Robert Joslyn (3): postgresql: Update to 12.4 htop: Update to 3.0.1 consolation: Add recipe Sakib Sajal (1): apache2: upgrade v2.4.43 -> v2.4.46 Slater, Joseph (2): openjpeg: fix CVE-2020-15389 luajit: advance SRCREV to fix two CVE's Stanislav Angelovic (1): Bump sdbus-c++ version to v0.8.3 Trevor Gamblin (3): packagegroup-meta-python: fix PACKAGES and default ptest recipe name python3-django: upgrade 2.2.13 -> 2.2.16 python3-django: add recipe for 3.1.1 Vincent Prince (1): mongodb: bump to r4.4.1 version Wenlin Kang (2): lua: fix CVE-2020-15945 lua: fix CVE-2020-24371 Yann Dirson (5): New terminal emulator: st 0.8.4 libcec: workaround wrong choice of PYTHON_PKG_DIR when building on Debian libcec: build with Linux CEC API libcec: rename libcec-tools to libcec-examples libcec: split the python example into a separate package Zang Ruochen (38): lftp: upgrade 4.9.1 -> 4.9.2 wireshark: upgrade 3.2.5 -> 3.2.6 leptonica: upgrade 1.79.0 -> 1.80.0 links: upgrade 2.20.2 -> 2.21 nano: upgrade 5.0 -> 5.1 nlohmann-json: upgrade 3.9.0 -> 3.9.1 openldap: upgrade 2.4.50 -> 2.4.51 protobuf: upgrade 3.12.3 -> 3.13.0 sanlock: upgrade 3.8.1 -> 3.8.2 libnet-dns-perl: upgrade 1.25 -> 1.26 libidn: upgrade 1.35 -> 1.36 satyr: upgrade 0.30 -> 0.31 spitools: upgrade 0.8.4 -> 0.8.5 fio: upgrade 3.21 -> 3.22 iperf3: upgrade 3.7 -> 3.9 paho-mqtt-c: upgrade 1.3.4 -> 1.3.5 purple-skypeweb: upgrade 1.6 -> 1.7 libdbd-sqlite-perl: upgrade 1.64 -> 1.66 libencode-perl: upgrade 3.06 -> 3.07 dash: upgrade 0.5.11.1 -> 0.5.11.2 fuse3: upgrade 3.9.2 -> 3.9.3 gperftools: upgrade 2.7.90 -> 2.8 xfsprogs: upgrade 5.7.0 -> 5.8.0 cifs-utils: upgrade 6.10 -> 6.11 libdnet: upgrade 1.12 -> 1.14 asio: upgrade 1.16.1 -> 1.18.0 collectd: upgrade 5.11.0 -> 5.12.0 cryptsetup: upgrade 2.3.3 -> 2.3.4 gsoap: upgrade 2.0.105 -> 2.0.106 jasper: upgrade 2.0.19 -> 2.0.20 lcms: upgrade 2.9 -> 2.11 libhugetlbfs: upgrade 2.22 -> 2.23 ostree: upgrade 2020.5 -> 2020.6 poppler: upgrade 20.08.0 -> 20.09.0 redis: upgrade 6.0.6 -> 6.0.7 spdlog: upgrade 1.7.0 -> 1.8.0 zeromq: upgrade 4.3.2 -> 4.3.3 python3-test-generator: Enable ptest leckijakub (1): cukinia: new package Signed-off-by: Andrew Geissler Change-Id: I8382b605a3c059a037b8f4db53608f505da642ed --- .../packagesgroups/packagegroup-meta-webserver.bb | 29 ++- .../recipes-httpd/apache2/apache2_2.4.43.bb | 226 --------------------- .../recipes-httpd/apache2/apache2_2.4.46.bb | 226 +++++++++++++++++++++ .../recipes-httpd/monkey/files/monkey.init | 2 +- .../recipes-httpd/monkey/files/monkey.service | 2 +- .../recipes-httpd/monkey/monkey_1.6.9.bb | 1 + 6 files changed, 249 insertions(+), 237 deletions(-) delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb (limited to 'meta-openembedded/meta-webserver') 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/apache2/apache2_2.4.43.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb deleted file mode 100644 index a7083d80e..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb +++ /dev/null @@ -1,226 +0,0 @@ -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://apache-configure_perlbin.patch \ - file://0001-support-apxs.in-force-destdir-to-be-empty-string.patch \ - " - -SRC_URI_append_class-target = " \ - file://0008-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[md5sum] = "791c986b1e70fe61eb44060aacc89a64" -SRC_URI[sha256sum] = "a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43" - -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' \ - -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' \ - -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!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool";!' ${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}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" - -CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \ - ${sysconfdir}/${BPN}/magic \ - ${sysconfdir}/${BPN}/mime.types \ - ${sysconfdir}/${BPN}/extra/*" - -# 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" -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 -} diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb new file mode 100644 index 000000000..197cb83e6 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb @@ -0,0 +1,226 @@ +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://apache-configure_perlbin.patch \ + file://0001-support-apxs.in-force-destdir-to-be-empty-string.patch \ + " + +SRC_URI_append_class-target = " \ + file://0008-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[md5sum] = "7d661ea5e736dac5e2761d9f49fe8361" +SRC_URI[sha256sum] = "740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea" + +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' \ + -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' \ + -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!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool";!' ${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}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" + +CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \ + ${sysconfdir}/${BPN}/magic \ + ${sysconfdir}/${BPN}/mime.types \ + ${sysconfdir}/${BPN}/extra/*" + +# 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" +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 +} 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.6.9.bb b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index 289f069b1..698f8608f 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -39,6 +39,7 @@ 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 -- cgit v1.2.3