- update to 2.2.6 (#250757, #282761)httpd-2_2_6-2

8 files changed, 20 insertions, 23 deletions

diff --git a/.cvsignore b/.cvsignore
index 532539e..f9d9fa6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-httpd-2.2.4.tar.gz
+httpd-2.2.6.tar.gz
diff --git a/httpd-2.0.54.tar.gz.asc b/httpd-2.0.54.tar.gz.asc
deleted file mode 100644
index 63c1635..0000000
--- a/httpd-2.0.54.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQBCWubGZjW2wN6IXdMRArzBAJ9bHFN8TIhptTrs7YUBPfNwmqfBKQCfcERZ
-LDwbssYf/DGspfIrdK+3cdo=
-=ZWIg
------END PGP SIGNATURE-----
diff --git a/httpd-2.2.4-oldflush.patch b/httpd-2.2.4-oldflush.patch
index 69b8392..9c17974 100644
--- a/httpd-2.2.4-oldflush.patch
+++ b/httpd-2.2.4-oldflush.patch
@@ -1,3 +1,6 @@
+
+http://issues.apache.org/bugzilla/show_bug.cgi?id=36780
+
 --- httpd-2.2.4/server/util_filter.c.oldflush
 +++ httpd-2.2.4/server/util_filter.c
 @@ -578,8 +578,18 @@ AP_DECLARE_NONSTD(apr_status_t) ap_filte
diff --git a/httpd-2.2.4.tar.gz.asc b/httpd-2.2.4.tar.gz.asc
deleted file mode 100644
index 3895c56..0000000
--- a/httpd-2.2.4.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iQEVAwUARZ9GcfcTqHkQ/eB1AQIqcAf8C1wN52hQIHEVIIdRfXqRwJ8sLgmO1b37
-Jsvi3c+WSUxHnlk9/JeHgOHCtKxb9XJd+FU563bbtjyiE4afcw2sP9lZOlN9xlt8
-dFVa9Jqiv+mgasXmUJ4vYRTti3LG5B48W+lrl/F74mmdFDS5mq+VaGdsTGcap3/4
-voqwRvF35A124oR+RPtLZXZSjkM3TxOJT4kCKI7EPudk57zMOZMk6EZZCeu631dM
-eiAXaWXMtcI3Y7JsjnP5k/Pezc6itDsyRBYR2Q/VLq27vZFOwbRqEN0E1/HOCvE4
-M6IqPmvEfm1kB0BZ2j2uz97rSF6bJMS/edXkXeGZrNaw2ldFqdxaPQ==
-=vkJ/
------END PGP SIGNATURE-----
diff --git a/httpd-2.2.6.tar.gz.asc b/httpd-2.2.6.tar.gz.asc
new file mode 100644
index 0000000..eb6a1a2
--- /dev/null
+++ b/httpd-2.2.6.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (Darwin)
+
+iD8DBQBG3buFizpgHwjJdeURAiQhAJ0UzwL/Sg4PZdw1USvc4CWytBg+kgCeKf83
+vNBG4bcFy+gEuU0vVE/HCGM=
+=dt4x
+-----END PGP SIGNATURE-----
diff --git a/httpd.spec b/httpd.spec
index 6651314..48a1f68 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -5,8 +5,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.4
-Release: 10
+Version: 2.2.6
+Release: 2
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -36,6 +36,7 @@ Patch24: httpd-2.0.48-corelimit.patch
 Patch25: httpd-2.0.54-selinux.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
+Patch55: httpd-2.2.4-oldflush.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -122,6 +123,7 @@ Security (TLS) protocols.
 %patch25 -p1 -b .selinux
 
 %patch54 -p1 -b .authnoprov
+%patch55 -p1 -b .oldflush
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -474,6 +476,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Sep  7 2007 Joe Orton <jorton@redhat.com> 2.2.6-2
+- update to 2.2.6 (#250757, #282761)
+
 * Sun Sep  2 2007 Joe Orton <jorton@redhat.com> 2.2.4-10
 - rebuild for fixed APR
 
diff --git a/sources b/sources
index b49ed77..0c17cc7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz
+d050a49bd7532ec21c6bb593b3473a5d  httpd-2.2.6.tar.gz
diff --git a/upstream b/upstream
index 532539e..f9d9fa6 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-httpd-2.2.4.tar.gz
+httpd-2.2.6.tar.gz