SPECS (AC-branch): apache.spec - merge from HEAD (suexec.fcgi, ldap desc up...

[glen]

Author: glen                         Date: Sun Jun  8 11:53:54 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge from HEAD (suexec.fcgi, ldap desc update)

---- Files affected:
SPECS:
   apache.spec (1.498.2.13 -> 1.498.2.14) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.498.2.13 SPECS/apache.spec:1.498.2.14
--- SPECS/apache.spec:1.498.2.13	Sat Jun  7 13:22:38 2008
+++ SPECS/apache.spec	Sun Jun  8 13:53:48 2008
@@ -36,7 +36,7 @@
 Name:		apache
 Version:	2.2.8
 Release:	3
-License:	Apache Group License
+License:	Apache
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 # Source0-md5:	39a755eb0f584c279336387b321e3dfc
@@ -89,10 +89,11 @@
 Patch18:	%{name}-v6only-ENOPROTOOPT.patch
 Patch19:	%{name}-conffile-path.patch
 Patch20:	%{name}-apxs.patch
-# http://www.telana.com/peruser.php (2.2.3-peruser-0.3.0)
+# http://www.telana.com/peruser.php (2.2.3-0.3.0)
 Patch21:	httpd-peruser.patch
 Patch22:	%{name}-libtool.patch
-Patch23:	%{name}-revert-bug-40463.patch
+Patch23:	%{name}-suexec_fcgi.patch
+Patch24:	%{name}-revert-bug-40463.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	apr-devel >= 1:1.2
 BuildRequires:	apr-util-devel >= 1:1.2
@@ -1288,18 +1289,24 @@
 zainstalowanych modułach itp.
 
 %package mod_ldap
-Summary:	Apache module to use LDAP connections
-Summary(pl.UTF-8):	Moduł Apache'a umożliwiający korzystanie z połączeń LDAP
+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
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ldap.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_ldap) = %{version}-%{release}
 
 %description mod_ldap
-Apache module to use LDAP connections.
+This module was created to improve the performance of websites relying
+on backend connections to LDAP servers. In addition to the functions
+provided by the standard LDAP libraries, this module adds an LDAP
+connection pool and an LDAP shared memory cache.
 
 %description mod_ldap -l pl.UTF-8
-Moduł Apache'a umożliwiający korzystanie z połączeń LDAP.
+Moduł Apache'a poprawiający wydajność serwisów polegających na
+połączeniach z serwerami LDAP. Oprócz funkcjo udostępnianych przez
+standardowe biblioteki LDAP ten moduł dodaje zarządzanie pulą połączeń
+i współdzieloną pamięć podręczną zapytań.
 
 %package mod_log_config
 Summary:	Logging of the requests made to the server
@@ -1741,6 +1748,7 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 # using system apr, apr-util and pcre
 rm -rf srclib/{apr,apr-util,pcre}
@@ -2001,6 +2009,10 @@
 ScriptAlias /cgi-bin/test-cgi %{_cgibindir}/test-cgi
 EOF
 
+# our suexec is patched to support php + fcgi + suexec with
+# virtual users when called as suexec.fcgi
+ln -sf suexec $RPM_BUILD_ROOT%{_sbindir}/suexec.fcgi
+
 # no value
 rm $RPM_BUILD_ROOT%{_libexecdir}/build/config.nice
 rm $RPM_BUILD_ROOT%{_libexecdir}/*.exp
@@ -2322,6 +2334,7 @@
 %files suexec
 %defattr(644,root,root,755)
 %attr(4755,root,root) %{_sbindir}/suexec
+%attr(755,root,root) %{_sbindir}/suexec.fcgi
 %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*
@@ -2349,6 +2362,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/apxs
 %attr(755,root,root) %{_sbindir}/envvars*
+%dir %{_libexecdir}
 %dir %{_libexecdir}/build
 %{_libexecdir}/build/[lprs]*.mk
 %{_libexecdir}/build/config_vars.mk
@@ -2714,6 +2728,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.498.2.14  2008-06-08 11:53:48  glen
+- merge from HEAD (suexec.fcgi, ldap desc update)
+
 Revision 1.498.2.13  2008-06-07 11:22:38  arekm
 - rel 3; readd apache-bug-40970.patch to prevent stat()ing on each documentroot
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache.spec?r1=1.498.2.13&r2=1.498.2.14&f=u