- added -bug_33382.patch (large memory consumption)

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index caa8e38665e70879c94ff096f9f6637300fba45d..df1c0d3b906c579ddd8bd685b45c230c3cfae09f 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -34,7 +34,7 @@ Summary(ru):  
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
 Version:       2.0.53
-Release:       2.1
+Release:       3.3
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -89,6 +89,7 @@ Patch23:      %{name}-apr1.patch
 Patch24:       %{name}-normalize-path.patch
 # http://issues.apache.org/bugzilla/attachment.cgi?id=13377 external pcre
 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
@@ -122,6 +123,21 @@ Requires:  %{name}-apxs = %{version}-%{release}
 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)
@@ -700,27 +716,24 @@ Caches a static list of files in memory.
 Modu³ cache'uj±cy statyczn± listê plików w pamiêci.
 
 %package -n htpasswd-%{name}
-Summary:       Apache2 htpasswd utility
+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 from Apache2
-
-Usage:
-        htpasswd [-cmdpsD] passwordfile username
-        htpasswd -b[cmdpsD] passwordfile username password
-
-        htpasswd -n[mdps] username
-        htpasswd -nb[mdps] username password
- -c  Create a new file.
- -n  Don't update file; display results on stdout.
- -m  Force MD5 encryption of the password.
- -d  Force CRYPT encryption of the password (default).
- -p  Do not encrypt the password (plaintext).
- -s  Force SHA encryption of the password.
- -b  Use the password from the command line rather than prompting for it.
- -D  Delete the specified user.
+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 p³askich plików s³u¿±cych
+do przechowywania nazw u¿ytkowników i hase³ do uwierzytelnienia basic
+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}
@@ -748,6 +761,7 @@ Usage:
 %patch23 -p1
 %patch24 -p1
 %{?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
@@ -951,6 +965,7 @@ find $RPM_BUILD_ROOT%{_datadir}/manual -type 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
@@ -1742,4 +1757,5 @@ fi
 %files -n htpasswd-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/htpasswd
+%{_sbindir}/htpasswd
 %{_mandir}/man1/htpasswd.1*