component/apache: install in shared mode

apr and apr-util are now build separately. I'm not sure there was any
benefit with that approach of copying the directories inside apache
source tree before build.

Using extra modules, like apache-antiloris require to install apache in
non-shared mode.

This also removes apache-antiloris from cloudooo and erp5 stacks so that
they can use apache as shared. Even if the section was installed, this
was not used anywhere.

component/apache-php/buildout.cfg

@@ -58,8 +58,11 @@ environment =
   PATH=${autoconf:location}/bin:${automake:location}/bin:${m4:location}/bin:${apache-php:location}/bin:%(PATH)s
 
 
+[apache]
+# apache-php will write in apache folder, so we cannot share apache if apache-php is used.
+shared = false
+
 [apache-php]
-# Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
 url = https://www.php.net/distributions/php-7.3.6.tar.bz2
 md5sum = bde9a912fb311182cd460dad1abbc247

component/apache/buildout.cfg

@@ -18,32 +18,30 @@ extends =
   ../zlib/buildout.cfg
   ./buildout.hash.cfg
 
+
 [apr]
-recipe = slapos.recipe.build:download-unpacked
-shared = false
-strip-top-level-dir = false
+recipe = slapos.recipe.cmmi
+shared = true
 version = 1.5.2
 md5sum = 4e9769f3349fe11fc0a5e1b224c236aa
 url = https://archive.apache.org/dist/apr/apr-${:version}.tar.bz2
 
 [apr-util]
-recipe = slapos.recipe.build:download-unpacked
-shared = false
-strip-top-level-dir = false
+recipe = slapos.recipe.cmmi
+shared = true
 version = 1.5.4
 url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2
 md5sum = 2202b18f269ad606d70e1864857ed93c
+configure-options =
+    --with-apr=${apr:location}
+    --with-expat=${libexpat:location}
 
 [apache]
-# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-shared = false
+shared = true
 version = 2.4.43
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 791c986b1e70fe61eb44060aacc89a64
-pre-configure =
-  cp -ar ${apr:location}/apr-${apr:version} srclib/apr/ &&
-  cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer
@@ -74,7 +72,6 @@ configure-options = --disable-static
                     --enable-so
                     --enable-ssl
                     --disable-lua
-                    --with-included-apr
                     --with-ssl=${openssl:location}
                     --with-z=${zlib:location}
                     --with-expat=${libexpat:location}
@@ -94,15 +91,19 @@ configure-options = --disable-static
                     --without-freedts
                     --without-odbc
                     --without-iconv
+                    --with-apr=${apr:location}
+                    --with-apr-util=${apr-util:location}
 
 environment =
   PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
+  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include -I${apr:location}/include -I${apr-util:location}/include
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib -L${apr:location}/lib -Wl,-rpath=${apr:location}/lib -L${apr-util:location}/lib -Wl,-rpath=${apr-util:location}/lib -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib
 
 [apache-antiloris]
-# Note: Shall react on each build of apache and reinstall itself
+# Note: This component tries to write in a [apache] parts, which is now
+# shared. To use this component in a software, apache parts have to be made
+# not shared in the software.
 recipe = slapos.recipe.cmmi
 shared = false
 url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
@@ -122,6 +123,6 @@ environment =
 
 [template-apache-backend-conf]
 recipe = slapos.recipe.build:download
-shared = false
+shared = true
 url = ${:_profile_base_location_}/${:filename}
 mode = 640

component/pysvn-python/buildout.cfg

@@ -19,7 +19,9 @@ patch-options = -p1
 patch-binary = ${patch:location}/bin/patch
 include-dirs =
   ${subversion:location}/include/subversion-1
-  ${apache:location}/include
+  ${apr:location}/include/apr-1
+  ${apr-util:location}/include/apr-1
 library-dirs =
   ${subversion:location}/lib
-  ${apache:location}/lib
+  ${apr:location}/lib
+  ${apr-util:location}/lib

component/serf/buildout.cfg

@@ -12,8 +12,8 @@ recipe = slapos.recipe.cmmi
 url = https://archive.apache.org/dist/serf/serf-1.2.1.tar.bz2
 md5sum = 4f8e76c9c6567aee1d66aba49f76a58b
 configure-options =
-  --with-apr=${apache:location}/bin/apr-1-config
-  --with-apr-util=${apache:location}/bin/apu-1-config
+  --with-apr=${apr:location}
+  --with-apr-util=${apr-util:location}
   --with-openssl=${openssl-1.0:location}
 environment =
   CFLAGS=-I${zlib:location}/include -I${libuuid:location}/include

component/subversion/buildout.cfg

@@ -28,8 +28,8 @@ patches =
   ${:_profile_base_location_}/subversion-fix-parallel-build-support-for-perl-bindings.patch#fd69f4c932b4882ed98c59eb102be64a
 configure-options =
   --disable-static
-  --with-apr=${apache:location}/bin/apr-1-config
-  --with-apr-util=${apache:location}/bin/apu-1-config
+  --with-apr=${apr:location}
+  --with-apr-util=${apr-util:location}
   --with-serf=yes
   --without-apxs
   --with-zlib=${zlib:location}

software/apache-frontend/common.cfg

@@ -38,6 +38,11 @@ parts +=
   proxy-by-url
   http-proxy
 
+
+[apache]
+# install apache not shared, so that we can install antiloris modules
+shared = true
+
 [extra-eggs]
 recipe = zc.recipe.egg
 eggs =

stack/cloudooo.cfg

@@ -68,7 +68,6 @@ parts =
 
   rdiff-backup
   apache
-  apache-antiloris
   haproxy
   cloudooo-develop
   cloudooo

stack/erp5/buildout.cfg

@@ -60,7 +60,6 @@ parts +=
   slapos-cookbook
   rdiff-backup
   aspell-en-dictionary
-  apache-antiloris
   mroonga-mariadb
   tesseract
   tesseract-eng-traineddata

stack/lamp/buildout.cfg

@@ -20,11 +20,8 @@ parts =
 
 extends =
   buildout.hash.cfg
-  ../../component/apache-php/buildout.cfg
-  ../../component/apache/buildout.cfg
   ../../component/curl/buildout.cfg
   ../../component/dash/buildout.cfg
-  ../../component/dash/buildout.cfg
   ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/glib/buildout.cfg
@@ -38,6 +35,7 @@ extends =
   ../logrotate/buildout.cfg
   ../resilient/buildout.cfg
   ../erp5/buildout.cfg
+  ../../component/apache-php/buildout.cfg
 
   ../slapos.cfg