X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=245509b8af29ad25dc2c4267ee537ac8d63325bd;hb=4d2aa8080a54f94183e52c0aaa3595936f9eaf1c;hp=a7599c7c5aaafad8e5246e2b14a8534298750b2c;hpb=917666e60d80bc253f79f2a2aa369f3577c184ac;p=packages%2Fapache.git diff --git a/apache.spec b/apache.spec index a7599c7..245509b 100644 --- a/apache.spec +++ b/apache.spec @@ -1,25 +1,15 @@ # 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? - - # Conditional build: %bcond_without ssl # build without SSL support %bcond_without ldap # build without LDAP support @@ -32,7 +22,7 @@ %define _apache_modules_api 20120211 %define openssl_ver 0.9.8i -%define apr_ver 1:1.4.5 +%define apr_ver 1:1.4.6 %include /usr/lib/rpm/macros.perl Summary: The most widely used Web server on the Internet Summary(de.UTF-8): Leading World Wide Web-Server @@ -43,12 +33,12 @@ Summary(pt_BR.UTF-8): Servidor HTTPD para prover serviços WWW Summary(ru.UTF-8): Самый популярный веб-сервер Summary(tr.UTF-8): Lider WWW tarayıcı Name: apache -Version: 2.4.1 -Release: 0.1 +Version: 2.4.2 +Release: 1 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz -# Source0-md5: 4366afbea8149ca125af01fd59a2f8a2 +# Source0-md5: 02d674020d5eda33267861d4a09bf3d4 Source1: %{name}.init Source2: %{name}.logrotate Source3: %{name}.sysconfig @@ -204,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. @@ -223,7 +214,7 @@ serwerem WWW w Internecie. Summary: Apache suexec wrapper Summary(pl.UTF-8): Wrapper suexec do serwera WWW Apache Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/suexec.html +URL: http://httpd.apache.org/docs/2.4/suexec.html Requires: %{name}-base = %{version}-%{release} %description suexec @@ -338,7 +329,7 @@ desenvolver módulos adicionais para o Apache. Summary: Apache module for executing CGI scripts based on media type or request method Summary(pl.UTF-8): Moduł Apache'a do uruchamiania skryptów CGI w oparciu o rodzaj danych lub żądania Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_actions.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_actions.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_actions) = %{version}-%{release} @@ -360,7 +351,7 @@ pliki. Summary: Mapping different parts of the host filesystem in the document tree and for URL redirection Summary(pl.UTF-8): Odwzorowywanie różnych części systemu plików w drzewie dokumentów i przekierowywanie URL-i Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_alias.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_alias.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_alias) = %{version}-%{release} Provides: webserver(alias) @@ -403,7 +394,7 @@ URL-ach. Bardziej skomplikowane zadania, takie jak modyfikowanie Summary: Sends files that contain their own HTTP headers Summary(pl.UTF-8): Wysyłanie plików zawierających własne nagłówki HTTP Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_asis.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_asis.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_asis) = %{version}-%{release} @@ -453,7 +444,7 @@ wstecznej z apache 2.0. Summary: Apache module that allows Basic authentication Summary(pl.UTF-8): Moduł Apache'a umożliwiający korzystawnie z uwierzytelnienia Basic Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_auth_basic.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_auth_basic.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_auth_basic) = %{version}-%{release} @@ -492,7 +483,7 @@ apache-mod_authz_dbm dla kompatybilności wstecznej z apache 2.0. Summary: User authentication using MD5 Digest Authentication Summary(pl.UTF-8): Uwierzytelnianie użytkowników przy użyciu MD5 Digest Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_auth_digest.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_auth_digest) = %{version}-%{release} @@ -505,28 +496,13 @@ 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 Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_authn_anon.html +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} @@ -550,9 +526,10 @@ być logowane. Summary: Apache module that allows user authentication using an SQL Summary(pl.UTF-8): Moduł Apache'a umożliwiający uwierzytelnianie użytkowników przy użyciu tabel SQL Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_authn_dbd.html +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 @@ -569,8 +546,9 @@ wyszukiwanie w tabelach SQL. Summary: Apache module that allows user authentication using DBM files Summary(pl.UTF-8): Moduł Apache'a umożliwiający uwierzytelnianie użytkowników przy użyciu plików DBM Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_authn_dbm.html +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 +568,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} +Obsoletes: apache(mod_authn_alias) Obsoletes: apache-mod_authn_default < 2.4 %description mod_authn_core @@ -607,8 +586,9 @@ przez użytkownika. Summary: Apache module that allows user authentication using text files Summary(pl.UTF-8): Moduł Apache'a umożliwiający uwierzytelnianie użytkowników poprzez pliki tekstowe Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_authn_file.html +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 @@ -625,7 +605,7 @@ wyszukiwanie w plikach tekstowych z hasłami. Summary: Apache module that allows an LDAP directory to be used to store the database for HTTP Basic authentication Summary(pl.UTF-8): Moduł Apache'a umożliwiający przechowywanie danych dla uwierzytelnienia HTTP Basic w bazie LDAP Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_authnz_ldap.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_ldap = %{version}-%{release} Requires: apr-util-ldap @@ -647,8 +627,9 @@ mod_auth_basic uwierzytelnianie użytkowników poprzez katalog LDAP. Summary: Apache module that allows group authorization using DBM files Summary(pl.UTF-8): Moduł Apache'a umożliwiający uwierzytelnianie grup z użyciem plików DBM Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_authz_dbm.html +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 @@ -685,8 +666,9 @@ autoryzacji. Summary: Apache module that allows group authorization using plaintext files Summary(pl.UTF-8): Moduł Apache'a umożliwiający autoryzację grup przy użyciu plików tekstowych Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_authz_groupfile.html +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 @@ -703,9 +685,12 @@ do grupy zapisywanej w pliku tekstowym. Summary: Apache module that allows group authorizations based on host (name or IP address) Summary(pl.UTF-8): Moduł Apache'a umożliwiający autoryzację grup w oparcu o host (nazwę lub IP) Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html +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} # for apache < 2.2.0 Provides: apache(mod_access) = %{version}-%{release} Provides: webserver(access) @@ -728,8 +713,9 @@ charakterystyki żądania klienta dostępnej w zmiennych środowiskowych. Summary: Apache module that allows authorization based on file ownership Summary(pl.UTF-8): Moduł Apache'a umożliwiający autoryzacje w oparciu o własność plików Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/en/mod/mod_authz_owner.html +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} @@ -752,8 +738,9 @@ mod_auth_digest. Summary: Apache module that allows user authorization 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.2/en/mod/mod_authz_user.html +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 @@ -768,7 +755,7 @@ WWW dla uwierzytelnionych użytkowników. Summary: Apache module - display index of files Summary(pl.UTF-8): Moduł apache do wyświetlania indeksu plików Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/en/mod/mod_autoindex.html +URL: http://httpd.apache.org/docs/2.4/en/mod/mod_autoindex.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_alias = %{version}-%{release} Provides: apache(mod_autoindex) = %{version}-%{release} @@ -797,7 +784,7 @@ Dzielenie kubełków po znalezieniu znaku sterującego. Summary: Content cache keyed to URIs Summary(pl.UTF-8): Pamięć podręczna wg klucza URI Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/en/mod/mod_cache.html +URL: http://httpd.apache.org/docs/2.4/en/mod/mod_cache.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_cache) = %{version}-%{release} @@ -849,7 +836,7 @@ Filtr wejściowy Apache'a zamieniający wszystkie litery w ciele żądania Summary: CERN httpd metafile semantics Summary(pl.UTF-8): Obsługa semantyki metaplików CERN httpd Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/en/mod/mod_cern_meta.html +URL: http://httpd.apache.org/docs/2.4/en/mod/mod_cern_meta.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_cern_meta) = %{version}-%{release} @@ -875,7 +862,7 @@ użytkowników CERN wykorzystujących ten moduł. Summary: Execution of CGI scripts Summary(pl.UTF-8): Uruchamianie skryptów CGI Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/en/mod/mod_cgi.html +URL: http://httpd.apache.org/docs/2.4/en/mod/mod_cgi.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_alias = %{version}-%{release} Suggests: %{name}-suexec = %{version}-%{release} @@ -910,7 +897,7 @@ zachowują się identycznie. Summary: Execution of CGI scripts using an external CGI daemon Summary(pl.UTF-8): Uruchamianie zewnętrznych skryptów CGI za pomocą daemona CGI Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/en/mod/mod_cgid.html +URL: http://httpd.apache.org/docs/2.4/en/mod/mod_cgid.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_alias = %{version}-%{release} Provides: apache(mod_cgid) = %{version}-%{release} @@ -938,7 +925,7 @@ wielowątkowy MPM. Summary: Specify character set translation or recoding Summary(pl.UTF-8): Translacja lub przekodowywanie znaków Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/en/mod/mod_charset_lite.html +URL: http://httpd.apache.org/docs/2.4/en/mod/mod_charset_lite.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_charset_lite) = %{version}-%{release} @@ -962,7 +949,7 @@ Jest to moduł eksperymentalny i należy używać go z uwagą. Summary: Apache module - Distributed Authoring and Versioning Summary(pl.UTF-8): Moduł Apache'a - rozproszone autorstwo i wersjonowanie Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/en/mod/mod_dav.html +URL: http://httpd.apache.org/docs/2.4/en/mod/mod_dav.html Requires: %{name}-base = %{version}-%{release} Requires: apache-mod_authn_file Requires: apache-mod_setenvif @@ -985,7 +972,7 @@ zdalnym serwerze WWW. Summary: Manages SQL database connections Summary(pl.UTF-8): Zarządzanie połączeniami z bazą danych SQL Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/en/mod/mod_dbd.html +URL: http://httpd.apache.org/docs/2.4/en/mod/mod_dbd.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_dbd) = %{version}-%{release} @@ -1006,7 +993,7 @@ niewątkowych MPM. Summary: Apache module: Compress content before it is delivered to the client Summary(pl.UTF-8): Moduł Apache'a kompresujący dane przed przesłaniem ich do klienta Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_deflate.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_deflate.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_headers = %{version}-%{release} Provides: apache(mod_deflate) = %{version}-%{release} @@ -1021,7 +1008,7 @@ Moduł kompresujący dane przed przesłaniem ich do klienta. Summary: Apache module for "trailing slash" redirects and serving directory index files Summary(pl.UTF-8): Moduł Apache'a oferujący przekierowania i udostępnianie informacji o zawartości katalogu Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_dir.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_dir.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_dir) = %{version}-%{release} Provides: webserver(indexfile) @@ -1038,7 +1025,7 @@ katalogu. Summary: Dumps all I/O to error log as desired Summary(pl.UTF-8): Zrzucanie całości wejścia/wyjścia do logu błędów Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_dumpio.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_dumpio.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_dumpio) = %{version}-%{release} @@ -1066,7 +1053,7 @@ przy diagnostyce problemów. Summary: A simple echo server to illustrate protocol modules Summary(pl.UTF-8): Prosty serwer ocho ilustrujący moduły protokołów Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_echo.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_echo.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_echo) = %{version}-%{release} @@ -1084,7 +1071,7 @@ napisać cokolwiek, a on odpowie tym samym. Summary: Modifies the environment which is passed to CGI scripts and SSI pages Summary(pl.UTF-8): Modyfikowanie środowiska przekazywanego skryptom CGI i stronom SSI Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_env.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_env.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_env) = %{version}-%{release} Provides: webserver(setenv) @@ -1106,7 +1093,7 @@ usuwane w procesie konfiguracji. Summary: Apache module which generates Expires HTTP headers Summary(pl.UTF-8): Moduł Apache'a generujący nagłówki HTTP Expires Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_expires.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_expires.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_expires) = %{version}-%{release} Provides: webserver(expires) @@ -1126,7 +1113,7 @@ ważności może być ustalana w zależności od czasu modyfikacji plików Summary: Pass the response body through an external program before delivery to the client Summary(pl.UTF-8): Przekazywanie ciała odpowiedzi do zewnętrznego programu przed przekazaniem klientowi Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_ext_filter.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_ext_filter.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_ext_filter) = %{version}-%{release} @@ -1173,7 +1160,7 @@ dla filtrów. Summary: Apache module: caches a static list of files in memory Summary(pl.UTF-8): Moduł Apache'a cache'ujący statyczną listę plików w pamięci Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_file_cache.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_file_cache.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_file_cache) = %{version}-%{release} Obsoletes: apache-mmap_static @@ -1191,7 +1178,7 @@ Moduł cache'ujący statyczną listę plików w pamięci. Summary: Context-sensitive smart filter configuration module Summary(pl.UTF-8): Moduł inteligentnej, zależnej od kontekstu konfiguracji filtrów Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_filter.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_filter.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_filter) = %{version}-%{release} @@ -1211,7 +1198,7 @@ jeśli content-type nie jest znany z góry (np. w wypadku proxy). Summary: Apache module allows for the customization of HTTP response headers Summary(pl.UTF-8): Moduł Apache'a pozwalający na modyfikację nagłówków HTTP Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_headers.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_headers.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_headers) = %{version}-%{release} @@ -1228,7 +1215,7 @@ wysyłanych do przeglądarki. Summary: RFC 1413 ident lookups Summary(pl.UTF-8): Sprawdzanie identyfikacji RFC 1413 Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_ident.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_ident.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_ident) = %{version}-%{release} @@ -1244,7 +1231,7 @@ sprawdzenia właściciela połączenia. Summary: Server-side imagemap processing Summary(pl.UTF-8): Przetwarzanie map obrazów po stronie serwera Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_imagemap.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_imagemap.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_imagemap) = %{version}-%{release} Provides: apache-mod_imap @@ -1266,7 +1253,7 @@ SetHandler) będzie przetwarzany przez ten moduł. Summary: Server-parsed html documents (Server Side Includes) Summary(pl.UTF-8): Dokumenty przetwarzane przez serwer (Server Side Includes) Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_include.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_include.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_include) = %{version}-%{release} @@ -1288,7 +1275,7 @@ a także ustawianie i wypisywanie zmiennych środowiskowych. Summary: Apache module with comprehensive overview of the server configuration Summary(pl.UTF-8): Moduł Apache'a udostępniający informacje o serwerze Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_info.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_info.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_authz_host = %{version}-%{release} Provides: apache(mod_info) = %{version}-%{release} @@ -1306,7 +1293,7 @@ zainstalowanych modułach itp. Summary: Apache module for LDAP connection pooling and result caching services for other LDAP modules Summary(pl.UTF-8): Moduł Apache'a zarządzający połączeniami z serwerami LDAP Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_ldap.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_ldap.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_ldap) = %{version}-%{release} @@ -1326,7 +1313,7 @@ i współdzieloną pamięć podręczną zapytań. Summary: Logging of the requests made to the server Summary(pl.UTF-8): Logowanie żądań zgłaszanych do serwera Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_log_config.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_log_config.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_log_config) = %{version}-%{release} Provides: webserver(log) @@ -1350,7 +1337,7 @@ charakterystyki żądania. Summary: Forensic Logging of the requests made to the server Summary(pl.UTF-8): Logowanie żadań zgłaszanych do serwera w celu późniejszej analizy Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_log_forensic.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_log_forensic.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_log_forensic) = %{version}-%{release} @@ -1368,7 +1355,7 @@ zawiera dwie linie dla każdego żądania. Summary: Logging of input and output bytes per request Summary(pl.UTF-8): Logowanie liczby bajtów wejścia i wyjścia dla zapytań Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_logio.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_logio.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_log_config = %{version}-%{release} Provides: apache(mod_logio) = %{version}-%{release} @@ -1393,7 +1380,7 @@ odzwierciedlały wszystkie zmiany dokonywane przez szyfrowanie. Summary: Associates the requested filename's extensions with the file's behavior and content Summary(pl.UTF-8): Wiązanie określonych rozszerzeń plików z zachowaniem i zawartością Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_mime.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_mime.html Requires: %{name}-base = %{version}-%{release} Requires: mailcap Provides: apache(mod_mime) = %{version}-%{release} @@ -1421,7 +1408,7 @@ informacji o negocjacji treści jest w dokumentacji do mod_negotiation. Summary: Determines the MIME type of a file by looking at a few bytes of its contents Summary(pl.UTF-8): Określanie typu MIME pliku poprzez sprawdzanie kilku bajtów jego zawartości Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_mime_magic.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_mime_magic.html Requires: %{name}-base = %{version}-%{release} Requires: file Provides: apache(mod_mime_magic) = %{version}-%{release} @@ -1442,7 +1429,7 @@ rozwiązać mod_mime. Summary: Provides for content negotiation Summary(pl.UTF-8): Moduł do negocjacji treści Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_negotiation.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_negotiation.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_mime = %{version}-%{release} Provides: apache(mod_negotiation) = %{version}-%{release} @@ -1461,7 +1448,7 @@ kilku możliwych dokumentów. Summary: Apache module with Web proxy Summary(pl.UTF-8): Moduł Apache'a dodający obsługę serwera proxy Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_proxy.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_proxy.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_authz_host = %{version}-%{release} Provides: apache(mod_proxy) = %{version}-%{release} @@ -1481,7 +1468,7 @@ HTTP/1.0 i HTTP/1.1. Summary: Apache module to set timeout and minimum data rate for receiving requests Summary(pl.UTF-8): Moduł Apache'a pozwalający na ustawianie limitu czasu oraz minimalnego transferu danych Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_reqtimeout.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_reqtimeout.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_reqtimeout) = %{version}-%{release} Provides: webserver(reqtimeout) @@ -1498,7 +1485,7 @@ transferu danych. Summary: Apache module with rule-based engine for rewrite requested URLs on the fly Summary(pl.UTF-8): Moduł Apache'a do "przepisywania" adresów URL w locie Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_rewrite.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_rewrite) = %{version}-%{release} Provides: webserver(rewrite) @@ -1514,7 +1501,7 @@ Moduł oferujący możliwość "przepisywania" adresów URL w locie. Summary: Allows the setting of environment variables based on characteristics of the request Summary(pl.UTF-8): Ustawianie zmiennych środowiskowych w oparciu o charakterystykę żądania Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_setenvif.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_setenvif.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_setenvif) = %{version}-%{release} @@ -1534,7 +1521,7 @@ części serwera do podejmowania decyzji o podejmowanych akcjach. Summary: Attempts to correct mistaken URLs by ignoring capitalization and by allowing up to one misspelling Summary(pl.UTF-8): Próba poprawiania błędnych URL-i poprzez ignorowanie wielkości liter i zezwalanie na jedną literówkę Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_speling.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_speling.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_speling) = %{version}-%{release} @@ -1566,8 +1553,9 @@ Summary(pl.UTF-8): Moduł SSL/TSL dla serwera Apache Summary(ru.UTF-8): Модуль SSL/TLS для веб-сервера Apache Epoch: 1 Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_ssl.html +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 @@ -1592,7 +1580,7 @@ Security). Summary: Server status report module for Apache Summary(pl.UTF-8): Moduł udostępniający informacje statystyczne z serwera Apache Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_status.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_status.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_authz_host = %{version}-%{release} Provides: apache(mod_status) = %{version}-%{release} @@ -1612,7 +1600,7 @@ pracy serwera Apache (w postaci strony HTML). Summary: Substitute module for Apache Summary(pl.UTF-8): Moduł pozwalający na znajdywanie i zastępowanie wyjścia dla serwera Apache Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_substitute.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_substitute.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_substitute) = %{version}-%{release} @@ -1628,7 +1616,7 @@ podstawie wyrażenia regularnego. Summary: Apache module which provides a magic token for each request Summary(pl.UTF-8): Moduł Apache'a nadający każdemu zapytaniu unikalny token Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_unique_id.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_unique_id.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_unique_id) = %{version}-%{release} @@ -1651,7 +1639,7 @@ UNIQUE_ID. Summary: User-specific directories Summary(pl.UTF-8): Katalogi specyficzne dla użytkowników Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_userdir.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_userdir.html Requires: %{name}-base = %{version}-%{release} Requires: %{name}-mod_authz_host = %{version}-%{release} Provides: apache(mod_userdir) = %{version}-%{release} @@ -1668,7 +1656,7 @@ użytkowników przy użyciu składni http://example.com/~user/ . Summary: Apache module for user tracking using cookies Summary(pl.UTF-8): Moduł Apache'a służący do śledzenia "ciasteczek" Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_usertrack.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_usertrack.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_usertrack) = %{version}-%{release} @@ -1685,7 +1673,7 @@ przy użyciu katalogu CookieLog. Pozwala na użycie wielu plików logów. Summary: Version dependent configuration Summary(pl.UTF-8): Konfiguracja zależna od wersji Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_version.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_version.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_version) = %{version}-%{release} @@ -1707,7 +1695,7 @@ wyrażeniami regularnymi. Summary: Apache module for dynamically configured mass virtual hosting Summary(pl.UTF-8): Moduł Apache'a dodający obsługę hostów wirtualnych Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.2/mod/mod_vhost_alias.html +URL: http://httpd.apache.org/docs/2.4/mod/mod_vhost_alias.html Requires: %{name}-base = %{version}-%{release} Provides: apache(mod_vhost_alias) = %{version}-%{release} @@ -1768,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 @@ -1779,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 @@ -1797,17 +1788,6 @@ Provides: apache(mod_buffer) = %{version}-%{release} This module provides the ability to buffer the input and output filter stacks. -%package mod_cache_disk -Summary: Disk based storage module for the HTTP caching filter -Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html -Requires: %{name}-base = %{version}-%{release} -Requires: %{name}-mod_cache = %{version}-%{release} -Provides: apache(mod_cache_disk) = %{version}-%{release} - -%description mod_cache_disk -Implements a disk based storage manager for mod_cache. - %package mod_data Summary: Convert response body into an RFC2397 data URL Group: Networking/Daemons/HTTP @@ -1835,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 @@ -1854,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 @@ -1872,9 +1852,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} @@ -1960,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} @@ -1971,7 +1952,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 +1965,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} @@ -1995,16 +1976,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 @@ -2210,8 +2181,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 +2225,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 @@ -2309,11 +2279,10 @@ echo "LoadModule auth_form_module modules/mod_auth_form.so" > $CFG/00_mod_auth_f echo "LoadModule authn_socache_module modules/mod_authn_socache.so" > $CFG/00_mod_authn_socache.conf echo "LoadModule authz_dbd_module modules/mod_authz_dbd.so" > $CFG/00_mod_authz_dbd.conf echo "LoadModule buffer_module modules/mod_buffer.so" > $CFG/00_mod_buffer.conf -echo "LoadModule cache_disk_module modules/mod_cache_disk.so" > $CFG/00_mod_cache_disk.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 @@ -2325,14 +2294,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 @@ -2393,6 +2361,16 @@ 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 [ ! -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 + sed -i -e 's,HTTPD_MPM.*,,g' /etc/sysconfig/httpd + fi +fi + exit 0 %post base @@ -2498,6 +2476,18 @@ Please report bugs to . EOF +%triggerpostun base -- %{name} < 2.4.0 +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} sed -i -e ' @@ -2505,6 +2495,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 @@ -2542,12 +2539,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 +2601,28 @@ 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_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_watchdog +%module_scripts mod_xml2enc %post cgi_test if [ "$1" = "1" ]; then @@ -2639,7 +2656,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 @@ -2650,10 +2666,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} @@ -2696,6 +2713,7 @@ fi %attr(755,root,root) %{_libexecdir}/mod_suexec.so %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_suexec.conf %{_mandir}/man8/suexec.8* +%{_mandir}/man8/fcgistarter.8* %files index %defattr(644,root,root,755) @@ -2757,11 +2775,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 @@ -2841,8 +2854,7 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_cache.conf %attr(755,root,root) %{_sbindir}/htcacheclean %attr(755,root,root) %{_libexecdir}/mod_cache.so -#%attr(755,root,root) %{_libexecdir}/mod_cache_disk.so -#%attr(755,root,root) %{_libexecdir}/mod_mem_cache.so +%attr(755,root,root) %{_libexecdir}/mod_cache_disk.so %{_mandir}/man8/htcacheclean.8* %files mod_case_filter @@ -3065,6 +3077,124 @@ 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_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_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