From d7e535caef09fe4ca3c94e3a63c6efce8ecf7aa8 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Sep 28 2004 13:49:37 +0000
Subject: - update to 2.0.52


---

diff --git a/.cvsignore b/.cvsignore
index ac98e78..c827a68 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-httpd-2.0.51.tar.gz
+httpd-2.0.52.tar.gz
 migration.html
diff --git a/httpd.spec b/httpd.spec
index 6db3dc1..aff745c 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.0.51
-Release: 6
+Version: 2.0.52
+Release: 2
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -35,7 +35,6 @@ Patch3: httpd-2.0.48-linkmods.patch
 Patch4: httpd-2.0.45-deplibs.patch
 Patch5: httpd-2.0.47-pie.patch
 Patch6: httpd-2.0.45-syspcre.patch
-Patch7: httpd-2.0.48-suexeclibs.patch
 Patch8: httpd-2.0.48-vpathinc.patch
 # Bug fixes
 Patch20: httpd-2.0.45-encode.patch
@@ -70,8 +69,6 @@ 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
@@ -148,7 +145,6 @@ executed by SSI pages) as a user other than the 'apache' user.
 %patch3 -p1 -b .linkmods
 %patch4 -p1 -b .deplibs
 %patch6 -p1 -b .syspcre
-%patch7 -p1 -b .suexeclibs
 %patch8 -p1 -b .vpathinc
 
 # no -b to prevent droplets in install root
@@ -183,8 +179,6 @@ 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
 
@@ -582,6 +576,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/suexec.8*
 
 %changelog
+* Tue Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-2
+- update to 2.0.52
+
 * Tue Sep 21 2004 Joe Orton <jorton@redhat.com> 2.0.51-6
 - fix 2.0.51 regression in Satisfy merging (CAN-2004-0811)
 
diff --git a/sources b/sources
index e015a89..b999637 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab93c56b88ca1b9ce71ba12e74bbc5de  httpd-2.0.51.tar.gz
+eba528fa8613dc5bfb0615a69c11f053  httpd-2.0.52.tar.gz
diff --git a/upstream b/upstream
index 445404f..3183f92 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-httpd-2.0.51.tar.gz
+httpd-2.0.52.tar.gz