SPECS: apache1.spec - add lingerd patch

[glen]

Author: glen                         Date: Tue Nov 29 00:11:08 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add lingerd patch

---- Files affected:
SPECS:
   apache1.spec (1.120 -> 1.121) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.120 SPECS/apache1.spec:1.121
--- SPECS/apache1.spec:1.120	Sun Nov 20 21:11:52 2005
+++ SPECS/apache1.spec	Tue Nov 29 01:11:03 2005
@@ -6,6 +6,7 @@
 %bcond_with	rewrite_ldap	# enable ldap map support for mod_rewrite (alpha)
 %bcond_without	ipv6		# disable IPv6 support
 %bcond_with	minimal		# minimal apache, without any modules
+%bcond_with	lingerd		# build with lingerd support
 #
 %include	/usr/lib/rpm/macros.perl
 Summary:	The most widely used Web server on the Internet
@@ -31,7 +32,7 @@
 Summary(zh_CN):	Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ
 Name:		apache1
 Version:	1.3.34
-Release:	5
+Release:	5.3
 License:	Apache Group
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -62,6 +63,8 @@
 Source22:	%{name}-mod_setenvif.conf
 Source23:	%{name}-mod_vhost_alias.conf
 Source24:	%{name}-errordocs.conf
+Source25:	http://images.iagora.com/media/software/lingerd/lingerd-0.94.tar.gz
+# Source25-md5:	6401015bafad4f44fdf8a9a1795d9258
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-suexec.patch
 Patch2:		%{name}-errordocs.patch
@@ -124,6 +127,7 @@
 Provides:	webserver = apache
 Provides:	apache = %{version}-%{release}
 %{?with_ipv6:Provides:	apache1(ipv6)}
+%{?with_lingerd:Provides:	apache1(lingerd)}
 Obsoletes:	apache < 2.0.0
 Obsoletes:	apache-extra
 Obsoletes:	apache6
@@ -144,6 +148,9 @@
 Web server. Apache is also the most popular Web server on the
 Internet.
 
+%{?with_lingerd:This version of Apache includes lingerd support:}
+%{?with_lingerd:<http://www.iagora.com/about/software/lingerd/>.}
+
 %description -l cs
 Apache je výkonný plně funkční efektivní a volně dostupný WWW server.
 Je to nejpopulárnější WWW server v Internetu.
@@ -1232,7 +1239,7 @@
 algorytmami CRYPT (domyślnym), MD5 i SHA1.
 
 %prep
-%setup -q -n apache_%{version} -a3
+%setup -q -n apache_%{version} -a3 %{?with_lingerd:-a25}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -1257,6 +1264,14 @@
 %patch21 -p1
 %patch22 -p1
 
+%if %{with lingerd}
+mv lingerd-* _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
+patch -p0 -d src < _lingerd/apache-1.3/aplinger-ssl.diff
+%endif
+
 %build
 OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048" \
 ./configure \
@@ -1301,6 +1316,13 @@
 %{__make} -C src/modules/standard mod_rewrite.so \
 	LIBS_SHLIB="-ldb %{?with_rewrite_ldap:-lldap -llber}"
 
+%if %{with lingerd}
+make -C _lingerd  lingerd \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}"
+	LDFLAGS="%{rpmldflags}"
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \
@@ -1400,6 +1422,11 @@
 rm $RPM_BUILD_ROOT/usr/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/usr/share/apache1-manual/{win_{compiling,service}.html*,windows.html*}
 
+%if %{with lingerd}
+install _lingerd/lingerd $RPM_BUILD_ROOT%{_libexecdir}
+install -d $RPM_BUILD_ROOT%{_localstatedir}/run/lingerd
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1787,6 +1814,7 @@
 %defattr(644,root,root,755)
 %doc ABOUT_APACHE src/CHANGES README
 %doc conf/mime.types conf/apache.conf.dist
+%{?with_lingerd:%doc lingerd}
 
 %attr(754,root,root) /etc/rc.d/init.d/apache
 
@@ -1804,6 +1832,11 @@
 
 %dir %{_libexecdir}
 
+%if %{with lingerd}
+%{_libexecdir}/lingerd
+%attr(770,root,http) %dir %{_localstatedir}/run/lingerd
+%endif
+
 %attr(755,root,root) %{_bindir}/checkgid
 %attr(755,root,root) %{_bindir}/htdigest
 
@@ -2364,6 +2397,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2005/11/29 00:11:03  glen
+- add lingerd patch
+
 Revision 1.120  2005/11/20 20:11:52  glen
 - rel 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.120&r2=1.121&f=u