- update to 2.2.13httpd-2_2_13-1_fc12

10 files changed, 25 insertions, 62 deletions

diff --git a/.cvsignore b/.cvsignore
index 5d49569..08db694 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-httpd-2.2.11.tar.gz
+httpd-2.2.13.tar.gz
diff --git a/httpd-2.2.10.tar.gz.asc b/httpd-2.2.10.tar.gz.asc
deleted file mode 100644
index d0f6c30..0000000
--- a/httpd-2.2.10.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (Darwin)
-
-iD8DBQBI64MFizpgHwjJdeURAhUsAJ4mkdwWFnIPL0JacFveGMHrEnEDKACgtCxo
-4yosiQD/QOtNP/Iv4tfS+qg=
-=uUMA
------END PGP SIGNATURE-----
diff --git a/httpd-2.2.11.tar.gz.asc b/httpd-2.2.11.tar.gz.asc
deleted file mode 100644
index f4687b1..0000000
--- a/httpd-2.2.11.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQBJOpfNTAQoGDEaPeURAu0TAJwNWk5BZu8hoatVKD4Bt5ytd9SYlgCgnYLX
-qEUhu8VkhKrnhvDyIoN4G7I=
-=mnQ8
------END PGP SIGNATURE-----
diff --git a/httpd-2.2.13.tar.gz.asc b/httpd-2.2.13.tar.gz.asc
new file mode 100644
index 0000000..c407881
--- /dev/null
+++ b/httpd-2.2.13.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAABAgAGBQJKely6AAoJEBk/GAq1XZl3RCcP/Ar22Dn4gHe0dVVv5lTQOia0
+7Tp4S8clhJCVWInVPcUfHBDPHCqgapot5h3NjV9VVqFvxuIhSuTb3Wtzx1Eyh+9Y
+hIOLLTnUdAJ/1knjiOOUcmDwDn8UantaGgjKUaRwyuJX6DwdQt4RK52gyRfompJ2
+pjaXAAig6oalXBBZWpBwwtRcs0hAU0OrmRriZdVrbtZCcAjJNReBeZTIWJycKsM/
+UuGyxLGm4NjaRv6vuiLj02EvBQlMmF3EAvyidTXrF9LGZPTwC3PMZxkoUk+AlgIh
+jH7BsiRJmA7bwH2l1L/mpKOj0+GoMXboYPb9t0sNRv7qVS8/62aVx2pmZ0RraPsk
+qSpo+N4SdmGRZ9eVHRlGqitz/1a5GpFUJiCjPgRAmmqYxcvOTspCzCAxd+3e9HNu
+z2oV2MHhdfmW4wuOyZjtoG4/eCJWQOOl6L0fKmfmZ0QAAe/LFJjoleW6Ebf1Px6w
+LRuCWcXhlKR8EQsOv6mJirfRXrK6uV01U74CMnmzaqjHMEsmUQ7Hh/jWUJ5C4Otb
+Rf5+20PmSWVaf5sd+u7S/zNPFL0XNk2PUnWW/SShiC6bSDNCBFAwRa4vipDIVRBN
+SxifPTjvGJ3bQ+F+4Se6R3c1H8hy83VGLxYmenY03Tebq5wWGJupbu3JIibBKb0s
+qvzcW/b7rotkyW6YGFBX
+=0OK6
+-----END PGP SIGNATURE-----
diff --git a/httpd-2.2.4-oldflush.patch b/httpd-2.2.4-oldflush.patch
deleted file mode 100644
index 66d8e93..0000000
--- a/httpd-2.2.4-oldflush.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-http://issues.apache.org/bugzilla/show_bug.cgi?id=36780
-
-Upstream-Status: committed to trunk, r583817
-
---- 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
-                                                 void *ctx)
- {
-     ap_filter_t *f = ctx;
-+    apr_status_t rv;
- 
--    return ap_pass_brigade(f, bb);
-+    rv = ap_pass_brigade(f, bb);
-+
-+    /* apr_brigade_write* require that the flush function ensures that
-+     * the brigade is empty upon return; otherwise the brigade may be
-+     * left with a transient bucket whose contents have fallen out of
-+     * scope.  Call cleanup here unconditionally to avoid the issue in
-+     * all cases. */
-+    apr_brigade_cleanup(bb);
-+
-+    return rv;
- }
- 
- AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb)
diff --git a/httpd-2.2.8.tar.gz.asc b/httpd-2.2.8.tar.gz.asc
deleted file mode 100644
index 7c66586..0000000
--- a/httpd-2.2.8.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (Darwin)
-
-iD8DBQBHhk3hizpgHwjJdeURAgacAKDeXrgaZB+lPqRrVSQMPUgpW3AN3ACg6JPW
-My+xx7Jzj3rZ1RwIBwxA9Ls=
-=NOQO
------END PGP SIGNATURE-----
diff --git a/httpd-2.2.9.tar.gz.asc b/httpd-2.2.9.tar.gz.asc
deleted file mode 100644
index 317ac19..0000000
--- a/httpd-2.2.9.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (Darwin)
-
-iD8DBQBITtN1izpgHwjJdeURAkceAKC+pFgPKC9gcrkHTeBuI/rnKFIVQACdETFB
-fZ866HrZqHalNYAPd1Yck1U=
-=B7lp
------END PGP SIGNATURE-----
diff --git a/httpd.spec b/httpd.spec
index 6f209b6..54231f8 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.11
-Release: 10
+Version: 2.2.13
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -37,7 +37,6 @@ Patch25: httpd-2.2.11-selinux.patch
 Patch26: httpd-2.2.9-suenable.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
@@ -126,7 +125,6 @@ Security (TLS) protocols.
 %patch26 -p1 -b .suenable
 
 %patch54 -p1 -b .authnoprov
-%patch55 -p1 -b .oldflush
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -483,6 +481,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Aug 18 2009 Joe Orton <jorton@redhat.com> 2.2.13-1
+- update to 2.2.13
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.11-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 35bdafe..21fdcfd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03e0a99a5de0f3f568a0087fb9993af9  httpd-2.2.11.tar.gz
+2803e35be6650f5b739e6e91faa824dd  httpd-2.2.13.tar.gz
diff --git a/upstream b/upstream
index 5d49569..08db694 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-httpd-2.2.11.tar.gz
+httpd-2.2.13.tar.gz