Apache: bump to 2.4.35, use lib{brotlienc,curl,jansson}.

This brings mod_brotli and mod_md. The "managed domains" module,
mod_md, is required for integrating Let's Encrypt functionality.

Also mark x86 secondary arch as untested because the modules are
not being installed in system/lib/x86/ but in system/lib/.

www-servers/apache/apache-2.4.35.recipe

@@ -5,14 +5,14 @@ and freely-available source code implementation of an HTTP (Web) server"
 HOMEPAGE="https://httpd.apache.org/"
 COPYRIGHT="1995-2018 The Apache Software Foundation."
 LICENSE="Apache v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://archive.apache.org/dist/httpd/httpd-$portVersion.tar.bz2"
-CHECKSUM_SHA256="fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0"
+CHECKSUM_SHA256="2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56"
 SOURCE_DIR="httpd-$portVersion"
 PATCHES="apache-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="?x86"
 
 commandBinDir=$binDir
 commandSuffix=$secondaryArchSuffix
@@ -61,6 +61,7 @@ PROVIDES="
 	lib:mod_authz_owner$secondaryArchSuffix
 	lib:mod_authz_user$secondaryArchSuffix
 	lib:mod_autoindex$secondaryArchSuffix
+	lib:mod_brotli$secondaryArchSuffix
 	lib:mod_buffer$secondaryArchSuffix
 	lib:mod_cache$secondaryArchSuffix
 	lib:mod_cache_disk$secondaryArchSuffix
@@ -88,6 +89,7 @@ PROVIDES="
 	lib:mod_log_debug$secondaryArchSuffix
 	lib:mod_logio$secondaryArchSuffix
 	lib:mod_macro$secondaryArchSuffix
+	lib:mod_md$secondaryArchSuffix
 	lib:mod_mime$secondaryArchSuffix
 	lib:mod_negotiation$secondaryArchSuffix
 	lib:mod_proxy$secondaryArchSuffix
@@ -132,14 +134,22 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libapr_1$secondaryArchSuffix
 	lib:libaprutil_1$secondaryArchSuffix
+	lib:libbrotlienc$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libjansson$secondaryArchSuffix
 #	lib:libldap$secondaryArchSuffix
 	lib:libnghttp2$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
-"
+	"
+if [ -n "$secondaryArchSuffix" -a -z "$commandSuffix" ]; then
+CONFLICTS="
+	apache
+	"
+fi
 
 GLOBAL_WRITABLE_FILES="
 	settings/extra/httpd-autoindex.conf keep-old
@@ -170,14 +180,17 @@ GLOBAL_WRITABLE_FILES="
 	settings/original/extra/httpd-vhosts.conf keep-old
 	settings/original/extra/proxy-html.conf keep-old
 	settings/original/httpd.conf keep-old
-"
+	"
 
 BUILD_REQUIRES="
 	devel:libapr_1$secondaryArchSuffix
 	devel:libaprutil_1$secondaryArchSuffix
+	devel:libbrotlienc$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
+	devel:libcurl$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
+	devel:libjansson$secondaryArchSuffix
 #	devel:libldap$secondaryArchSuffix
 	devel:libnghttp2$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix

www-servers/apache/patches/apache-2.4.35.patchset

@@ -10,13 +10,13 @@ index 1fa3344..d13b564 100644
 +++ b/server/Makefile.in
 @@ -34,7 +34,7 @@ test_char.h: gen_test_char
  util.lo: test_char.h
-
+ 
  EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR)
 -EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
 +EXPORT_DIRS_APR = $(APU_INCLUDEDIR)
-
+ 
  # If export_files is a dependency here, but we remove it during this stage,
  # when exports.c is generated, make will not detect that export_files is no
---
-2.2.2
+-- 
+2.19.0