From 99376af87c2e46ff53f6c590a9afa51d4e2f4a42 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 12 Jul 2025 00:04:05 -0700 Subject: hiawatha: Upgrade to 11.7 Enable TLS support Fix build with cmake4+ Signed-off-by: Khem Raj --- .../recipes-httpd/hiawatha/hiawatha_11.2.bb | 82 -------------------- .../recipes-httpd/hiawatha/hiawatha_11.7.bb | 90 ++++++++++++++++++++++ 2 files changed, 90 insertions(+), 82 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_11.2.bb create mode 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_11.7.bb (limited to 'meta-webserver/recipes-httpd') diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.2.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.2.bb deleted file mode 100644 index 098c07e954..0000000000 --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.2.bb +++ /dev/null @@ -1,82 +0,0 @@ -SUMMARY = "Lightweight secure web server" -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 = "https://hiawatha.leisink.net/files/hiawatha-${PV}.tar.gz \ - file://hiawatha-init \ - file://hiawatha.service " - -SRC_URI[sha256sum] = "99c64f76927f93469f062ab76b74eb79a397ea4be12da86bf746b2bb57cf1bc5" - -INITSCRIPT_NAME = "hiawatha" -INITSCRIPT_PARAMS = "defaults 70" - -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 \ - -DENABLE_TLS=OFF \ - -DENABLE_TOOLKIT=OFF \ - -DENABLE_CHROOT=OFF \ - -DENABLE_XSLT=ON \ - -DENABLE_TOMAHAWK=OFF \ - -DCMAKE_INSTALL_MANDIR=${mandir} \ - -DCMAKE_INSTALL_BINDIR=${bindir} \ - -DCMAKE_INSTALL_SBINDIR=${sbindir} \ - -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ - -DCMAKE_INSTALL_LIBDIR=${libdir} \ - -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=${localstatedir}" - -do_install:append() { - # Copy over init script and sed in the correct sbin path - sed -i 's,sed_sbin_path,${sbindir},' ${UNPACKDIR}/hiawatha-init - mkdir -p ${D}${sysconfdir}/init.d - install -m 0755 ${UNPACKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha - - # configure php-fcgi to have a working configuration - # by default if php is installed - echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${UNPACKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system - fi - - # /var/log/hiawatha and /var/lib/hiawatha needs to be created in runtime. - # Use rmdir to catch if upstream stops creating these dirs, or adds - # something else in /var/log. - rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/log - rmdir ${D}${localstatedir}/run - rmdir --ignore-fail-on-non-empty ${D}${localstatedir} - - # Create /var/log/hiawatha at runtime. - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then - install -d ${D}${nonarch_libdir}/tmpfiles.d - echo "d ${localstatedir}/log/${BPN} - - - -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf - fi - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then - install -d ${D}${sysconfdir}/default/volatiles - echo "d root root 0755 ${localstatedir}/log/${BPN} none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} - fi - -} - -CONFFILES:${PN} = " \ - ${sysconfdir}/hiawatha/cgi-wrapper.conf \ - ${sysconfdir}/hiawatha/hiawatha.conf \ - ${sysconfdir}/hiawatha/index.xslt \ - ${sysconfdir}/hiawatha/mimetype.conf \ - ${sysconfdir}/hiawatha/php-fcgi.conf \ -" - -FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" -FILES:${PN}-dev = "${libdir}/hiawatha/*${SOLIBSDEV}" diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.7.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.7.bb new file mode 100644 index 0000000000..fac1498b3b --- /dev/null +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.7.bb @@ -0,0 +1,90 @@ +SUMMARY = "Lightweight secure web server" +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 = "https://hiawatha.leisink.net/files/hiawatha-${PV}.tar.gz \ + file://hiawatha-init \ + file://hiawatha.service " + +SRC_URI[sha256sum] = "8bc180ae3b986d02466f081efeefdb1595d96783f581fded2a9b198752ab7ae1" + +INITSCRIPT_NAME = "hiawatha" +INITSCRIPT_PARAMS = "defaults 70" + +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 \ + -DENABLE_TOOLKIT=OFF \ + -DENABLE_CHROOT=OFF \ + -DENABLE_XSLT=ON \ + -DENABLE_TOMAHAWK=OFF \ + -DCMAKE_INSTALL_MANDIR=${mandir} \ + -DCMAKE_INSTALL_BINDIR=${bindir} \ + -DCMAKE_INSTALL_SBINDIR=${sbindir} \ + -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ + -DCMAKE_INSTALL_LIBDIR=${libdir} \ + -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=${localstatedir} \ + -DENABLE_TLS=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5" + +do_install:append() { + # Copy over init script and sed in the correct sbin path + sed -i 's,sed_sbin_path,${sbindir},' ${UNPACKDIR}/hiawatha-init + mkdir -p ${D}${sysconfdir}/init.d + install -m 0755 ${UNPACKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha + + # configure php-fcgi to have a working configuration + # by default if php is installed + echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system + fi + + # /var/log/hiawatha and /var/lib/hiawatha needs to be created in runtime. + # Use rmdir to catch if upstream stops creating these dirs, or adds + # something else in /var/log. + rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/log + rmdir ${D}${localstatedir}/run + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + + # Create /var/log/hiawatha at runtime. + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -d ${D}${nonarch_libdir}/tmpfiles.d + echo "d ${localstatedir}/log/${BPN} - - - -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf + fi + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then + install -d ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 ${localstatedir}/log/${BPN} none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} + fi + +} + +CONFFILES:${PN} = " \ + ${sysconfdir}/hiawatha/cgi-wrapper.conf \ + ${sysconfdir}/hiawatha/hiawatha.conf \ + ${sysconfdir}/hiawatha/index.xslt \ + ${sysconfdir}/hiawatha/mimetype.conf \ + ${sysconfdir}/hiawatha/php-fcgi.conf \ +" + +PACKAGES =+ "${PN}-letsencrypt" + +FILES:${PN}-letsencrypt += "${sbindir}/lefh ${libdir}/hiawatha/letsencrypt" + +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" +FILES:${PN}-dev += "${libdir}/hiawatha/*${SOLIBSDEV}" + +RDEPENDS:${PN}-letsencrypt += "php-cli" -- cgit v1.2.3-54-g00ecf