SPECS: apache1.spec - update to 1.3.39, resolves CVE-2006-5752, ...

[glen]

Author: glen                         Date: Mon Oct 22 23:05:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to 1.3.39,
  resolves CVE-2006-5752, CVE-2007-3304

---- Files affected:
SPECS:
   apache1.spec (1.169 -> 1.170) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.169 SPECS/apache1.spec:1.170
--- SPECS/apache1.spec:1.169	Sun Oct 14 01:25:52 2007
+++ SPECS/apache1.spec	Tue Oct 23 01:05:16 2007
@@ -28,12 +28,12 @@
 Summary(uk.UTF-8):	Найпопулярніший Web-Server
 Summary(zh_CN.UTF-8):	Internet 上应用最广泛的 Web 服务程序。
 Name:		apache1
-Version:	1.3.37
-Release:	10
+Version:	1.3.39
+Release:	0.1
 License:	Apache Group
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
-# Source0-md5:	b278f0969a9ccadeb781316e79e3520f
+# Source0-md5:	76066f630203291acd20c764e5eedb6e
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	apache-icons.tar.gz
@@ -60,6 +60,7 @@
 Source22:	%{name}-mod_setenvif.conf
 Source23:	%{name}-mod_vhost_alias.conf
 Source24:	%{name}-errordocs.conf
+# http://www.iagora.com/about/software/lingerd/
 Source25:	http://images.iagora.com/media/software/lingerd/lingerd-0.94.tar.gz
 # Source25-md5:	6401015bafad4f44fdf8a9a1795d9258
 Patch0:		%{name}-PLD.patch
@@ -106,6 +107,7 @@
 Patch39:	%{name}-security_htdigest_local_buffer_overflow.patch
 Patch40:	%{name}-security_htpasswd_user_buffer_overflow.patch
 Patch41:	%{name}-security_check_forensic_tempfiles.patch
+Patch42:	%{name}-lingerd.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	bash
 BuildRequires:	db-devel >= 4.1
@@ -1322,11 +1324,10 @@
 %patch41 -p2
 
 %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
+cp -a lingerd-*/{README,TUNING,LICENSE,TODO,ChangeLog} lingerd
+cp -a lingerd-*/{apache-1.3/ap_lingerd.c,li_config.h} src/main
+%patch42 -p1
 %endif
 
 %build
@@ -1377,7 +1378,7 @@
 	LIBS_SHLIB="-ldb %{?with_rewrite_ldap:-lldap -llber}"
 
 %if %{with lingerd}
-%{__make} -C _lingerd lingerd \
+%{__make} -C lingerd-* lingerd \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}"
 	LDFLAGS="%{rpmldflags}"
@@ -1395,7 +1396,7 @@
 	root=$RPM_BUILD_ROOT
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache1
-sed -e '%{?with_lingerd:s,/usr/lib,%{_libdir},g}' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/apache
+sed -e 's,/usr/lib,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/apache
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache
 bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -1483,7 +1484,7 @@
 rm $RPM_BUILD_ROOT%{_prefix}/share/apache1-manual/{win_{compiling,service}.html*,windows.html*}
 
 %if %{with lingerd}
-install _lingerd/lingerd $RPM_BUILD_ROOT%{_libexecdir}
+install lingerd-*/lingerd $RPM_BUILD_ROOT%{_libexecdir}
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run/lingerd
 %endif
 
@@ -2453,6 +2454,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170  2007/10/22 23:05:16  glen
+- update to 1.3.39,
+  resolves CVE-2006-5752, CVE-2007-3304
+
 Revision 1.169  2007/10/13 23:25:52  dzeus
 - rel. 10
 
@@ -2559,7 +2564,7 @@
 - add blocker
 
 Revision 1.135  2006/05/02 22:26:01  glen
-- up to 1.3.35
+- up to 1.3.35 [CVE-2005-3352, CVE-2006-3918]
 
 Revision 1.134  2006/04/13 08:43:25  glen
 - add apxs DESTDIR patch, rel 9
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache1.spec?r1=1.169&r2=1.170&f=u