X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache1.spec;h=e2500e179b089396be95abb9d8561909b3c578ca;hb=3de09e95f1a1ff097bfbc1cfd06ecbfa7cb21899;hp=2fb32769ebef74e7e89f75fb489be19b8ef352c9;hpb=53b37e118c381dadf131169a4f51eeffbba78489;p=packages%2Fapache1.git diff --git a/apache1.spec b/apache1.spec index 2fb3276..e2500e1 100644 --- a/apache1.spec +++ b/apache1.spec @@ -1,9 +1,13 @@ +# TODO +# - add -D_FILE_OFFSET_BITS=64 somewhere to get >2GB logfiles support +# - 1.3.42 is last formal release, patches _may_ be available in the fugture in +# http://www.apache.org/dist/httpd/patches/ # # Conditional build: %bcond_with rewrite_ldap # enable ldap map support for mod_rewrite (alpha) %bcond_without ipv6 # disable IPv6 support %bcond_without lingerd # don't build lingerd support -# + %include /usr/lib/rpm/macros.perl Summary: The most widely used Web server on the Internet Summary(cs.UTF-8): Nejrozšířenější WWW server v Internetu @@ -27,20 +31,21 @@ Summary(tr.UTF-8): Lider WWW tarayıcı Summary(uk.UTF-8): Найпопулярніший Web-Server Summary(zh_CN.UTF-8): Internet 上应用最广泛的 Web 服务程序。 Name: apache1 -Version: 1.3.39 -Release: 0.1 -License: Apache Group -Group: Networking/Daemons -Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz -# Source0-md5: 76066f630203291acd20c764e5eedb6e +Version: 1.3.42 +Release: 10 +License: Apache v2.0 +Group: Networking/Daemons/HTTP +Source0: http://archive.apache.org/dist/httpd/apache_%{version}.tar.gz +# Source0-md5: b76695ec68f9f8b512c9415fc69c1019 Source1: %{name}.init Source2: %{name}.logrotate -Source3: apache-icons.tar.gz -# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83 -Source4: %{name}.sysconfig +Source3: %{name}.sysconfig +# http://www.iagora.com/about/software/lingerd/ +Source4: http://images.iagora.com/media/software/lingerd/lingerd-0.94.tar.gz +# Source4-md5: 6401015bafad4f44fdf8a9a1795d9258 Source5: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/apache-non-english-man-pages.tar.bz2 # Source5-md5: 74ff6e8d8a7b365b48ed10a52fbeb84e -Source6: %{name}.monitrc +Source6: %{name}-defaultindex.conf Source7: %{name}-httpd.conf Source8: %{name}-common.conf Source9: %{name}-mod_status.conf @@ -59,9 +64,8 @@ Source21: %{name}-mod_cern_meta.conf Source22: %{name}-mod_setenvif.conf Source23: %{name}-mod_vhost_alias.conf Source24: %{name}-errordocs.conf -# http://www.iagora.com/about/software/lingerd/ -Source25: http://images.iagora.com/media/software/lingerd/lingerd-0.94.tar.gz -# Source25-md5: 6401015bafad4f44fdf8a9a1795d9258 +Source25: %{name}-manual.conf +Source26: %{name}.tmpfiles Patch0: %{name}-PLD.patch Patch1: %{name}-suexec.patch Patch2: %{name}-errordocs.patch @@ -107,15 +111,17 @@ Patch39: %{name}-security_htdigest_local_buffer_overflow.patch Patch40: %{name}-security_htpasswd_user_buffer_overflow.patch Patch41: %{name}-security_check_forensic_tempfiles.patch Patch42: %{name}-lingerd.patch +Patch43: %{name}-getline.patch +Patch44: %{name}-format-security.patch URL: http://httpd.apache.org/ BuildRequires: bash BuildRequires: db-devel >= 4.1 BuildRequires: mm-devel >= 1.3.0 -%{?with_rewrite_ldap:BuildRequires: openldap-devel} +%{?with_rewrite_ldap:BuildRequires: openldap-devel >= 2.4.6} BuildRequires: perl-base BuildRequires: rpm-build >= 4.4.0 BuildRequires: rpm-perlprov -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: rpmbuild(macros) >= 1.647 Requires: %{name}-mod_access = %{version}-%{release} Requires: %{name}-mod_alias = %{version}-%{release} Requires: %{name}-mod_dir = %{version}-%{release} @@ -124,12 +130,14 @@ Requires: %{name}-mod_mime = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/apache -%define _includedir %{_prefix}/include/apache1 -%define _libexecdir %{_prefix}/%{_lib}/apache1 -%define _datadir %{httpdir} +%define _includedir %{_prefix}/include/%{name} +%define _libexecdir %{_prefix}/%{_lib}/%{name} %define apxs /usr/sbin/apxs1 %define httpdir /home/services/apache -%define manualdir %{_prefix}/share/apache1-manual +%define docroot %{_datadir}/%{name}/html +%define errordir %{_datadir}/%{name}/error +%define manualdir %{_datadir}/%{name}/manual +%define cgibindir %{_prefix}/lib/cgi-bin/%{name} %description Apache is a powerful, full-featured, efficient and freely-available @@ -229,7 +237,7 @@ Internet 上最流行的 Web 服务程序。 %package base Summary: The most widely used Web server on the Internet Summary(pl.UTF-8): Serwer WWW (World Wide Web) -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel @@ -245,7 +253,6 @@ Requires: /etc/mime.types Requires: mailcap Requires: psmisc >= 20.1 Requires: rc-scripts -Requires: webapps Provides: %{name}(EAPI) = %{version}-%{release} %{?with_ipv6:Provides: apache1(ipv6)} %{?with_lingerd:Provides: apache1(lingerd)} @@ -256,6 +263,7 @@ Obsoletes: apache < 2.0.0 Obsoletes: apache-extra Obsoletes: apache6 Conflicts: apache1 < 1.3.37-4 +Conflicts: apache1-mod_ssl < 2.8.30_1.3.39-3 Conflicts: logrotate < 3.7-4 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed. Conflicts: rpm < 4.4.2-0.2 @@ -275,7 +283,7 @@ Summary: Apache suexec wrapper Summary(pl.UTF-8): Suexec wrapper do serwera WWW Apache Summary(ru.UTF-8): Apache suEXEC CGI wrapper Summary(uk.UTF-8): Apache suEXEC CGI wrapper -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Obsoletes: apache-suexec < 2.0.0 @@ -313,17 +321,6 @@ wykonywane jako taki sam użytkownik jak serwer WWW. системної безпеки, котрі породжені використанням таких програм, настійливо радимо не використовувати цього пакету... -%package apxs -Summary: APache eXtenSion tool -Summary(pl.UTF-8): Narzędzie do rozszerzania Apache'a -Group: Development/Tools - -%description apxs -APache eXtenSion tool. - -%description apxs -l pl.UTF-8 -Narzędzie do rozszerzania Apache'a. - %package tools Summary: Apache tools Summary(pl.UTF-8): Narzędzia Apache'a @@ -335,36 +332,46 @@ Apache tools. %description tools -l pl.UTF-8 Narzędzia Apache'a. -%package index +%package defaultindex Summary: Apache index.html* files Summary(pl.UTF-8): Pliki Apache index.html* Group: Documentation Requires: %{name}-base = %{version}-%{release} +Requires: %{name}-mod_alias = %{version}-%{release} +Requires: %{name}-mod_dir = %{version}-%{release} +Provides: apache1-index +Obsoletes: apache1-index < 1.3.39-7.9 Obsoletes: indexhtml -%description index +%description defaultindex Apache index.html* files. -%description index -l pl.UTF-8 +%description defaultindex -l pl.UTF-8 Pliki Apache index.html*. -%package doc +%package manual Summary: Apache 1.3.x manual Summary(pl.UTF-8): Podręcznik do Apache'a 1.3.x Group: Documentation Requires: %{name}-base = %{version}-%{release} +Requires: %{name}-mod_alias = %{version}-%{release} +Requires: %{name}-mod_negotiation = %{version}-%{release} +Provides: apache1-doc +Obsoletes: apache1-doc < 1.3.39-7.9 -%description doc +%description manual Apache 1.3.x manual. -%description doc -l pl.UTF-8 +%description manual -l pl.UTF-8 Podręcznik do Apache'a 1.3.x. %package errordocs Summary: Apache 1.3.x HTTP error documents Summary(pl.UTF-8): Dokumenty opisujące błędy HTTP dla Apache'a 1.3.x Group: Applications/WWW +Requires: %{name}-mod_alias = %{version}-%{release} Requires: %{name}-mod_include = %{version}-%{release} +Requires: %{name}-mod_negotiation = %{version}-%{release} %description errordocs Apache 1.3.x HTTP error documents. Currently in English and Polish @@ -396,11 +403,11 @@ Summary(sv.UTF-8): Huvudfiler för webbservern Apache Summary(uk.UTF-8): Засоби створення модулів для web server'у Apache Summary(zh_CN.UTF-8): 用于 Apache Web 服务程序的开发工具。 Group: Networking/Utilities -Requires: %{name}-apxs = %{version}-%{release} Provides: %{name}(EAPI)-devel = %{version}-%{release} Provides: apache(EAPI)-devel = %{version}-%{release} %{?with_ipv6:Provides: apache1(ipv6)-devel} Obsoletes: apache-devel < 2.0.0 +Obsoletes: apache1-apxs %description devel The apache-devel package contains header files for Apache. @@ -457,7 +464,7 @@ Paketet apache-devel innehåller huvudfilerna för Apache. %package mod_access Summary: Access control based on client hostname or IP address Summary(pl.UTF-8): Kontrola dostępu w oparciu o nazwę hosta lub adres IP klienta -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_access) = %{version}-%{release} Provides: webserver(access) @@ -487,7 +494,7 @@ dyrektywy Allow i Deny wpływają na siebie nawzajem. %package mod_actions Summary: Apache module for run CGI whenever a file of a certain type is requested Summary(pl.UTF-8): Moduł dla Apache'a do uruchamiania skryptów cgi -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_actions) = %{version}-%{release} Obsoletes: apache-mod_actions < 2.0.0 @@ -505,7 +512,7 @@ wykonywanie skryptów przetwarzających pliki. %package mod_alias Summary: Mapping different parts of the host filesystem in the document tree, and URL redirection Summary(pl.UTF-8): Odwzorowywanie części systemu plików w drzewie dokumentów oraz przekierowywanie URL-i -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_alias) = %{version}-%{release} Provides: webserver(alias) @@ -549,7 +556,7 @@ URL-ami znajduje się w module mod_rewrite. %package mod_asis Summary: Sending files which contain their own HTTP headers Summary(pl.UTF-8): Wysyłanie plików zawierających własne nagłówki HTTP -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_asis) = %{version}-%{release} @@ -579,7 +586,7 @@ typie MIME httpd/send-as-is. %package mod_auth Summary: Apache module with user authentication using textual files Summary(pl.UTF-8): Moduł uwierzytelniania użytkownika przy użyciu plików tekstowych dla Apache -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_auth) = %{version}-%{release} Provides: webserver(auth) @@ -596,7 +603,7 @@ użyciu plików tekstowych. %package mod_auth_anon Summary: Apache module with "anonymous" user access authentication Summary(pl.UTF-8): Moduł apache oferujący anonimową autoryzację użytkownia -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_auth_anon) = %{version}-%{release} Obsoletes: apache-mod_auth_anon < 2.0.0 @@ -628,7 +635,7 @@ przeglądarki i umożliwienie użytkownikom współdzielenia URL-i. %package mod_auth_db Summary: Apache module with user authentication which uses Berkeley DB files Summary(pl.UTF-8): Moduł Apache'a z mechanizmem uwierzytelniania używającym plików Berkeley DB -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires(triggerpostun): sed >= 4.0 Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_auth_db) = %{version}-%{release} @@ -645,7 +652,7 @@ uwierzytelniania, ale jako plików danych używa Berkeley DB. %package mod_auth_digest Summary: Apache user authentication module using MD5 Digest Authentication Summary(pl.UTF-8): Moduł Apache'a do uwierzytelniania metodą MD5 Digest Authentication -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_auth_digest) = %{version}-%{release} Obsoletes: apache-mod_auth_digest < 2.0.0 @@ -662,9 +669,11 @@ Authentication. %package mod_autoindex Summary: Apache module - display index of files Summary(pl.UTF-8): Moduł apache do wyświetlania indeksu plików -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires(triggerpostun): sed >= 4.0 Requires: %{name}(EAPI) = %{version}-%{release} +Requires: %{name}-mod_alias = %{version}-%{release} +Requires: apache-icons Provides: apache(mod_autoindex) = %{version}-%{release} %description mod_autoindex @@ -677,7 +686,7 @@ Ten pakiet dostarcza moduł autoindex, który generuje indeks plików. %package mod_cern_meta Summary: Support for HTTP header metafiles Summary(pl.UTF-8): Obsługa metaplików nagłówków HTTP -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_cern_meta) = %{version}-%{release} @@ -702,7 +711,7 @@ użytkowników CERN wykorzystujących ten moduł. %package mod_cgi Summary: Invoking CGI scripts Summary(pl.UTF-8): Wywoływanie skryptów CGI -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_cgi) = %{version}-%{release} Provides: webserver(cgi) @@ -732,7 +741,7 @@ zostanie opcja ExecCGI - więcej szczegółów w dyrektywie Options. %package mod_define Summary: Apache module - definition variables for arbitrary directives Summary(pl.UTF-8): Moduł Apache'a do definiowania zmiennych -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_define) = %{version}-%{release} Obsoletes: apache-mod_define < 2.0.0 @@ -748,7 +757,7 @@ zmiennych, które mogą być rozwijane w dowolnej linii dyrektywy. %package mod_digest Summary: Older version of apache user authentication module using MD5 Digest Authentication Summary(pl.UTF-8): Starsza wersja modułu apache do autoryzacji MD5 -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_digest) = %{version}-%{release} Obsoletes: apache-mod_digest < 2.0.0 @@ -771,7 +780,7 @@ najnowszą wersję standardu. %package mod_dir Summary: Apache module for "trailing slash" redirects and serving directory index files Summary(pl.UTF-8): Moduł oferujący przekierowania i serwowanie indeksu katalogu -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_dir) = %{version}-%{release} Provides: webserver(indexfile) @@ -788,9 +797,10 @@ udostępnianie indeksu katalogu. %package mod_env Summary: Passing of environments to CGI scripts Summary(pl.UTF-8): Przekazywanie środowiska do skryptów CGI -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_env) = %{version}-%{release} +Provides: webserver(setenv) %description mod_env This module allows for control of the environment that will be @@ -808,9 +818,10 @@ usuwane w procesie konfiguracji. %package mod_expires Summary: Apache module which generates Expires HTTP headers Summary(pl.UTF-8): Moduł generujący nagłówki HTTP Expires -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_expires) = %{version}-%{release} +Provides: webserver(expires) Obsoletes: apache-mod_expires < 2.0.0 %description mod_expires @@ -827,7 +838,7 @@ ważności może być ustalana w zależności od czasu modyfikacji plików %package mod_headers Summary: Apache module allows for the customization of HTTP response headers Summary(pl.UTF-8): Moduł pozwalający na modyfikację nagłówków HTTP -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_headers) = %{version}-%{release} Obsoletes: apache-mod_headers < 2.0.0 @@ -845,7 +856,7 @@ usuwane. %package mod_imap Summary: Apache module with imap-file handler Summary(pl.UTF-8): Moduł Apache'a z obsługą imap-file -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_imap) = %{version}-%{release} Obsoletes: apache-mod_imap < 2.0.0 @@ -862,7 +873,7 @@ programu CGI imagemap. %package mod_include Summary: Server-parsed documents Summary(pl.UTF-8): Dokumenty przetwarzane po stronie serwera -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_include) = %{version}-%{release} @@ -883,7 +894,7 @@ a także ustawianie i wypisywanie zmiennych środowiskowych. %package mod_info Summary: Apache module with comprehensive overview of the server configuration Summary(pl.UTF-8): Moduł dostarczający informacji na temat serwera -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_info) = %{version}-%{release} Obsoletes: apache-mod_info < 2.0.0 @@ -901,7 +912,7 @@ konfiguracyjnych. %package mod_log_agent Summary: Logging of User Agents Summary(pl.UTF-8): Logowanie nazw klientów (User Agent) -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_log_agent) = %{version}-%{release} @@ -916,7 +927,7 @@ i jest niezalecany. Zamiast niego lepiej używać mod_log_config. %package mod_log_config Summary: User-configurable logging replacement for mod_log_common Summary(pl.UTF-8): Konfigurowalny logujący zamiennik dla mod_log_common -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_log_config) = %{version}-%{release} @@ -950,7 +961,7 @@ każdego żądania do wielu plików. %package mod_log_forensic Summary: Apache module for forensic logging of the requests Summary(pl.UTF-8): Moduł Apache'a do logowania żądań w celu późniejszej analizy -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_log_forensic) = %{version}-%{release} Obsoletes: apache-mod_log_forensic < 2.0.0 @@ -966,7 +977,7 @@ Logowanie jest wykonywane przed i po przetworzeniu żądania. %package mod_log_referer Summary: User-configurable logging replacement for mod_log_common Summary(pl.UTF-8): Konfigurowalny logujący zamiennik dla mod_log_common -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_log_referer) = %{version}-%{release} @@ -981,9 +992,10 @@ i jest niezalecany. Zamiast niego lepiej używać mod_log_config. %package mod_mime Summary: Determining document types using file extensions Summary(pl.UTF-8): Określanie typów dokumentów przy użyciu rozszerzeń plików -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_mime) = %{version}-%{release} +Provides: webserver(mime) %description mod_mime This module is used to determine various bits of "meta information" @@ -1003,7 +1015,7 @@ wewnątrz serwera. %package mod_mime_magic Summary: Determining document types using "magic numbers" Summary(pl.UTF-8): Określanie typów dokumentów przy użyciu "liczb magicznych" -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_mime_magic) = %{version}-%{release} @@ -1036,7 +1048,7 @@ tylko jeśli plik magic został określony dyrektywą MimeMagicFile. %package mod_mmap_static Summary: Apache module for mmap()ing statically configured list files Summary(pl.UTF-8): Moduł służący do mmap()owania plików -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_mmap_static) = %{version}-%{release} Obsoletes: apache-mod_mmap_static < 2.0.0 @@ -1053,7 +1065,7 @@ Moduł umożliwia mmap()owanie statycznie skonfigurowanych plików %package mod_negotiation Summary: Content negotiation Summary(pl.UTF-8): Negocjacja treści -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_negotiation) = %{version}-%{release} @@ -1080,7 +1092,7 @@ dostępnych dokumentów. Są dwie różne implementacje. %package mod_proxy Summary: Apache module with Web proxy Summary(pl.UTF-8): Moduł dodający obsługę serwera proxy -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires(triggerpostun): sed >= 4.0 Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_proxy) = %{version}-%{release} @@ -1103,9 +1115,10 @@ innymi modułami proxy dla tych i innych protokołów. Zawiera łatę z %package mod_rewrite Summary: Apache module with rule-based engine for rewrite requested URLs on the fly Summary(pl.UTF-8): Moduł do ,,przepisywania'' adresów URL w locie -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_rewrite) = %{version}-%{release} +Provides: webserver(rewrite) Obsoletes: apache-mod_rewrite < 2.0.0 %description mod_rewrite @@ -1118,7 +1131,7 @@ Moduł oferujący możliwość ,,przepisywania'' adresów URL w locie. %package mod_setenvif Summary: Set environment variables based on client information Summary(pl.UTF-8): Ustawianie zmiennych środowiskowych w oparciu o informacje o kliencie -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_setenvif) = %{version}-%{release} @@ -1137,7 +1150,7 @@ części serwera do podejmowania decyzji o podejmowanych akcjach. %package mod_speling Summary: Automatically correct minor typos in URLs Summary(pl.UTF-8): Automatyczne poprawianie pomniejszych literówek w URL-ach -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_speling) = %{version}-%{release} @@ -1166,7 +1179,7 @@ dla tej strategii. %package mod_status Summary: Server status report module for apache Summary(pl.UTF-8): Moduł dostarczający informacje statystyczne o serwerze -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires(triggerpostun): sed >= 4.0 Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_status) = %{version}-%{release} @@ -1188,7 +1201,7 @@ przeglądarkę). %package mod_unique_id Summary: Apache module which provides a magic token for each request Summary(pl.UTF-8): Moduł nadający każdemu żądaniu unikalny token -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_unique_id) = %{version}-%{release} Obsoletes: apache-mod_unique_id < 2.0.0 @@ -1211,7 +1224,7 @@ UNIQUE_ID. %package mod_userdir Summary: User home directories Summary(pl.UTF-8): Katalogi domowe użytkowników -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_userdir) = %{version}-%{release} @@ -1224,7 +1237,7 @@ Ten moduł dostarcza obsługę katalogów specyficznych dla uzytkownika. %package mod_usertrack Summary: Apache module for user tracking using cookies Summary(pl.UTF-8): Moduł służący do śledzenia użytkowników przy użyciu ciasteczek -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_usertrack) = %{version}-%{release} Obsoletes: apache-mod_usertrack < 2.0.0 @@ -1242,7 +1255,7 @@ wiele plików logów. %package mod_vhost_alias Summary: Apache module for dynamically configured mass virtual hosting Summary(pl.UTF-8): Moduł dodający obsługę hostów wirtualnych -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires(triggerpostun): sed >= 4.0 Requires: %{name}(EAPI) = %{version}-%{release} Provides: apache(mod_vhost_alias) = %{version}-%{release} @@ -1276,8 +1289,21 @@ użytkowników HTTP. Ten pakiet zawiera htpasswd z Apache'a 1.x; ta wersja obsługuje hasła zapisane czystym tekstem oraz zakodowane algorytmami CRYPT (domyślnym), MD5 i SHA1. +%package cgi_test +Summary: cgi test/demo programs +Summary(pl.UTF-8): Programy testowe/przykładowe cgi +Group: Networking/Utilities +Requires: %{name}-base = %{version}-%{release} +Requires: filesystem >= 2.0-1 + +%description cgi_test +Two cgi test/demo programs: test-cgi and print-env. + +%description cgi_test -l pl.UTF-8 +Dwa programy testowe/przykładowe cgi: test-cgi and print-env. + %prep -%setup -q -n apache_%{version} -a3 %{?with_lingerd:-a25} +%setup -q -n apache_%{version} %{?with_lingerd:-a4} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -1321,42 +1347,35 @@ algorytmami CRYPT (domyślnym), MD5 i SHA1. %patch39 -p2 %patch40 -p2 %patch41 -p2 - %if %{with lingerd} mkdir -p lingerd cp -a lingerd-*/{README,TUNING,LICENSE,TODO,ChangeLog} lingerd cp -a lingerd-*/{apache-1.3/ap_lingerd.c,li_config.h} src/main %patch42 -p1 %endif +%patch43 -p1 +%patch44 -p1 + +# make manual link with full path +%{__sed} -i -e 's,href="manual/,href="/manual/,i' htdocs/index.html.* + +# fix libdir (at least in PLD layout; no need to care about other ones) +%{__sed} -i -e 's,/lib$,/%{_lib},' config.layout %build OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048" \ ./configure \ - --prefix=%{_sysconfdir} \ - --exec-prefix=%{_libexecdir} \ - --bindir=%{_bindir} \ - --sbindir=%{_sbindir} \ - --sysconfdir=%{_sysconfdir} \ - --datadir=%{_datadir} \ - --includedir=%{_includedir} \ - --libexecdir=%{_sysconfdir}/modules \ - --localstatedir=/var \ - --mandir=%{_mandir} \ - --manualdir=%{manualdir} \ - --runtimedir=/var/run \ - --logfiledir=/var/log/apache \ --with-layout=PLD \ --without-confadjust \ --enable-module=all \ --enable-module=auth_digest \ --enable-shared=max \ - --proxycachedir=/var/cache/apache \ --with-perl=%{__perl} \ --enable-suexec \ --suexec-caller=http \ --suexec-uidmin=500 \ --suexec-gidmin=500 \ - --suexec-docroot=%{_datadir} \ + --suexec-docroot=%{httpdir} \ --disable-rule=WANTHSREGEX \ --enable-rule=EAPI \ --target=apache \ @@ -1385,58 +1404,64 @@ rm -f src/modules/standard/mod_rewrite.so %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \ - $RPM_BUILD_ROOT%{_datadir}/errordocs \ - $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \ +install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ + $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \ + $RPM_BUILD_ROOT%{httpdir}/html \ $RPM_BUILD_ROOT%{_libexecdir} \ - $RPM_BUILD_ROOT/var/{log/{apache,archive/apache},run/apache} + $RPM_BUILD_ROOT/var/{log/{apache,archive/apache},run/apache} \ + $RPM_BUILD_ROOT%{systemdtmpfilesdir} %{__make} -j1 install-quiet \ root=$RPM_BUILD_ROOT -install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache1 +cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache1 sed -e 's,/usr/lib,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/apache -install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache +cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/apache bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +mv $RPM_BUILD_ROOT%{_mandir}/hu/man8/{httpd,apache}.8 +mv $RPM_BUILD_ROOT%{_mandir}/pl/man8/{httpd,apache}.8 touch $RPM_BUILD_ROOT/var/log/apache/{access,error,agent,referer}_log -install errordocs/* $RPM_BUILD_ROOT%{_datadir}/errordocs +install -d $RPM_BUILD_ROOT%{errordir} +cp -a errordocs/* $RPM_BUILD_ROOT%{errordir} mv $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf conf/apache.conf.dist -install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf +cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d" echo "LoadModule access_module modules/mod_access.so" > $CFG/01_mod_access.conf echo "LoadModule alias_module modules/mod_alias.so" > $CFG/02_mod_alias.conf echo "LoadModule asis_module modules/mod_asis.so" > $CFG/03_mod_asis.conf -install %{SOURCE21} $CFG/04_mod_cern_meta.conf +cp -a %{SOURCE21} $CFG/04_mod_cern_meta.conf echo "LoadModule cgi_module modules/mod_cgi.so" > $CFG/05_mod_cgi.conf echo "LoadModule env_module modules/mod_env.so" > $CFG/06_mod_env.conf echo "LoadModule include_module modules/mod_include.so" > $CFG/07_mod_include.conf echo "LoadModule log_agent_module modules/mod_log_agent.so" > $CFG/08_mod_log_agent.conf -install %{SOURCE14} $CFG/09_mod_log_config.conf +cp -a %{SOURCE14} $CFG/09_mod_log_config.conf echo "LoadModule log_referer_module modules/mod_log_referer.so" > $CFG/10_mod_log_referer.conf -install %{SOURCE16} $CFG/11_mod_mime_magic.conf -install %{SOURCE19} $CFG/12_mod_mime.conf -install %{SOURCE18} $CFG/13_mod_negotiation.conf -install %{SOURCE22} $CFG/14_mod_setenvif.conf +cp -a %{SOURCE16} $CFG/11_mod_mime_magic.conf +cp -a %{SOURCE19} $CFG/12_mod_mime.conf +cp -a %{SOURCE18} $CFG/13_mod_negotiation.conf +cp -a %{SOURCE22} $CFG/14_mod_setenvif.conf echo "LoadModule speling_module modules/mod_speling.so" > $CFG/15_mod_speling.conf -install %{SOURCE15} $CFG/16_mod_userdir.conf +cp -a %{SOURCE15} $CFG/16_mod_userdir.conf -install %{SOURCE8} $CFG/20_common.conf +cp -a %{SOURCE8} $CFG/20_common.conf +cp -a %{SOURCE6} $CFG/30_defaultindex.conf +cp -a %{SOURCE25} $CFG/30_manual.conf -install %{SOURCE23} $CFG/20_mod_vhost_alias.conf -install %{SOURCE9} $CFG/25_mod_status.conf -install %{SOURCE10} $CFG/30_mod_proxy.conf -install %{SOURCE20} $CFG/50_mod_actions.conf +cp -a %{SOURCE23} $CFG/20_mod_vhost_alias.conf +cp -a %{SOURCE9} $CFG/25_mod_status.conf +cp -a %{SOURCE10} $CFG/30_mod_proxy.conf +cp -a %{SOURCE20} $CFG/50_mod_actions.conf echo "LoadModule auth_module modules/mod_auth.so" > $CFG/51_mod_auth.conf echo "LoadModule auth_anon_module modules/mod_auth_anon.so" > $CFG/52_mod_auth_anon.conf echo "LoadModule auth_db_module modules/mod_auth_db.so" > $CFG/53_mod_auth_db.conf echo "LoadModule auth_digest_module modules/mod_auth_digest.so" > $CFG/54_mod_auth_digest.conf -install %{SOURCE11} $CFG/57_mod_autoindex.conf -install %{SOURCE12} $CFG/59_mod_dir.conf +cp -a %{SOURCE11} $CFG/57_mod_autoindex.conf +cp -a %{SOURCE12} $CFG/59_mod_dir.conf echo "LoadModule expires_module modules/mod_expires.so" > $CFG/67_mod_expires.conf echo "LoadModule headers_module modules/mod_headers.so" > $CFG/68_mod_headers.conf echo "LoadModule imap_module modules/mod_imap.so" > $CFG/69_mod_imap.conf @@ -1447,40 +1472,44 @@ echo "LoadModule define_module modules/mod_define.so" > $CFG/73_mod_define.conf echo "LoadModule digest_module modules/mod_digest.so" > $CFG/74_mod_digest.conf echo "LoadModule log_forensic_module modules/mod_log_forensic.so" > $CFG/75_mod_log_forensic.conf echo "LoadModule mmap_static_module modules/mod_mmap_static.so" > $CFG/76_mod_mmap_static.conf -install %{SOURCE13} $CFG/77_mod_info.conf -install %{SOURCE24} $CFG/80_errordocs.conf -install %{SOURCE17} $CFG/80_mod_alias.conf - -install %{SOURCE6} $RPM_BUILD_ROOT/etc/monit/apache.monitrc +cp -a %{SOURCE13} $CFG/77_mod_info.conf +cp -a %{SOURCE24} $CFG/80_errordocs.conf +cp -a %{SOURCE17} $CFG/80_mod_alias.conf +# cgi_test: create config file with ScriptAlias +cat << 'EOF' > $CFG/09_cgi_test.conf +ScriptAlias /cgi-bin/printenv %{cgibindir}/printenv +ScriptAlias /cgi-bin/test-cgi %{cgibindir}/test-cgi +EOF -ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html +ln -sf index.html.en $RPM_BUILD_ROOT%{docroot}/index.html mv $RPM_BUILD_ROOT%{_sbindir}/apxs $RPM_BUILD_ROOT%{apxs} mv $RPM_BUILD_ROOT%{_mandir}/man8/apxs.8 $RPM_BUILD_ROOT%{_mandir}/man8/apxs1.8 perl -p -i -e 's/^if ...O ne "MSWin32"./if (0)/' $RPM_BUILD_ROOT%{apxs} -mv $RPM_BUILD_ROOT%{_sysconfdir}/modules/* $RPM_BUILD_ROOT%{_libexecdir} -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/modules ln -s ../..%{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules ln -s ../../var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir} +cp -p %{SOURCE26} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf + # Not packaged. rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.default rm -f $RPM_BUILD_ROOT%{_sysconfdir}/{access,srm}.conf rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.exp rm -f $RPM_BUILD_ROOT%{_libexecdir}/mod_{auth_dbm,example}.so -rm -f $RPM_BUILD_ROOT%{_datadir}/icons{,/small}/README* rm -f $RPM_BUILD_ROOT%{_mandir}/README* +rm -rf $RPM_BUILD_ROOT%{_datadir}/apache-icons + # Not for our os or for older apache -rm $RPM_BUILD_ROOT%{_prefix}/share/apache1-manual/{cygwin,ebcdic,install-{z,}tpf,man-template}.html -rm $RPM_BUILD_ROOT%{_prefix}/share/apache1-manual/mod/mod_{auth_dbm,browser,dld,example,isapi,log_common}.html -rm $RPM_BUILD_ROOT%{_prefix}/share/apache1-manual/{mpeix,netware,new_features_1_[0-2],readme-tpf,suexec_1_2,unixware,vhosts/details_1_2}.html -rm $RPM_BUILD_ROOT%{_prefix}/share/apache1-manual/{win_{compiling,service}.html*,windows.html*} +rm $RPM_BUILD_ROOT%{manualdir}/{cygwin,ebcdic,install-{z,}tpf,man-template}.html +rm $RPM_BUILD_ROOT%{manualdir}/mod/mod_{auth_dbm,browser,dld,example,isapi,log_common}.html +rm $RPM_BUILD_ROOT%{manualdir}/{mpeix,netware,new_features_1_[0-2],readme-tpf,suexec_1_2,unixware,vhosts/details_1_2}.html +rm $RPM_BUILD_ROOT%{manualdir}/{win_{compiling,service}.html*,windows.html*} %if %{with lingerd} install lingerd-*/lingerd $RPM_BUILD_ROOT%{_libexecdir} @@ -1493,8 +1522,7 @@ rm -rf $RPM_BUILD_ROOT %pre base %groupadd -g 51 -r -f http %useradd -u 51 -r -d %{httpdir} -s /bin/false -c "HTTP User" -g http http - -if [ "`getent passwd http | cut -d: -f6`" = "/home/httpd" ]; then +if [ "$(getent passwd http | cut -d: -f6)" = "/home/httpd" ]; then /usr/sbin/usermod -d %{httpdir} http fi @@ -1532,7 +1560,7 @@ if [ "$1" = "2" ]; then ' /etc/apache/apache.conf fi -%triggerpostun base -- %{name} <= 1.3.31-5 +%triggerpostun base -- %{name} < 1.3.31-5.9 %banner %{name} -e -a <