X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=04e62f66018782391646e17b090c21dd6ea92db7;hb=c025386bfae7b152342a58c258f67a5a74a9d69a;hp=6dfd93ba3d6df93a7e95f6a3ff2447502c164904;hpb=e0a3ddd250c95493d1fbaaee51ff6842e3e69633;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index 6dfd93b..04e62f6 100644
--- a/apache.spec
+++ b/apache.spec
@@ -40,7 +40,7 @@ Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.4.1
-Release:	0.4
+Release:	0.5
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -200,6 +200,7 @@ Obsoletes:	apache-mod_optional_fn_export
 Obsoletes:	apache-mod_optional_fn_import
 Obsoletes:	apache-mod_optional_fn_import
 Obsoletes:	apache-mod_optional_hook_import
+Obsoletes:	apache(mod_unixd)
 Conflicts:	apache < 2.2.0
 Conflicts:	logrotate < 3.7-4
 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed.
@@ -2468,22 +2469,16 @@ Please report bugs to <http://bugs.pld-linux.org/>.
 EOF
 
 %triggerpostun base -- %{name} < 2.4.0
-%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:
-poldek -ivh %{name}-mod_access_compat
-
-In apache-2.4 mod_authn_default and mod_authz_default have been obsoleted by
-mod_authn_core and authz_core. If you used these modules install the new ones by invoking:
-poldek -ivh %{name}-mod_authn_core
-and/or
-poldek -ivh %{name}-mod_authz_core
-
-For more information on how to upgrade from Apache 2.2 visit:
-http://httpd.apache.org/docs/2.4/upgrading.html
-EOF
-
+cp -f /etc/httpd/apache.conf{,.rpmsave}
+sed -i -e '
+	/^DefaultType.*/s,.*,,
+	/^Include /s,^Include ,IncludeOptional ,
+	/^NameVirtualHost.*/s,.*,,
+	/^User/s,^,LoadModule unixd_module modules/mod_unixd.so\n,
+' /etc/httpd/apache.conf
+sed -i -e '
+	s,^LockFile /var/run/httpd/accept.lock,Mutex file:/var/run/httpd/,g
+' /etc/httpd/conf.d/10_mpm.conf
 
 %triggerpostun mod_ssl -- %{name}-mod_ssl < 1:2.2.0-3.1
 cp -f /etc/httpd/conf.d/40_mod_ssl.conf{,.rpmsave}
@@ -2492,6 +2487,13 @@ sed -i -e '
 	s,/var/cache/apache,/var/cache/httpd,g
 ' /etc/httpd/conf.d/40_mod_ssl.conf
 
+%triggerpostun mod_ssl -- %{name}-mod_ssl < 1:2.4.0
+cp -f /etc/httpd/conf.d/40_mod_ssl.conf{,.rpmsave}
+sed -i -e '
+	/^SSLMutex/s,^,#,
+	/^NameVirtualHost.*/s,.*,,
+' /etc/httpd/conf.d/40_mod_ssl.conf
+
 %posttrans base
 # restore lock which we disabled in pretrans
 mv -f /var/lock/subsys/httpd{.disabled,} 2>/dev/null