summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorcvsdist <cvsdist@fedoraproject.org>2004-09-09 06:21:18 +0000
committercvsdist <cvsdist@fedoraproject.org>2004-09-09 06:21:18 +0000
commit3ba50dfe7dbaf40d923dddfc4a8b0833284814c9 (patch)
treed4672c3929d941608ec1e34ffb5c651cc51aa76c /httpd.spec
parentc4da67dd4d43f3d844c2440c1686c9e019371f6a (diff)
downloadhttpd-3ba50dfe7dbaf40d923dddfc4a8b0833284814c9.tar.gz
httpd-3ba50dfe7dbaf40d923dddfc4a8b0833284814c9.tar.xz
httpd-3ba50dfe7dbaf40d923dddfc4a8b0833284814c9.zip
auto-import httpd-2.0.50-3 from httpd-2.0.50-3.src.rpmhttpd-2_0_50-3
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec11
1 files changed, 9 insertions, 2 deletions
diff --git a/httpd.spec b/httpd.spec
index 9944264..5651b4c 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,7 +7,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.0.50
-Release: 1
+Release: 3
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -69,6 +69,7 @@ Patch85: httpd-2.0.48-sslvars2.patch
Patch86: httpd-2.0.48-rewritessl.patch
Patch89: httpd-2.0.49-headerssl.patch
Patch90: httpd-2.0.49-workerstack.patch
+Patch91: httpd-2.0.49-suexecmsg.patch
License: Apache Software License
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-root
@@ -153,7 +154,7 @@ executed by SSI pages) as a user other than the 'apache' user.
%patch23 -p1 -b .shmcb
%patch24 -p1 -b .sslmutex
%patch25 -p1 -b .md5dig
-## %patch26 -p1 -b .proxy11 ### NEEDS MERGE
+%patch26 -p1 -b .proxy11
%patch27 -p1 -b .sslpphrase
%patch28 -p1 -b .worker
%patch29 -p1 -b .workerhup
@@ -179,6 +180,7 @@ executed by SSI pages) as a user other than the 'apache' user.
%patch86 -p1 -b .rewritessl
%patch89 -p1 -b .headerssl
%patch90 -p1 -b .workerstack
+%patch91 -p1 -b .suexecmsg
# Patch in vendor/release string
sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
@@ -576,6 +578,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/suexec.8*
%changelog
+* Tue Jun 29 2004 Joe Orton <jorton@redhat.com> 2.0.50-3
+- update -proxy11 patch
+- explain where suexec went if SuexecUserGroup is used but
+ /usr/sbin/suexec is not found
+
* Tue Jun 29 2004 Joe Orton <jorton@redhat.com> 2.0.50-1
- update to 2.0.50