X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=04e62f66018782391646e17b090c21dd6ea92db7;hb=ec3c5a63c3e41a699c6215c141afc7f25354841f;hp=0d687310c2c4ec0d73d4692cb8d25a2ca1a92f97;hpb=1801affac7121bb9bb4859fc0d083a7353ea8589;p=packages%2Fapache.git diff --git a/apache.spec b/apache.spec index 0d68731..04e62f6 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.1 +Release: 0.5 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -193,7 +189,6 @@ Requires: /sbin/chkconfig Requires: apr >= %{apr_ver} Requires: psmisc >= 20.1 Requires: rc-scripts >= 0.4.1.23 -Requires: %{name}-mod_unixd = %{version}-%{release} Provides: apache(modules-api) = %{_apache_modules_api} Provides: group(http) Provides: user(http) @@ -205,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. @@ -575,7 +571,7 @@ 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_alias) Obsoletes: apache-mod_authn_default < 2.4 %description mod_authn_core @@ -654,7 +650,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 @@ -693,6 +688,8 @@ Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_host.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_authz_host) = %{version}-%{release} +# for upgrade from 2.2, maybe this should be a "Suggests", but it's safer to require it by force +Requires: apache(mod_access_compat) = %{version}-%{release} # for apache < 2.2.0 Provides: apache(mod_access) = %{version}-%{release} Provides: webserver(access) @@ -1971,16 +1968,6 @@ Provides: apache(mod_socache_shmcb) = %{version}-%{release} %description mod_socache Shared object cache provider. -%package mod_unixd -Summary: Basic (required) security for Unix-family platforms -Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.4/mod/mod_unixd.html -Requires: %{name}-base = %{version}-%{release} -Provides: apache(mod_unixd) = %{version}-%{release} - -%description mod_unixd -Basic (required) security for Unix-family platforms. - %package mod_watchdog Summary: Provides infrastructure for other modules to periodically run tasks Group: Networking/Daemons/HTTP @@ -2299,14 +2286,13 @@ 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 echo "#LoadModule socache_dbm_module modules/mod_socache_dbm.so" > $CFG/00_mod_socache.conf echo "#LoadModule socache_memcache_module modules/mod_socache_memcache.so" >> $CFG/00_mod_socache.conf echo "#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so" >> $CFG/00_mod_socache.conf -echo "LoadModule unixd_module modules/mod_unixd.so" > $CFG/00_mod_unixd.conf echo "LoadModule watchdog_module modules/mod_watchdog.so" > $CFG/00_mod_watchdog.conf echo "LoadModule xml2enc_module modules/mod_xml2enc.so" > $CFG/00_mod_xml2enc.conf @@ -2373,6 +2359,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 @@ -2482,22 +2469,16 @@ Please report bugs to . EOF %triggerpostun base -- %{name} < 2.4.0 -%banner %{name}-2.4.1 << 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} @@ -2506,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 @@ -2625,7 +2613,6 @@ fi %module_scripts mod_session %module_scripts mod_slotmem %module_scripts mod_socache -%module_scripts mod_unixd %module_scripts mod_watchdog %module_scripts mod_xml2enc @@ -2671,10 +2658,11 @@ fi %attr(640,root,root) %{_sysconfdir}/magic %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/* -# MPM modules +# required modules %attr(755,root,root) %{_libexecdir}/mod_mpm_event.so %attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so %attr(755,root,root) %{_libexecdir}/mod_mpm_worker.so +%attr(755,root,root) %{_libexecdir}/mod_unixd.so %dir %{_libexecdir} @@ -3188,11 +3176,6 @@ fi %attr(755,root,root) %{_libexecdir}/mod_socache_memcache.so %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_socache.conf -%files mod_unixd -%defattr(644,root,root,755) -%attr(755,root,root) %{_libexecdir}/mod_unixd.so -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_unixd.conf - %files mod_watchdog %defattr(644,root,root,755) %attr(755,root,root) %{_libexecdir}/mod_watchdog.so