- todo security

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index d2e7501318fdbc561aed68701fa549d17b49bc3c..1a61a7d9f6e05a5507b00ee99690043f269c2b6d 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -1,4 +1,5 @@
 # TODO:
+# - security http://security.gentoo.org/glsa/glsa-200508-15.xml
 # - mod_case_filter
 # - mod_case_filter_in
 # - mod_optional_fn_{export,import}
@@ -35,7 +36,7 @@ Summary(ru):  
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
 Version:       2.0.54
-Release:       3
+Release:       4
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -925,7 +926,7 @@ ln -sf %{_libexecdir}/build $RPM_BUILD_ROOT%{_sysconfdir}/build
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/httpd
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/monit
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log
@@ -1019,24 +1020,27 @@ if [ "$1" = "0" ]; then
 fi
 
 %triggerpostun -- %{name} <= 2.0.50-6
-echo "WARNING!!!"
-echo "Since that version autoindex module has been separated to package %{name}-mod_autoindex"
-echo "If you want to have the same functionality do:"
-echo "poldek --upgrade %{name}-mod_autoindex"
-echo
-
-%triggerpostun -- %{name} <= 2.0.54-2
-echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!                                                      !!!
-!!! WARNING!!!                                           !!!
-!!!                                                      !!!
-!!! CGI demo/test programs -  printenv, test-cgi  - have !!!
-!!! been released form package apache into separate      !!!
-!!! subpackage apache-cgi_test. If you need printenv     !!!
-!!! and/or test-cgi, please install apache-cgi_test      !!!
-!!! package, e.g. by running poldek -Uv apache-cgi_test  !!!
-!!!                                                      !!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
+%banner %{name}-2.0.50-6 << EOF
+WARNING!!!
+Since apache-2.0.50-6 autoindex module has been separated to package
+%{name}-mod_autoindex If you want to have the same functionality do:
+poldek -Uv %{name}-mod_autoindex
+EOF
+
+%triggerpostun -- %{name} < 2.0.54-4
+%banner %{name}-2.0.54-2 << EOF
+WARNING!!!
+CGI demo/test programs - printenv and test-cgi, have been released
+from package apache into separate subpackage apache-cgi_test. If you
+need printenv and/or test-cgi, please install apache-cgi_test package,
+e.g. by running poldek -Uv apache-cgi_test
+EOF
+
+# update /etc/sysconfig/apache -> httpd rename
+if [ -f /etc/sysconfig/apache.rpmsave ]; then
+       cp -f /etc/sysconfig/httpd{,.rpmnew}
+       mv -f /etc/sysconfig/{apache.rpmsave,httpd}
+fi
 
 %post mod_actions
 if [ -f /var/lock/subsys/httpd ]; then
@@ -1400,7 +1404,7 @@ fi
 %attr(750,root,root) %dir %{_sysconfdir}/run
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_httpd.conf
 %attr(640,root,root) %{_sysconfdir}/magic
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc