X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=04eb43f98a22a133804d3e9fb912df9b73c5b7e5;hb=5e5a3613fe76433d21126f05c1dbff3735fade44;hp=a7599c7c5aaafad8e5246e2b14a8534298750b2c;hpb=917666e60d80bc253f79f2a2aa369f3577c184ac;p=packages%2Fapache.git diff --git a/apache.spec b/apache.spec index a7599c7..04eb43f 100644 --- a/apache.spec +++ b/apache.spec @@ -193,6 +193,7 @@ 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) @@ -505,22 +506,6 @@ Ten moduł implementuje uwierzytelnienie HTTP Digest. Nie został on jednak zbyt obszernie przetestowany, więc jest oznaczony jako eksperymentalny. -%package mod_authn_alias -Summary: Apache module that provides the ability to create extended authentication -Summary(pl.UTF-8): Moduł Apache'a umożliwiający tworzenie rozszerzonego uwierzytelniania -Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_authn_alias.html -Requires: %{name}-base = %{version}-%{release} -Provides: apache(mod_authn_alias) = %{version}-%{release} - -%description mod_authn_alias -This module allows extended authentication providers to be created -within the configuration file and assigned an alias name. - -%description mod_authn_alias -l pl.UTF-8 -Ten moduł umożliwia tworzenie rozszerzonych sposobów uwierzytelniania -w pliku konfiguracyjnym i nadawanie im aliasów. - %package mod_authn_anon Summary: Apache module that allows "anonymous" user access to authenticated areas Summary(pl.UTF-8): Moduł Apache'a umożliwiający dostęp anonimowych użytkowników do stref uwierzytelnianych @@ -1872,9 +1857,9 @@ mod_slotmem_shm. Summary: Provides bybusiness, byrequests, bytraffic and heartbeat load balancing schedulers Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_lbmethod_bybusiness.html -URL: http://httpd.apache.org/docs/2.4/mod/mod_lbmethod_byrequests.html -URL: http://httpd.apache.org/docs/2.4/mod/mod_lbmethod_bytraffic.html -URL: http://httpd.apache.org/docs/2.4/mod/mod_lbmethod_heartbeat.html +#URL: http://httpd.apache.org/docs/2.4/mod/mod_lbmethod_byrequests.html +#URL: http://httpd.apache.org/docs/2.4/mod/mod_lbmethod_bytraffic.html +#URL: http://httpd.apache.org/docs/2.4/mod/mod_lbmethod_heartbeat.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_proxy = %{version}-%{release} Provides: apache(mod_lbmethod) = %{version}-%{release} @@ -1971,7 +1956,7 @@ Session support. Summary: Slot-based shared memory provider Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_slotmem_plain.html -URL: http://httpd.apache.org/docs/2.4/mod/mod_slotmem_shm.html +#URL: http://httpd.apache.org/docs/2.4/mod/mod_slotmem_shm.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_slotmem) = %{version}-%{release} Provides: apache(mod_slotmem_plain) = %{version}-%{release} @@ -1984,8 +1969,8 @@ Slot-based shared memory provider. Summary: Shared object cache provider Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_socache_dbm.html -URL: http://httpd.apache.org/docs/2.4/mod/mod_socache_memcache.html -URL: http://httpd.apache.org/docs/2.4/mod/mod_socache_shmcb.html +#URL: http://httpd.apache.org/docs/2.4/mod/mod_socache_memcache.html +#URL: http://httpd.apache.org/docs/2.4/mod/mod_socache_shmcb.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_socache) = %{version}-%{release} Provides: apache(mod_socache_dbm) = %{version}-%{release} @@ -2210,8 +2195,7 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules ln -s %{_localstatedir}/run/httpd $RPM_BUILD_ROOT%{_sysconfdir}/run ln -s %{_var}/log/httpd $RPM_BUILD_ROOT%{_sysconfdir}/logs -mv $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf.orig -ln -s conf.d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf +rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/httpd @@ -2255,12 +2239,12 @@ cp -a %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf install %{SOURCE30} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf +echo "LoadModule alias_module modules/mod_alias.so" > $CFG/00_mod_alias.conf echo "LoadModule authn_file_module modules/mod_authn_file.so" > $CFG/00_mod_authn_file.conf echo "LoadModule authn_dbm_module modules/mod_authn_dbm.so" > $CFG/00_mod_authn_dbm.conf echo "LoadModule authn_anon_module modules/mod_authn_anon.so" > $CFG/00_mod_authn_anon.conf echo "LoadModule authn_dbd_module modules/mod_authn_dbd.so" > $CFG/00_mod_authn_dbd.conf echo "LoadModule authn_core_module modules/mod_authn_core.so" > $CFG/00_mod_authn_core.conf -echo "LoadModule authn_alias_module modules/mod_authn_alias.so" > $CFG/00_mod_authn_alias.conf echo "LoadModule authz_groupfile_module modules/mod_authz_groupfile.so" > $CFG/00_mod_authz_groupfile.conf echo "LoadModule authz_user_module modules/mod_authz_user.so" > $CFG/00_mod_authz_user.conf echo "LoadModule authz_dbm_module modules/mod_authz_dbm.so" > $CFG/00_mod_authz_dbm.conf @@ -2393,6 +2377,15 @@ if [ ! -L /etc/httpd/httpd.conf ]; then install -d /etc/httpd ln -s conf.d /etc/httpd/httpd.conf fi +if [ -f /etc/sysconfig/httpd ]; then + MPM=$(grep HTTPD_MPM /etc/sysconfig/httpd |sed 's,HTTPD_MPM=,,;s,",,g') + if [ -n $MPM ]; 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 + fi +fi + exit 0 %post base @@ -2498,6 +2491,24 @@ 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 + + %triggerpostun mod_ssl -- %{name}-mod_ssl < 1:2.2.0-3.1 cp -f /etc/httpd/conf.d/40_mod_ssl.conf{,.rpmsave} sed -i -e ' @@ -2542,12 +2553,10 @@ fi %module_postun %module_scripts mod_actions -%module_scripts mod_alias %module_scripts mod_asis %module_scripts mod_auth_basic %module_scripts mod_auth_dbm %module_scripts mod_auth_digest -%module_scripts mod_authn_alias %module_scripts mod_authn_anon %module_scripts mod_authn_dbd %module_scripts mod_authn_dbm @@ -2606,6 +2615,30 @@ fi %module_scripts mod_version %module_scripts mod_vhost_alias %module_scripts suexec +%module_scripts mod_access_compat +%module_scripts mod_allowmethods +%module_scripts mod_auth_form +%module_scripts mod_authn_socache +%module_scripts mod_authz_dbd +%module_scripts mod_buffer +%module_scripts mod_cache_disk +%module_scripts mod_data +%module_scripts mod_dialup +%module_scripts mod_heartbeat +%module_scripts mod_heartmonitor +%module_scripts mod_lbmethod +%module_scripts mod_log_debug +%module_scripts mod_ratelimit +%module_scripts mod_reflector +%module_scripts mod_remoteip +%module_scripts mod_request +%module_scripts mod_sed +%module_scripts mod_session +%module_scripts mod_slotmem +%module_scripts mod_socache +%module_scripts mod_unixd +%module_scripts mod_watchdog +%module_scripts mod_xml2enc %post cgi_test if [ "$1" = "1" ]; then @@ -2639,7 +2672,6 @@ fi %{_sysconfdir}/modules %{_sysconfdir}/run %{_sysconfdir}/logs -%ghost %{_sysconfdir}/httpd.conf %attr(750,root,root) %dir %{_sysconfdir}/conf.d %attr(750,root,root) %dir %{_sysconfdir}/vhosts.d %attr(750,root,root) %dir %{_sysconfdir}/webapps.d @@ -2757,11 +2789,6 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_auth_digest.conf %attr(755,root,root) %{_libexecdir}/mod_auth_digest.so -#%files mod_authn_alias -#%defattr(644,root,root,755) -#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_alias.conf -#%attr(755,root,root) %{_libexecdir}/mod_authn_alias.so - %files mod_authn_anon %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_anon.conf @@ -3065,6 +3092,134 @@ fi %attr(755,root,root) %{_libexecdir}/mod_vhost_alias.so %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_vhost_alias.conf +%files mod_access_compat +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_access_compat.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_access_compat.conf + +%files mod_allowmethods +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_allowmethods.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_allowmethods.conf + +%files mod_auth_form +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_auth_form.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_auth_form.conf + +%files mod_authn_socache +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_authn_socache.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_socache.conf + +%files mod_authz_dbd +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_authz_dbd.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_dbd.conf + +%files mod_buffer +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_buffer.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_buffer.conf + +%files mod_cache_disk +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_cache_disk.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_cache_disk.conf + +%files mod_data +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_data.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_data.conf + +%files mod_dialup +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_dialup.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_dialup.conf + +%files mod_heartbeat +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_heartbeat.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_heartbeat.conf + +%files mod_heartmonitor +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_heartmonitor.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_heartmonitor.conf + +%files mod_lbmethod +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_lbmethod_bybusyness.so +%attr(755,root,root) %{_libexecdir}/mod_lbmethod_byrequests.so +%attr(755,root,root) %{_libexecdir}/mod_lbmethod_bytraffic.so +%attr(755,root,root) %{_libexecdir}/mod_lbmethod_heartbeat.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_lbmethod.conf + +%files mod_log_debug +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_log_debug.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_log_debug.conf + +%files mod_ratelimit +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_ratelimit.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_ratelimit.conf + +%files mod_reflector +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_reflector.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_reflector.conf + +%files mod_remoteip +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_remoteip.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_remoteip.conf + +%files mod_request +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_request.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_request.conf + +%files mod_sed +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_sed.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_sed.conf + +%files mod_session +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_session.so +%attr(755,root,root) %{_libexecdir}/mod_session_cookie.so +%attr(755,root,root) %{_libexecdir}/mod_session_dbd.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_session.conf + +%files mod_slotmem +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_slotmem_plain.so +%attr(755,root,root) %{_libexecdir}/mod_slotmem_shm.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_slotmem.conf + +%files mod_socache +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_socache_dbm.so +%attr(755,root,root) %{_libexecdir}/mod_socache_shmcb.so +%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 +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_watchdog.conf + +%files mod_xml2enc +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_xml2enc.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_xml2enc.conf + %files -n htpasswd-%{name} %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/htpasswd