X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=c6a5cad7e12d29f81a3334a61ebfd1f381f83fa5;hb=b7a4d4c78592d3d7ba5c51deec7757a0a89e3185;hp=fcef35d56acd618d9f2f61f151bdb3fdc2ba0b0d;hpb=63a66c62a43b8539f8ca6a9b96a7099c739320c5;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index fcef35d..c6a5cad 100644
--- a/apache.spec
+++ b/apache.spec
@@ -17,7 +17,7 @@
 
 # 2.4 TODO
 #
-# mod_authn/z_default changed into mod_authn/z_core - trigger existing configs?
+# add new access control syntax to configs by default (mod_access_compat provides old syntax)
 
 
 # Conditional build:
@@ -44,7 +44,7 @@ Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.4.1
-Release:	0.1
+Release:	0.4
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -575,7 +575,6 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_authn_core.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_core) = %{version}-%{release}
-Provides:	apache(mod_authn_default) = %{version}-%{release}
 Obsoletes:	apache-mod_authn_default < 2.4
 
 %description mod_authn_core
@@ -654,7 +653,6 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_authz_core.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_core) = %{version}-%{release}
-Provides:	apache(mod_authz_default) = %{version}-%{release}
 Obsoletes:	apache-mod_authz_default < 2.4
 
 %description mod_authz_core
@@ -2301,7 +2299,7 @@ echo "LoadModule remoteip_module	modules/mod_remoteip.so" > $CFG/00_mod_remoteip
 echo "LoadModule request_module	modules/mod_request.so" > $CFG/00_mod_request.conf
 echo "LoadModule sed_module	modules/mod_sed.so" > $CFG/00_mod_sed.conf
 echo "LoadModule session_module	modules/mod_session.so" > $CFG/00_mod_session.conf
-echo "#LoadModule session_cookie_module	modules/mod_sessioni_cookie.so" >> $CFG/00_mod_session.conf
+echo "#LoadModule session_cookie_module	modules/mod_session_cookie.so" >> $CFG/00_mod_session.conf
 echo "#LoadModule session_dbd_module	modules/mod_session_dbd.so" >> $CFG/00_mod_session.conf
 echo "LoadModule slotmem_plain_module	modules/mod_slotmem_plain.so" > $CFG/00_mod_slotmem.conf
 echo "#LoadModule slotmem_shm_module	modules/mod_slotmem_shm.so" >> $CFG/00_mod_slotmem.conf
@@ -2375,6 +2373,7 @@ if [ -f /etc/sysconfig/httpd ]; 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
+		sed -i -e 's,HTTPD_MPM.*,,g' /etc/sysconfig/httpd
 	fi
 fi
 
@@ -2484,7 +2483,7 @@ Please report bugs to <http://bugs.pld-linux.org/>.
 EOF
 
 %triggerpostun base -- %{name} < 2.4.0
-%banner %{name}-2.4.1 << EOF
+%banner -e %{name} << EOF
 WARNING!!!
 Since apache-2.4 mod_authn_alias has been obsoleted.
 If you use access control (Deny,Allow) install mod_access_compat by doing: