# - --with-suexec-uidmin=500 or =1000 ?
# - subpackages for MPMs
# - check if all modules (*.so) are exactly the same for different MPMs
+# - install stage fails with distcc (make -jN)
#
# Conditional build:
%bcond_without ssl # build without SSL support
Summary(ru): óÁÍÙÊ ÐÏÐÕÌÑÒÎÙÊ ×ÅÂ-ÓÅÒ×ÅÒ
Summary(tr): Lider WWW tarayýcý
Name: apache
-Version: 2.0.52
-Release: 10
+Version: 2.0.53
+Release: 4
License: Apache Group License
Group: Networking/Daemons
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: eba528fa8613dc5bfb0615a69c11f053
+# Source0-md5: b089bdc7065c3be166bcc516b0d92416
# Source0-size: 6918995
Source1: %{name}.init
Source2: %{name}.logrotate
Patch22: httpd-2.0.50-peruser-r3.patch
Patch23: %{name}-apr1.patch
Patch24: %{name}-normalize-path.patch
-Patch25: %{name}-CAN-2004-0942.patch
# http://issues.apache.org/bugzilla/attachment.cgi?id=13377 external pcre
-Patch26: %{name}2-pcre-patch.diff
+Patch25: %{name}2-pcre-patch.diff
+Patch26: %{name}-bug_33382.patch
URL: http://httpd.apache.org/
BuildRequires: automake
BuildRequires: apr-devel >= 1:1.0.0
Requires: mailcap
Requires: psmisc >= 20.1
Provides: apache(modules-api) = %{_apache_modules_api}
+Provides: apache(mod_access)
+Provides: apache(mod_alias)
+Provides: apache(mod_asis)
+Provides: apache(mod_autoindex)
+Provides: apache(mod_cern_meta)
+Provides: apache(mod_cgi)
+Provides: apache(mod_env)
+Provides: apache(mod_include)
+Provides: apache(mod_log_config)
+Provides: apache(mod_mime)
+Provides: apache(mod_mime_magic)
+Provides: apache(mod_negotiation)
+Provides: apache(mod_setenvif)
+Provides: apache(mod_speling)
+Provides: apache(mod_userdir)
Provides: group(http)
Provides: httpd = %{version}
Provides: user(http)
%description -l pl
Apache jest serwerem WWW (World Wide Web). Instaluj±c ten pakiet
-bêdziesz móg³ prezentowaæ w³asne strony WWW w sieci internet.
+bêdziesz móg³ prezentowaæ w³asne strony WWW w sieci Internet.
%description -l pt_BR
O servidor web Apache é o melhor servidor gratuito disponível no mundo
%package suexec
Summary: Apache suexec wrapper
Summary(pl): Wrapper suexec do serwera WWW Apache
-Group: Development/Tools
+Group: Networking/Daemons
Requires: %{name} = %{version}-%{release}
%description suexec
Apache index.html* files.
%description index -l pl
-Pliki Apache index.html*.
+Pliki index.html* Apache'a.
%package doc
Summary: Apache manual
%description devel -l pl
Pliki nag³ówkowe i inne zasoby niezbêdne przy budowaniu modu³ów DSO
-(Dynamic Shared Objects) dla Apache.
+(Dynamic Shared Objects) dla Apache'a.
%description devel -l ru
óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ ÍÏÄÕÌÅÊ ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache.
Summary: Apache module for run CGI whenever a file of a certain type is requested
Summary(pl): Modu³ Apache'a do uruchamiania skryptów CGI
Group: Networking/Daemons
+Provides: apache(mod_actions) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_actions
Summary: Apache module with user authentication using textual files
Summary(pl): Modu³ Apache'a identyfikuj±cy u¿ytkowników na podstawie plików tekstowych
Group: Networking/Daemons
+Provides: apache(mod_auth) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
+Requires: htpasswd
%description mod_auth
This package contains mod_auth module. It provides for user
Summary: Apache module with "anonymous" user access authentication
Summary(pl): Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkownika "anonimowego"
Group: Networking/Daemons
+Provides: apache(mod_auth_anon) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_auth_anon
Summary: Apache module with LDAP user access authentication
Summary(pl): Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP
Group: Networking/Daemons
+Provides: apache(mod_auth_ldap) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: %{name}-mod_ldap = %{version}-%{release}
Apache module with LDAP user access authentication.
%description mod_auth_ldap -l pl
-Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP
+Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP.
%package mod_auth_dbm
Summary: Apache module with user authentication which uses DBM files
Summary(pl): Modu³ Apache'a z mechanizmem identyfikacji korzystaj±cym z plików DBM
Group: Networking/Daemons
Obsoletes: apache-mod_auth_db
+Provides: apache(mod_auth_dbm) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_auth_dbm
Summary(pl): Modu³ Apache'a do autoryzacji MD5
Group: Networking/Daemons
Obsoletes: apache-mod_digest
+Provides: apache(mod_auth_digest) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_auth_digest
Summary: Apache module - display index of files
Summary(pl): Modu³ apache do wy¶wietlania indeksu plików
Group: Networking/Daemons
+Provides: apache(mod_autoindex) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_autoindex
Summary: Content cache keyed to URIs
Summary(pl): Pamiêæ podrêczna wg klucza URI
Group: Networking/Daemons
+Provides: apache(mod_cache) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_cache
Implementacja zgodnej z RFC 2616 pamiêci podrêcznej, która mo¿e byæ
u¿ywana do zapamiêtywania zawarto¶ci lokalnej lub dostêpnej przez
proxy. Do³±czono dwa modu³y pozwalaj±ce magazynowaæ dane w pamiêci
-(g³ównie u¿yteczne przy cacheowaniu lokalnej zawarto¶ci) oraz na dysku
-(u¿ywane do cacheowania proxy).
+(g³ównie u¿yteczne przy cache'owaniu lokalnej zawarto¶ci) oraz na
+dysku (u¿ywane do cache'owania proxy).
%package mod_cgid
Summary: Execution of CGI scripts using an external CGI daemon
Summary(pl): Uruchamianie zewnêtrznych skryptów CGI za pomoc± daemona CGI
Group: Networking/Daemons
+Provides: apache(mod_cgid) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_cgid
Summary: Specify character set translation or recoding
Summary(pl): Translacja lub przekodowywanie znaków
Group: Networking/Daemons
+Provides: apache(mod_charset_lite) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_charset_lite
Summary: Apache module - Distributed Authoring and Versioning
Summary(pl): Modu³ Apache'a - rozproszone autorstwo i wersjonowanie
Group: Networking/Daemons
+Provides: apache(mod_dav) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_dav
Summary: Apache module: Compress content before it is delivered to the client
Summary(pl): Modu³ Apache'a kompresuj±cy dane przed przes³aniem ich do klienta
Group: Networking/Daemons
+Provides: apache(mod_deflate) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: %{name}-mod_headers = %{version}-%{release}
Summary: Apache module for "trailing slash" redirects and serving directory index files
Summary(pl): Modu³ Apache'a oferuj±cy przekierowania i udostêpnianie informacji o zawarto¶ci katalogu
Group: Networking/Daemons
+Provides: apache(mod_dir) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_dir
Summary: Apache module allows for the customization of HTTP response headers
Summary(pl): Modu³ Apache'a pozwalaj±cy na modyfikacjê nag³ówków HTTP
Group: Networking/Daemons
+Provides: apache(mod_headers) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_headers
replaced or removed.
%description mod_headers -l pl
-Modu³ pozwalaj±cy na ³±czenie, usuwania, zamianê nag³ówków HTTP
+Modu³ pozwalaj±cy na ³±czenie, usuwanie oraz zamianê nag³ówków HTTP
wysy³anych do przegl±darki.
%package mod_imap
Summary: Apache module with imap-file handler
Summary(pl): Modu³ Apache'a z obs³ug± imap-file
Group: Networking/Daemons
+Provides: apache(mod_imap) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_imap
Summary: Apache module with comprehensive overview of the server configuration
Summary(pl): Modu³ Apache'a udostêpniaj±cy informacje o serwerze
Group: Networking/Daemons
+Provides: apache(mod_info) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_info
Summary: Apache module to use LDAP connections
Summary(pl): Modu³ Apache'a umo¿liwiaj±cy korzystanie z po³±czeñ LDAP
Group: Networking/Daemons
+Provides: apache(mod_ldap) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_ldap
Summary: Apache module with Web proxy
Summary(pl): Modu³ Apache'a dodaj±cy obs³ugê serwera proxy
Group: Networking/Daemons
+Provides: apache(mod_proxy) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_proxy
Summary: Apache module with rule-based engine for rewrite requested URLs on the fly
Summary(pl): Modu³ Apache'a do "przepisywania" adresów URL w locie
Group: Networking/Daemons
+Provides: apache(mod_rewrite) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_rewrite
Summary(ru): íÏÄÕÌØ SSL/TLS ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache
Group: Networking/Daemons
Epoch: 1
+Provides: apache(mod_ssl) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_ssl
Summary: Server status report module for Apache
Summary(pl): Modu³ udostêpniaj±cy informacje statystyczne z serwera Apache
Group: Networking/Daemons
+Provides: apache(mod_status) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_status
%description mod_status -l pl
Modu³ pozwala administratorowi na przegl±danie statystyk dotycz±cych
-pracy serwera apache (w postaci strony HTML).
+pracy serwera Apache (w postaci strony HTML).
%package mod_usertrack
Summary: Apache module for user tracking using cookies
Summary(pl): Modu³ Apache'a s³u¿±cy do ¶ledzenia "ciasteczek"
Group: Networking/Daemons
+Provides: apache(mod_usertrack) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_usertrack
Summary: Apache module for dynamically configured mass virtual hosting
Summary(pl): Modu³ Apache'a dodaj±cy obs³ugê hostów wirtualnych
Group: Networking/Daemons
+Provides: apache(mod_vhost_alias) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_vhost_alias
Summary: Apache module which provides a magic token for each request
Summary(pl): Modu³ Apache'a nadaj±cy ka¿demu zapytaniu unikalny token
Group: Networking/Daemons
+Provides: apache(mod_unique_id) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_unique_id
Summary: Apache module which generates Expires HTTP headers
Summary(pl): Modu³ Apache'a generuj±cy nag³ówki HTTP Expires
Group: Networking/Daemons
+Provides: apache(mod_expires) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_expires
Summary(pl): Modu³ Apache'a cache'uj±cy statyczn± listê plików w pamiêci
Group: Networking/Daemons
Obsoletes: apache-mmap_static
+Provides: apache(mod_file_cache) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_file_cache
%description mod_file_cache -l pl
Modu³ cache'uj±cy statyczn± listê plików w pamiêci.
+%package -n htpasswd-%{name}
+Summary: Apache 2 htpasswd utility: manage user files for basic authentication
+Summary(pl): Narzêdzie htpasswd z Apache'a 2 do zarz±dzania plikami uwierzytelnienia basic
+Group: Networking/Utilities
+Provides: htpasswd
+Obsoletes: htpasswd
+
+%description -n htpasswd-%{name}
+htpasswd is used to create and update the flat-files used to store
+usernames and password for basic authentication of HTTP users. This
+package contains htpasswd from Apache 2; this version supports
+plaintext passwords and CRYPT (default), MD5 and SHA1 encryptions.
+
+%description -n htpasswd-%{name} -l pl
+htpasswd s³u¿y do tworzenia i uaktualniania plików tekstowych
+s³u¿±cych do przechowywania nazw u¿ytkowników i hase³ do podstawowego
+uwierzytelnienia u¿ytkowników HTTP. Ten pakiet zawiera htpasswd z
+Apache'a 2; ta wersja obs³uguje has³a zapisane czystym tekstem oraz
+zakodowane algorytmami CRYPT (domy¶lnym), MD5 i SHA1.
+
%prep
%setup -q -n httpd-%{version}
%patch0 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
-%{?with_external_pcre:%patch26 -p2}
+%{?with_external_pcre:%patch25 -p2}
+%patch26 -p1
%{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@" $(grep -rl "/usr/local/bin/perl" *)
%{__perl} -pi -e "s@BUILD_SUBDIRS.*@BUILD_SUBDIRS =@g" srclib/Makefile.in
--with-suexec-umask=077 \
--with-apr=%{_bindir}/apr-1-config \
--with-apr-util=%{_bindir}/apu-1-config \
- %{?_with_external_pcre:--with-external-pcre}
+ %{?with_external_pcre:--with-external-pcre}
+
%{__make}
./httpd.${mpm} -l | grep -v "${mpm}" > modules-inside
-name '*.xml' -o -name '*.xml.*' -o -name '*.html' \
| xargs rm -f
+# htpasswd goes to %{_bindir}
+mv $RPM_BUILD_ROOT%{_sbindir}/htpasswd $RPM_BUILD_ROOT%{_bindir}/
+ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}/
+
%clean
rm -rf $RPM_BUILD_ROOT
%{_datadir}/manual/mod/mod_rewrite.html.en
%{_datadir}/manual/images/mod_rewrite*
%dir %{_datadir}/manual/ssl
-%{_datadir}/manual/ssl/*.gif
-%{_datadir}/manual/ssl/*.png
%{_datadir}/manual/ssl/*.html.en
%lang(ja) %{_datadir}/manual/ssl/*.html.ja*
%{_datadir}/manual/mod/mod_ssl.html.en
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth.conf
%attr(755,root,root) %{_libexecdir}/mod_auth.so
-%attr(755,root,root) %{_sbindir}/htpasswd
-%{_mandir}/man1/htpasswd.1*
%files mod_auth_anon
%defattr(644,root,root,755)
%defattr(644,root,root,755)
%attr(755,root,root) %{_libexecdir}/mod_vhost_alias.so
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_vhost_alias.conf
+
+%files -n htpasswd-%{name}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/htpasswd
+%{_sbindir}/htpasswd
+%{_mandir}/man1/htpasswd.1*
projects / packages / apache.git / blobdiff