rpms/httpd/devel httpd-2.2.6.tar.gz.asc, NONE, 1.1 .cvsignore, 1.18, 1.19 httpd-2.2.4-oldflush.patch, 1.1, 1.2 httpd.spec, 1.114, 1.115 sources, 1.15, 1.16 upstream, 1.8, 1.9 httpd-2.0.54.tar.gz.asc, 1.1, NONE httpd-2.2.4.tar.gz.asc, 1.1, NONE

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6547

Modified Files:
	.cvsignore httpd-2.2.4-oldflush.patch httpd.spec sources 
	upstream 
Added Files:
	httpd-2.2.6.tar.gz.asc 
Removed Files:
	httpd-2.0.54.tar.gz.asc httpd-2.2.4.tar.gz.asc 
Log Message:
* Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 2.2.6-2
- update to 2.2.6 (#250757, #282761)



--- NEW FILE httpd-2.2.6.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)

iD8DBQBG3buFizpgHwjJdeURAiQhAJ0UzwL/Sg4PZdw1USvc4CWytBg+kgCeKf83
vNBG4bcFy+gEuU0vVE/HCGM=
=dt4x
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Mar 2007 13:29:57 -0000	1.18
+++ .cvsignore	7 Sep 2007 18:48:27 -0000	1.19
@@ -1 +1 @@
-httpd-2.2.4.tar.gz
+httpd-2.2.6.tar.gz

httpd-2.2.4-oldflush.patch:

Index: httpd-2.2.4-oldflush.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.2.4-oldflush.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.2.4-oldflush.patch	2 Sep 2007 13:57:10 -0000	1.1
+++ httpd-2.2.4-oldflush.patch	7 Sep 2007 18:48:27 -0000	1.2
@@ -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


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- httpd.spec	2 Sep 2007 13:57:10 -0000	1.114
+++ httpd.spec	7 Sep 2007 18:48:27 -0000	1.115
@@ -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 @@
 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 @@
 %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 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 2.2.6-2
+- update to 2.2.6 (#250757, #282761)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.2.4-10
 - rebuild for fixed APR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 Mar 2007 13:29:57 -0000	1.15
+++ sources	7 Sep 2007 18:48:27 -0000	1.16
@@ -1 +1 @@
-3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz
+d050a49bd7532ec21c6bb593b3473a5d  httpd-2.2.6.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/upstream,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- upstream	12 Mar 2007 13:29:57 -0000	1.8
+++ upstream	7 Sep 2007 18:48:27 -0000	1.9
@@ -1 +1 @@
-httpd-2.2.4.tar.gz
+httpd-2.2.6.tar.gz


--- httpd-2.0.54.tar.gz.asc DELETED ---


--- httpd-2.2.4.tar.gz.asc DELETED ---