X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=fb09b12faa976c4c996329ca2c93694141493c2e;hb=62ed0b96ed44f0045b48bd38d306843fcb10b51f;hp=692885575154271637943618880806de523cd15c;hpb=0786c59e33c99b50c813134086c6b9be31319297;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index 6928855..fb09b12 100644
--- a/apache.spec
+++ b/apache.spec
@@ -1,23 +1,19 @@
 # TODO:
 # - config examples for mod_*
 # - --with-suexec-uidmin=500 or =1000 ?
-# - subpackages for MPMs
-# - !!!check if all modules (*.so) are exactly the same for different MPMs
 # - check those autn modules inner deps
 # - for external packages: don't use any apache module name in dep as they
 #  differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags?
-# - for mod_auth_* modules require each auth module to require virtual authn so at least *_default
+# - for mod_auth_* modules require each auth module to require virtual authn so at least *_core
 #  is chosen?
 # - same for mod_authz
 # - mod_auth_digest and mod_auth_basic R: apache(authn) ?
-# - drop mod_case_filter* or find summary and description for them
-# - build modules only once (not with each mpm)
 # - FYI: http://wiki.apache.org/httpd/InternalDummyConnection
 
 
 # 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 +40,7 @@ Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.4.1
-Release:	0.2
+Release:	0.4
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -575,7 +571,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 +649,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 +2295,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 +2369,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 +2479,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: