- add dummy connection address fixes from HEAD
- mod_ssl: add security fix for CAN-2004-0885
This commit is contained in:
parent
2bc479e770
commit
a52696df5e
@ -68,6 +68,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
|
||||||
|
Patch120: httpd-2.0.52-CAN-2004-0885.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
|
||||||
@ -178,6 +180,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
|
||||||
|
|
||||||
|
%patch120 -p1 -b .can0885
|
||||||
|
|
||||||
# Patch in vendor/release string
|
# Patch in vendor/release string
|
||||||
sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
|
sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
|
||||||
|
|
||||||
@ -577,6 +581,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%changelog
|
%changelog
|
||||||
* Thu Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-3
|
* Thu Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-3
|
||||||
- add dummy connection address fixes from HEAD
|
- add dummy connection address fixes from HEAD
|
||||||
|
- mod_ssl: add security fix for CAN-2004-0885
|
||||||
|
|
||||||
* Tue Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-2
|
* Tue Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-2
|
||||||
- update to 2.0.52
|
- update to 2.0.52
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
echo '<?xml version="1.0" encoding="UTF-8"?>'
|
echo '<?xml version="1.0" encoding="UTF-8"?>'
|
||||||
echo '<patches>'
|
echo '<patches>'
|
||||||
for f in $*; do
|
for f in $*; do
|
||||||
n=${f//httpd-[0-9.]*-/}
|
n=${f//httpd-2\.0\.[0-9]*-/}
|
||||||
n=${n//.patch/}
|
n=${n//.patch/}
|
||||||
s_HEAD=`grep ^Upstream-HEAD $f | sed 's/Upstream-HEAD: //'`
|
s_HEAD=`grep ^Upstream-HEAD $f | sed 's/Upstream-HEAD: //'`
|
||||||
s_20=`grep ^Upstream-2.0: $f | sed 's/Upstream-2.0: //'`
|
s_20=`grep ^Upstream-2.0: $f | sed 's/Upstream-2.0: //'`
|
||||||
|
Loading…
Reference in New Issue
Block a user