- fix 2.0.51 regression in Satisfy merging (CAN-2004-0811)
This commit is contained in:
parent
60b377a104
commit
5d106b5d47
@ -7,7 +7,7 @@
|
|||||||
Summary: Apache HTTP Server
|
Summary: Apache HTTP Server
|
||||||
Name: httpd
|
Name: httpd
|
||||||
Version: 2.0.51
|
Version: 2.0.51
|
||||||
Release: 5
|
Release: 6
|
||||||
URL: http://httpd.apache.org/
|
URL: http://httpd.apache.org/
|
||||||
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
|
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
|
||||||
Source1: index.html
|
Source1: index.html
|
||||||
@ -70,6 +70,8 @@ Patch89: httpd-2.0.49-headerssl.patch
|
|||||||
Patch90: httpd-2.0.49-workerstack.patch
|
Patch90: httpd-2.0.49-workerstack.patch
|
||||||
Patch91: httpd-2.0.46-testhook.patch
|
Patch91: httpd-2.0.46-testhook.patch
|
||||||
Patch92: httpd-2.0.46-dumpcerts.patch
|
Patch92: httpd-2.0.46-dumpcerts.patch
|
||||||
|
# Security fixes
|
||||||
|
Patch150: httpd-2.0.51-CAN-2004-0811.patch
|
||||||
License: Apache Software License
|
License: Apache Software License
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
BuildRoot: %{_tmppath}/%{name}-root
|
BuildRoot: %{_tmppath}/%{name}-root
|
||||||
@ -181,6 +183,8 @@ executed by SSI pages) as a user other than the 'apache' user.
|
|||||||
%patch91 -p1 -b .testhook
|
%patch91 -p1 -b .testhook
|
||||||
%patch92 -p1 -b .dumpcerts
|
%patch92 -p1 -b .dumpcerts
|
||||||
|
|
||||||
|
%patch150 -p1 -b .can0811
|
||||||
|
|
||||||
# Patch in vendor/release string
|
# Patch in vendor/release string
|
||||||
sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
|
sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
|
||||||
|
|
||||||
@ -578,6 +582,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man8/suexec.8*
|
%{_mandir}/man8/suexec.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 21 2004 Joe Orton <jorton@redhat.com> 2.0.51-6
|
||||||
|
- fix 2.0.51 regression in Satisfy merging (CAN-2004-0811)
|
||||||
|
|
||||||
* Sat Sep 18 2004 Joe Orton <jorton@redhat.com> 2.0.51-5
|
* Sat Sep 18 2004 Joe Orton <jorton@redhat.com> 2.0.51-5
|
||||||
- switch to Jeff Trawick's child reclaim timing logic patch
|
- switch to Jeff Trawick's child reclaim timing logic patch
|
||||||
- migration guide updates
|
- migration guide updates
|
||||||
|
Loading…
Reference in New Issue
Block a user