diff options
| author | jorton <jorton@fedoraproject.org> | 2004-09-21 09:24:00 +0000 |
|---|---|---|
| committer | jorton <jorton@fedoraproject.org> | 2004-09-21 09:24:00 +0000 |
| commit | 5d106b5d471e506ae3f21f3783b6b4a73cff7641 (patch) | |
| tree | 5f20397b4bc63298cb10b4b981dea8ebb6fed5ee /httpd.spec | |
| parent | 60b377a104b4e9bdab5e6309dc08cc8a36cbcf8d (diff) | |
| download | httpd-5d106b5d471e506ae3f21f3783b6b4a73cff7641.tar.gz httpd-5d106b5d471e506ae3f21f3783b6b4a73cff7641.tar.xz httpd-5d106b5d471e506ae3f21f3783b6b4a73cff7641.zip | |
- fix 2.0.51 regression in Satisfy merging (CAN-2004-0811)
Diffstat (limited to 'httpd.spec')
| -rw-r--r-- | httpd.spec | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.0.51 -Release: 5 +Release: 6 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -70,6 +70,8 @@ Patch89: httpd-2.0.49-headerssl.patch Patch90: httpd-2.0.49-workerstack.patch Patch91: httpd-2.0.46-testhook.patch Patch92: httpd-2.0.46-dumpcerts.patch +# Security fixes +Patch150: httpd-2.0.51-CAN-2004-0811.patch License: Apache Software License Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-root @@ -181,6 +183,8 @@ executed by SSI pages) as a user other than the 'apache' user. %patch91 -p1 -b .testhook %patch92 -p1 -b .dumpcerts +%patch150 -p1 -b .can0811 + # Patch in vendor/release string sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1 @@ -578,6 +582,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/suexec.8* %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 - switch to Jeff Trawick's child reclaim timing logic patch - migration guide updates |