Merge branch 'apache-fixes' into 'master'

Fix apache-httpd and apr recipes to build properly and to use epoll by default in apr.

See merge request !378

recipes/wip/dev/other/apr/recipe.toml

@@ -10,6 +10,7 @@ ac_cv_working_getaddrinfo=no
 apr_cv_process_shared_works=yes
 apr_cv_mutex_robust_shared=yes
 apr_cv_tcp_nodelay_with_cork=no
+apr_cv_epoll=yes
 )
 cookbook_configure
 """

recipes/wip/net/server/apache-httpd/recipe.toml

-#apache-httpd
+#TODO compiles but requires setgroups syscall at startup
 [source]
-tar="https://dlcdn.apache.org/httpd/httpd-2.4.58.tar.bz2"
+tar="https://dlcdn.apache.org/httpd/httpd-2.4.61.tar.bz2"
 patches = [
     "redox.patch",
 ]