X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=4081a927a122d79b2cd8a1ff773e776326ca07d2;hb=16d411b0af4234e8bca3bca70ad86bbb35e466c1;hp=b9f86125fb9a5950993a52891a8991ae89b36610;hpb=b4c4496ec5773261ad16c362cf232cef2afa0f45;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index b9f8612..4081a92 100644
--- a/apache.spec
+++ b/apache.spec
@@ -1,4 +1,5 @@
 # _without_ssl	- don't build with SSL support
+# _without_ldap	- don't build with LDAP support
 # TODO:
 # - mod_case_filter
 # - mod_case_filter_in
@@ -25,12 +26,12 @@ Summary(pt_BR):	Servidor HTTPD para prover servi
 Summary(ru):	óÁÍÙÊ ÐÏÐÕÌÑÒÎÙÊ ×ÅÂ-ÓÅÒ×ÅÒ
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
-Version:	2.0.47
-Release:	0.7
+Version:	2.0.48
+Release:	0.1.3
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	63f16638c18b140b649fab32b54d7f9c
+# Source0-md5:	466c63bb71b710d20a5c353df8c1a19c
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}-icons.tar.gz
@@ -51,20 +52,20 @@ Patch1:		%{name}-layout.patch
 Patch2:		%{name}-suexec.patch
 Patch3:		%{name}-nolibs.patch
 Patch4:		%{name}-apr.patch
-Patch5:		%{name}-new-apr.patch
 URL:		http://httpd.apache.org/
+BuildRequires:	apr-devel >= 1:0.9.4-1
+BuildRequires:	apr-util-devel >= 1:0.9.5-0.3
 BuildRequires:	db-devel
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel >= 1.8.3
-%{!?_without_ssl:BuildRequires:	openssl-devel >= 0.9.7}
-%{!?_without_ssl:BuildRequires:	openssl-tools >= 0.9.7}
+BuildRequires:	libtool >= 1.5
+%{!?_without_ldap:BuildRequires:	openldap-devel}
+%{!?_without_ssl:BuildRequires:	openssl-devel >= 0.9.7c}
+%{!?_without_ssl:BuildRequires:	openssl-tools >= 0.9.7c}
 BuildRequires:	perl-devel >= 5.004
 BuildRequires:	rpm-perlprov >= 4.0.4
 BuildRequires:	zlib-devel
-BuildRequires:	libtool >= 1.5
-BuildRequires:	apr-devel >= 1:0.9.4
-BuildRequires:	apr-util-devel >= 1:0.9.4
-PreReq:		perl
+PreReq:		perl-base
 PreReq:		rc-scripts
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
@@ -75,6 +76,7 @@ Requires(postun):	/usr/sbin/groupdel
 Requires(post,preun):	/sbin/chkconfig
 Requires(post,postun):	/sbin/ldconfig
 Requires(post):	fileutils
+Requires:	apr-util >= 1:0.9.4-1
 Requires:	/etc/mime.types
 Requires:	mailcap
 Requires:	psmisc >= 20.1
@@ -255,6 +257,18 @@ Ten modu
 anonimowych serwerów FTP (u¿ytkownik "anonymous" oraz has³o w postaci
 adresu pocztowego u¿ytkownika).
 
+%package mod_auth_ldap
+Summary:	Apache module with LDAP user access authentication
+Summary(pl):	Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}
+
+%description mod_auth_ldap
+Apache module with LDAP user access authentication.
+
+%description mod_auth_ldap -l pl
+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
@@ -333,7 +347,7 @@ Translacja lub przekodowywanie znak
 
 %package mod_dav
 Summary:	Apache module - Distributed Authoring and Versioning
-Summary(pl):	Modu³ Apache'a - Rozproszone autorstwo i wersjonowanie
+Summary(pl):	Modu³ Apache'a - rozproszone autorstwo i wersjonowanie
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -351,7 +365,7 @@ zdalnym serwerze WWW.
 
 %package mod_deflate
 Summary:	Apache module: Compress content before it is delivered to the client
-Summary(pl):	Modu³ kompresuj±cy dane przed przes³aniem ich do klienta
+Summary(pl):	Modu³ Apache'a kompresuj±cy dane przed przes³aniem ich do klienta
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -363,7 +377,7 @@ Modu
 
 %package mod_dir
 Summary:	Apache module for "trailing slash" redirects and serving directory index files
-Summary(pl):	Modu³ oferuj±cy przekierowania i udostêpnianie informacji o zawarto¶ci katalogu
+Summary(pl):	Modu³ Apache'a oferuj±cy przekierowania i udostêpnianie informacji o zawarto¶ci katalogu
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -377,7 +391,7 @@ katalogu.
 
 %package mod_headers
 Summary:	Apache module allows for the customization of HTTP response headers
-Summary(pl):	Modu³ pozwalaj±cy na modyfikacjê nag³ówków HTTP
+Summary(pl):	Modu³ Apache'a pozwalaj±cy na modyfikacjê nag³ówków HTTP
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -392,7 +406,7 @@ wysy
 
 %package mod_imap
 Summary:	Apache module with imap-file handler
-Summary(pl):	Modu³ z obs³ug± imap-file
+Summary(pl):	Modu³ Apache'a z obs³ug± imap-file
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -406,7 +420,7 @@ Modu
 
 %package mod_info
 Summary:	Apache module with comprehensive overview of the server configuration
-Summary(pl):	Modu³ udostêpniaj±cy informacje o serwerze
+Summary(pl):	Modu³ Apache'a udostêpniaj±cy informacje o serwerze
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -419,9 +433,21 @@ and directives in the configuration files.
 Modu³ udostêpniaj±cy informacje o konfiguracji serwera,
 zainstalowanych modu³ach itp.
 
+%package mod_ldap
+Summary:	Apache module to use LDAP connections
+Summary(pl):	Modu³ Apache'a umo¿liwiaj±cy korzystanie z po³±czeñ LDAP
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}
+
+%description mod_ldap
+Apache module to use LDAP connections.
+
+%description mod_ldap -l pl
+Modu³ Apache'a umo¿liwiaj±cy korzystanie z po³±czeñ LDAP.
+
 %package mod_proxy
 Summary:	Apache module with Web proxy
-Summary(pl):	Modu³ dodaj±cy obs³ugê serwera proxy
+Summary(pl):	Modu³ Apache'a dodaj±cy obs³ugê serwera proxy
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -438,7 +464,7 @@ HTTP/1.0 i HTTP/1.1.
 
 %package mod_rewrite
 Summary:	Apache module with rule-based engine for rewrite requested URLs on the fly
-Summary(pl):	Modu³ do "przepisywania" adresów URL w locie
+Summary(pl):	Modu³ Apache'a do "przepisywania" adresów URL w locie
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -472,8 +498,8 @@ Security).
 ÛÉÆÒÏ×ÁÎÉÑ ÓÒÅÄÓÔ×ÁÍÉ Secure Sockets Layer (SSL) É Transport Layer
 
 %package mod_status
-Summary:	Server status report module for apache
-Summary(pl):	Modu³ udostêpniaj±cy informacje statystyczne z serwera
+Summary:	Server status report module for Apache
+Summary(pl):	Modu³ udostêpniaj±cy informacje statystyczne z serwera Apache
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -490,7 +516,7 @@ pracy serwera apache (w postaci strony HTML).
 
 %package mod_usertrack
 Summary:	Apache module for user tracking using cookies
-Summary(pl):	Modu³ s³u¿±cy do ¶ledzenia "ciasteczek"
+Summary(pl):	Modu³ Apache'a s³u¿±cy do ¶ledzenia "ciasteczek"
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -504,7 +530,7 @@ Modu
 
 %package mod_vhost_alias
 Summary:	Apache module for dynamically configured mass virtual hosting
-Summary(pl):	Modu³ dodaj±cy obs³ugê hostów wirtualnych
+Summary(pl):	Modu³ Apache'a dodaj±cy obs³ugê hostów wirtualnych
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -518,7 +544,7 @@ wirtualnych.
 
 %package mod_unique_id
 Summary:	Apache module which provides a magic token for each request
-Summary(pl):	Modu³ nadaj±cy ka¿demu zapytaniu unikalny token
+Summary(pl):	Modu³ Apache'a nadaj±cy ka¿demu zapytaniu unikalny token
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -539,7 +565,7 @@ UNIQUE_ID.
 
 %package mod_expires
 Summary:	Apache module which generates Expires HTTP headers
-Summary(pl):	Modu³ generuj±cy nag³ówki HTTP Expires
+Summary(pl):	Modu³ Apache'a generuj±cy nag³ówki HTTP Expires
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}
 
@@ -555,8 +581,8 @@ wa
 ¼ród³owych lub odwo³ania klienta.
 
 %package mod_file_cache
-Summary:	Apache module: Caches a static list of files in memory
-Summary(pl):	Modu³ cache'uj±cy statyczn± listê plików w pamiêci
+Summary:	Apache module: caches a static list of files in memory
+Summary(pl):	Modu³ Apache'a cache'uj±cy statyczn± listê plików w pamiêci
 Group:		Networking/Daemons
 Obsoletes:	%{name}-mmap_static
 Requires:	%{name} = %{version}
@@ -574,7 +600,6 @@ Modu
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 # sanity check
@@ -618,6 +643,8 @@ fi
 	--enable-optional-hook-import \
 	--enable-optional-fn-import \
 	--enable-optional-fn-export \
+	%{!?_without_ldap:--enable-ldap} \
+	%{!?_without_ldap:--enable-auth-ldap} \
 	--enable-dav \
 	--enable-info \
 	--enable-suexec \
@@ -696,6 +723,7 @@ install %{SOURCE12} $CFG/40_mod_ssl.conf
 install %{SOURCE13} $CFG/45_mod_dav.conf
 install %{SOURCE14} $CFG/59_mod_dir.conf
 
+echo "LoadModule ldap_module       %{_libexecdir}/mod_ldap.so" > $CFG/49_mod_ldap.conf
 echo "LoadModule actions_module       %{_libexecdir}/mod_actions.so" > $CFG/50_mod_actions.conf
 echo "LoadModule auth_module          %{_libexecdir}/mod_auth.so" > $CFG/51_mod_auth.conf
 echo "LoadModule auth_anon_module     %{_libexecdir}/mod_auth_anon.so" > $CFG/52_mod_auth_anon.conf
@@ -707,6 +735,7 @@ LoadModule disk_cache_module    %{_libexecdir}/mod_disk_cache.so" > $CFG/55_mod_
 echo "LoadModule cgid_module          %{_libexecdir}/mod_cgid.so" > $CFG/56_mod_cgid.conf
 echo "LoadModule charset_lite_module  %{_libexecdir}/mod_charset_lite.so" > $CFG/57_mod_charset_lite.conf
 echo "LoadModule deflate_module       %{_libexecdir}/mod_deflate.so" > $CFG/58_mod_deflate.conf
+echo "LoadModule auth_ldap_module     %{_libexecdir}/mod_auth_ldap.so" > $CFG/59_mod_auth_ldap.conf
 echo "LoadModule expires_module       %{_libexecdir}/mod_expires.so" > $CFG/60_mod_expires.conf
 echo "LoadModule file_cache_module    %{_libexecdir}/mod_file_cache.so" > $CFG/61_mod_file_cache.conf
 echo "LoadModule headers_module       %{_libexecdir}/mod_headers.so" > $CFG/62_mod_headers.conf
@@ -1240,6 +1269,22 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_auth_anon.so
 %{_datadir}/manual/mod/mod_auth_anon.html.en
 
+%if %{!?_without_ldap:1}%{?_without_ldap:0}
+%files mod_auth_ldap
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_ldap.conf
+%attr(755,root,root) %{_libexecdir}/mod_auth_ldap.so
+%{_datadir}/manual/mod/mod_auth_ldap.html.en
+%endif
+
+%if %{!?_without_ldap:1}%{?_without_ldap:0}
+%files mod_ldap
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_ldap.conf
+%attr(755,root,root) %{_libexecdir}/mod_ldap.so
+%{_datadir}/manual/mod/mod_ldap.html.en
+%endif
+
 %files mod_auth_dbm
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_dbm.conf