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.
This commit is contained in:
fbrosson
2018-09-06 04:22:58 +00:00
parent 300ecd4965
commit 640add17fc

View File

@@ -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
}