From d2bf1a2666d7019ebe719cc39db438519ef8e918 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: May 03 2006 14:14:28 +0000
Subject: - update to 2.2.2


---

diff --git a/.cvsignore b/.cvsignore
index c8b8512..3b08c51 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-httpd-2.2.0.tar.gz
+httpd-2.2.2.tar.gz
diff --git a/httpd-2.0.45-export.patch b/httpd-2.0.45-export.patch
index 2f3dad8..d105996 100644
--- a/httpd-2.0.45-export.patch
+++ b/httpd-2.0.45-export.patch
@@ -6,15 +6,14 @@ Upstream-HEAD: needed
 Upstream-2.0: omit
 Upstream-Status: EXPORT_DIRS change is conditional on using shared apr
 
---- httpd-2.0.53/server/Makefile.in.export
-+++ httpd-2.0.53/server/Makefile.in
-@@ -59,10 +59,6 @@
+--- httpd-2.2.2/server/Makefile.in.export
++++ httpd-2.2.2/server/Makefile.in
+@@ -58,9 +58,6 @@
  	for dir in $(EXPORT_DIRS); do \
  	    ls $$dir/*.h >> $$tmp; \
  	done; \
 -	for dir in $(EXPORT_DIRS_APR); do \
--	    ls $$dir/ap[ru].h >> $$tmp; \
--	    ls $$dir/ap[ru]_*.h >> $$tmp; \
+-	    (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
 -	done; \
  	sort -u $$tmp > $@; \
  	rm -f $$tmp
diff --git a/httpd.spec b/httpd.spec
index b6cb205..cc98b0d 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.0
-Release: 6
+Version: 2.2.2
+Release: 2
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -40,13 +40,7 @@ Patch24: httpd-2.0.48-corelimit.patch
 Patch25: httpd-2.0.54-selinux.patch
 # Bug fixes
 Patch50: httpd-2.0.45-encode.patch
-Patch51: httpd-2.2.0-headclength.patch
-Patch52: httpd-2.2.0-ajpcookie.patch
-Patch53: httpd-2.2.0-cppheader.patch
 Patch54: httpd-2.2.0-authnoprov.patch
-# Security fixes
-Patch200: httpd-2.2.0-CVE-2005-3352.patch
-Patch201: httpd-2.2.0-CVE-2005-3357.patch
 License: Apache Software License
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-root
@@ -124,14 +118,8 @@ Security (TLS) protocols.
 
 # no -b to prevent droplets in install root
 %patch50 -p1
-%patch51 -p1 -b .headclength
-%patch52 -p1 -b .ajpcookie
-%patch53 -p1 -b .cppheader
 %patch54 -p1 -b .authnoprov
 
-%patch200 -p1 -b .cve3352
-%patch201 -p1 -b .cve3352
-
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
 
@@ -491,6 +479,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Wed May  3 2006 Joe Orton <jorton@redhat.com> 2.2.2-2
+- update to 2.2.2
+
 * Thu Apr  6 2006 Joe Orton <jorton@redhat.com> 2.2.0-6
 - rebuild to pick up apr-util LDAP interface fix (#188073)
 
diff --git a/sources b/sources
index cb9ef24..621dc93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-760aecf26a071e15141170636af43456  httpd-2.2.0.tar.gz
+a0d9f7f6f70110a5965340eb7f3a3e66  httpd-2.2.2.tar.gz
diff --git a/upstream b/upstream
index c8b8512..3b08c51 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-httpd-2.2.0.tar.gz
+httpd-2.2.2.tar.gz