From ff69fbd851d0e96745fac8a4d8958524ffe1d0c2 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 9 Jul 2013 17:05:01 +0000 Subject: [PATCH] - PLD merge --- apache-example.net.conf | 2 +- apache-httpd.conf | 3 ++- apache-layout.patch | 5 +++-- apache.spec | 12 ++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/apache-example.net.conf b/apache-example.net.conf index 90a938b..c08629d 100644 --- a/apache-example.net.conf +++ b/apache-example.net.conf @@ -18,6 +18,6 @@ # AllowOverride None # Options None # -# Require all granted +# Require all granted # # diff --git a/apache-httpd.conf b/apache-httpd.conf index 60453a0..28199f7 100644 --- a/apache-httpd.conf +++ b/apache-httpd.conf @@ -7,9 +7,10 @@ # # for a discussion of each configuration directive. +ServerRoot "/etc/httpd" + LoadModule unixd_module modules/mod_unixd.so -ServerRoot "/etc/httpd" # User/Group: The name (or #number) of the user/group to run httpd as. # It is usually good practice to create a dedicated user and group for diff --git a/apache-layout.patch b/apache-layout.patch index b2ebbfc..f211aff 100644 --- a/apache-layout.patch +++ b/apache-layout.patch @@ -1,6 +1,6 @@ --- httpd-2.4.3/config.layout.orig 2012-04-17 16:01:41.000000000 +0200 -+++ httpd-2.4.3/config.layout 2012-08-22 11:06:19.883386343 +0200 -@@ -370,3 +370,28 @@ ++++ httpd-2.4.3/config.layout 2012-08-23 13:01:27.879147377 +0200 +@@ -370,3 +370,29 @@ logfiledir: ${localstatedir}/log/httpd proxycachedir: ${localstatedir}/cache/httpd @@ -29,3 +29,4 @@ + proxycachedir: /var/cache/httpd + installbuilddir: ${libexecdir}/build + ++ diff --git a/apache.spec b/apache.spec index 5458b36..0606424 100644 --- a/apache.spec +++ b/apache.spec @@ -21,7 +21,7 @@ # this is internal macro, don't change to %%apache_modules_api %define _apache_modules_api 20120211 -%define openssl_ver 0.9.8i +%define openssl_ver 1.0.1e %define apr_ver 1:1.4.6 %include /usr/lib/rpm/macros.perl @@ -35,7 +35,7 @@ Summary(ru.UTF-8): Самый популярный веб-сервер Summary(tr.UTF-8): Lider WWW tarayıcı Name: apache Version: 2.4.4 -Release: 4 +Release: 5 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -206,6 +206,8 @@ Obsoletes: apache-mod_optional_fn_import Obsoletes: apache-mod_optional_fn_import Obsoletes: apache-mod_optional_hook_import Conflicts: apache < 2.2.0 +# mod_wsgi >= 3.4 is required for apache 2.4 +Conflicts: apache-mod_wsgi < 3.4 Conflicts: logrotate < 3.7-4 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed. Conflicts: rpm < 4.4.2-0.2 @@ -838,8 +840,6 @@ Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_host.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_authz_core = %{version}-%{release} -# provides compatibility directives for 2.2-style access control -Requires: apache(mod_access_compat) = %{version}-%{release} Provides: apache(mod_authz_host) = %{version}-%{release} # for apache < 2.2.0 Provides: apache(mod_access) = %{version}-%{release} @@ -2617,7 +2617,7 @@ if [ "$MODULES_API" != "%_apache_modules_api" ]; then exit 1 fi -# fix libdir (at least in PLD layout; no need to care about other ones) +# fix libdir (at least in TLD layout; no need to care about other ones) sed -i -e 's,/lib$,/%{_lib},' config.layout %build @@ -2931,7 +2931,7 @@ if [ ! -L /etc/httpd/httpd.conf ]; then fi if [ -f /etc/sysconfig/httpd ]; then MPM=$(grep ^HTTPD_MPM /etc/sysconfig/httpd |sed 's,HTTPD_MPM=,,;s,",,g') - if [ -n $MPM ]; then + if [ -n "$MPM" ]; then echo "LoadModule mpm_${MPM}_module modules/mod_mpm_${MPM}.so" > /etc/httpd/conf.d/10_mpm.conf.rpmnew cat /etc/httpd/conf.d/10_mpm.conf >> /etc/httpd/conf.d/10_mpm.conf.rpmnew mv /etc/httpd/conf.d/10_mpm.conf.rpmnew /etc/httpd/conf.d/10_mpm.conf -- 2.44.0