X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=3ab01e50191d6e3d584bf43490121641fffeb3cc;hb=77bbc0029ed638a098f86ca96866657d9ddf59e9;hp=2a6123cf99976c1dcf7ee80c2d877ab7ace5f885;hpb=ed54f8317fe6652abc645470220b78c450afc1b7;p=packages%2Fapache.git diff --git a/apache.spec b/apache.spec index 2a6123c..3ab01e5 100644 --- a/apache.spec +++ b/apache.spec @@ -10,12 +10,6 @@ # - mod_auth_digest and mod_auth_basic R: apache(authn) ? # - FYI: http://wiki.apache.org/httpd/InternalDummyConnection - -# 2.4 TODO -# -# add new access control syntax to configs by default (mod_access_compat provides old syntax) - - # Conditional build: %bcond_without ssl # build without SSL support %bcond_without ldap # build without LDAP support @@ -40,7 +34,7 @@ Summary(ru.UTF-8): Самый популярный веб-сервер Summary(tr.UTF-8): Lider WWW tarayıcı Name: apache Version: 2.4.1 -Release: 0.5 +Release: 0.7 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -200,6 +194,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. @@ -507,6 +502,7 @@ Summary(pl.UTF-8): Moduł Apache'a umożliwiający dostęp anonimowych użytkown Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_anon.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_authn_core) = %{version}-%{release} Provides: apache(mod_authn_anon) = %{version}-%{release} # compat Provides: apache(mod_auth_anon) = %{version}-%{release} @@ -532,7 +528,8 @@ Summary(pl.UTF-8): Moduł Apache'a umożliwiający uwierzytelnianie użytkownik Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_dbd.html Requires: %{name}-base = %{version}-%{release} -Requires: %{name}-mod_dbd = %{version}-%{release} +Requires: apache(mod_dbd) = %{version}-%{release} +Requires: apache(mod_authn_core) = %{version}-%{release} Provides: apache(mod_authn_dbd) = %{version}-%{release} %description mod_authn_dbd @@ -551,6 +548,7 @@ Summary(pl.UTF-8): Moduł Apache'a umożliwiający uwierzytelnianie użytkownik Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_dbm.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_authn_core) = %{version}-%{release} Provides: apache(mod_authn_dbm) = %{version}-%{release} %description mod_authn_dbm @@ -590,6 +588,7 @@ Summary(pl.UTF-8): Moduł Apache'a umożliwiający uwierzytelnianie użytkownik Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_file.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_authn_core) = %{version}-%{release} Provides: apache(mod_authn_file) = %{version}-%{release} %description mod_authn_file @@ -630,6 +629,7 @@ Summary(pl.UTF-8): Moduł Apache'a umożliwiający uwierzytelnianie grup z użyc Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_dbm.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_authz_core) = %{version}-%{release} Provides: apache(mod_authz_dbm) = %{version}-%{release} %description mod_authz_dbm @@ -668,6 +668,7 @@ Summary(pl.UTF-8): Moduł Apache'a umożliwiający autoryzację grup przy użyci Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_groupfile.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_authz_core) = %{version}-%{release} Provides: apache(mod_authz_groupfile) = %{version}-%{release} %description mod_authz_groupfile @@ -686,6 +687,7 @@ Summary(pl.UTF-8): Moduł Apache'a umożliwiający autoryzację grup w oparcu o Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_host.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_authz_core) = %{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} @@ -713,6 +715,7 @@ Summary(pl.UTF-8): Moduł Apache'a umożliwiający autoryzacje w oparciu o włas Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/en/mod/mod_authz_owner.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_authz_core) = %{version}-%{release} #Requires: any-auth-module Provides: apache(mod_authz_owner) = %{version}-%{release} @@ -737,6 +740,7 @@ Summary(pl.UTF-8): Moduł Apache'a umożliwiający autoryzację użytkowników Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/en/mod/mod_authz_user.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_authz_core) = %{version}-%{release} Provides: apache(mod_authz_user) = %{version}-%{release} %description mod_authz_user @@ -1551,6 +1555,7 @@ Epoch: 1 Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_ssl.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_socache_shmcb) = %{version}-%{release} Requires: openssl >= %{openssl_ver} %if "%{pld_release}" != "ac" Requires: apr-util-dbm-db @@ -1751,6 +1756,7 @@ Summary: Manages a cache of authentication credentials to relieve the load on ba Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_socache.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_authn_core) = %{version}-%{release} Provides: apache(mod_authn_socache) = %{version}-%{release} %description mod_authn_socache @@ -1762,6 +1768,8 @@ Summary: Group Authorization and Login using SQL Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_dbd.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_authz_core) = %{version}-%{release} +Requires: apache(mod_dbd) = %{version}-%{release} Provides: apache(mod_authz_dbd) = %{version}-%{release} %description mod_authz_dbd @@ -1807,8 +1815,8 @@ Summary: Sends messages with server status to frontend proxy Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_heartbeat.html Requires: %{name}-base = %{version}-%{release} -Requires: %{name}-mod_status = %{version}-%{release} -Requires: %{name}-mod_watchdog = %{version}-%{release} +Requires: apache(mod_status) = %{version}-%{release} +Requires: apache(mod_watchdog) = %{version}-%{release} Provides: apache(mod_heartbeat) = %{version}-%{release} %description mod_heartbeat @@ -1826,8 +1834,8 @@ Summary: Centralized monitor for mod_heartbeat origin servers Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_heartmonitor.html Requires: %{name}-base = %{version}-%{release} -Requires: %{name}-mod_status = %{version}-%{release} -Requires: %{name}-mod_watchdog = %{version}-%{release} +Requires: apache(mod_status) = %{version}-%{release} +Requires: apache(mod_watchdog) = %{version}-%{release} Provides: apache(mod_heartmonitor) = %{version}-%{release} %description mod_heartmonitor @@ -1932,6 +1940,7 @@ Summary: Session support Group: Networking/Daemons/HTTP URL: http://httpd.apache.org/docs/2.4/mod/mod_session.html Requires: %{name}-base = %{version}-%{release} +Requires: apache(mod_dbd) = %{version}-%{release} Provides: apache(mod_session) = %{version}-%{release} Provides: apache(mod_session_cookie) = %{version}-%{release} Provides: apache(mod_session_dbd) = %{version}-%{release} @@ -2272,8 +2281,8 @@ echo "LoadModule authz_dbd_module modules/mod_authz_dbd.so" > $CFG/00_mod_authz_ echo "LoadModule buffer_module modules/mod_buffer.so" > $CFG/00_mod_buffer.conf echo "LoadModule data_module modules/mod_data.so" > $CFG/00_mod_data.conf echo "LoadModule dialup_module modules/mod_dialup.so" > $CFG/00_mod_dialup.conf -echo "LoadModule heartbeat_module modules/mod_heartbeat.so" > $CFG/00_mod_heartbeat.conf -echo "LoadModule heartmonitor_module modules/mod_heartmonitor.so" > $CFG/00_mod_heartmonitor.conf +echo "LoadModule heartbeat_module modules/mod_heartbeat.so" > $CFG/01_mod_heartbeat.conf +echo "LoadModule heartmonitor_module modules/mod_heartmonitor.so" > $CFG/01_mod_heartmonitor.conf echo "#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so" > $CFG/00_mod_lbmethod.conf echo "#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so" >> $CFG/00_mod_lbmethod.conf echo "#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so" >> $CFG/00_mod_lbmethod.conf @@ -2354,7 +2363,7 @@ if [ ! -L /etc/httpd/httpd.conf ]; then fi if [ -f /etc/sysconfig/httpd ]; then MPM=$(grep HTTPD_MPM /etc/sysconfig/httpd |sed 's,HTTPD_MPM=,,;s,",,g') - if [ -n $MPM ]; then + if [ ! -z $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