From 640add17fc72169a42bc77d251e4d327ed11b4e9 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Thu, 6 Sep 2018 04:22:58 +0000 Subject: [PATCH] Apache: use libnghttp2. This allows to build mod_http2. While at it, comment out the "User daemon" and "Group daemon" directives in the default httpd.conf to workaround #2949. --- www-servers/apache/apache-2.4.34.recipe | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/www-servers/apache/apache-2.4.34.recipe b/www-servers/apache/apache-2.4.34.recipe index 7e25a2803..36305b363 100644 --- a/www-servers/apache/apache-2.4.34.recipe +++ b/www-servers/apache/apache-2.4.34.recipe @@ -14,11 +14,11 @@ PATCHES="apache-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -commandBinDir="$binDir" +commandBinDir=$binDir commandSuffix=$secondaryArchSuffix if [ "$targetArchitecture" = x86_gcc2 ] then - commandBinDir="$prefix/bin" + commandBinDir=$prefix/bin commandSuffix= fi @@ -77,6 +77,7 @@ PROVIDES=" lib:mod_file_cache$secondaryArchSuffix lib:mod_filter$secondaryArchSuffix lib:mod_headers$secondaryArchSuffix + lib:mod_http2$secondaryArchSuffix lib:mod_include$secondaryArchSuffix lib:mod_info$secondaryArchSuffix lib:mod_lbmethod_bybusyness$secondaryArchSuffix @@ -135,6 +136,7 @@ REQUIRES=" lib:libexpat$secondaryArchSuffix lib:libiconv$secondaryArchSuffix # lib:libldap$secondaryArchSuffix + lib:libnghttp2$secondaryArchSuffix lib:libpcre$secondaryArchSuffix lib:libssl$secondaryArchSuffix " @@ -177,6 +179,7 @@ BUILD_REQUIRES=" devel:libexpat$secondaryArchSuffix devel:libiconv$secondaryArchSuffix # devel:libldap$secondaryArchSuffix + devel:libnghttp2$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix " @@ -306,4 +309,10 @@ BUILD() INSTALL() { make install + + # Comment out directives that would otherwise need a daemon user and group. + sed -i \ + -e "s/^User daemon/#&/" \ + -e "s/^Group daemon/#&/" \ + "$settingsDir"/httpd.conf }