X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=b14a27c4a60a7f2b6fbc4b432fc4bbb7cf3c3914;hb=df3ba08344e0bb6078f3f21a77826871d757690f;hp=6dfd93ba3d6df93a7e95f6a3ff2447502c164904;hpb=e0a3ddd250c95493d1fbaaee51ff6842e3e69633;p=packages%2Fapache.git diff --git a/apache.spec b/apache.spec index 6dfd93b..b14a27c 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.4 +Release: 0.6 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 @@ -2468,22 +2476,16 @@ Please report bugs to . 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 +2494,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