Merge pull request #821 from ayghor/apache_config_fix

apache-2.4.10: fix default httpd.conf

srcpkgs/apache/template

@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.10
-revision=4
+revision=5
 wrksrc=httpd-${version}
 build_style=gnu-configure
 configure_args="--prefix= --enable-pie --enable-modules=all
@@ -77,14 +77,30 @@ post_install() {
 	# Enable userdir, languages, autoindex, errors.
 	# Set a working ServerRoot, disable mod_unique_id.
 	# Set and enable ServerName to 127.0.0.1.
-	sed -e 's|#\(Include /etc/httpd/extra/httpd-multilang-errordoc.conf\)|\1|' \
+
+	# FIXME:
+	#
+	# don't include:
+	# #Include /etc/httpd/extra/httpd-multilang-errordoc.conf
+	# #Include /etc/httpd/extra/httpd-languages.conf
+	# #Include /etc/httpd/extra/httpd-userdir.conf
+	#
+	# and load:
+	# LoadModule slotmem_shm_module /usr/libexec/httpd/mod_slotmem_shm.so
+	#
+	# until a solution is found, since they don't allow httpd to start!
+	#
+	#	-e 's|#\(Include /etc/httpd/extra/httpd-multilang-errordoc.conf\)|\1|' \
+	#	-e 's|#\(Include /etc/httpd/extra/httpd-languages.conf\)|\1|' \
+	#	-e 's|#\(Include /etc/httpd/extra/httpd-userdir.conf\)|\1|' \
+
+	sed \
 		-e 's|#\(Include /etc/httpd/extra/httpd-autoindex.conf\)|\1|' \
-		-e 's|#\(Include /etc/httpd/extra/httpd-languages.conf\)|\1|' \
-		-e 's|#\(Include /etc/httpd/extra/httpd-userdir.conf\)|\1|' \
 		-e 's|#\(Include /etc/httpd/extra/httpd-default.conf\)|\1|' \
 		-e 's|ServerRoot \"\"|ServerRoot \"/etc/httpd\"|' \
 		-e 's|#\(ServerName\).*|\1 127.0.0.1:80|' \
 		-e 's|\(LoadModule unique_id_module.*\)|#\1|' \
+		-e 's|#\(LoadModule slotmem_shm_module /usr/libexec/httpd/mod_slotmem_shm.so\)|\1|' \
 		-i ${DESTDIR}/etc/httpd/httpd.conf
 
 	# symlinks for /etc/httpd