rpms/httpd/devel .cvsignore, 1.20, 1.21 httpd-2.0.45-deplibs.patch, 1.3, 1.4 httpd-2.0.54-selinux.patch, 1.2, 1.3 httpd-2.1.10-apxs.patch, 1.4, 1.5 httpd-2.1.10-disablemods.patch, 1.1, 1.2 httpd-2.1.10-layout.patch, 1.1, 1.2 httpd-2.1.10-pod.patch, 1.2, 1.3 httpd-2.2.4-oldflush.patch, 1.2, 1.3

[Joe Orton (jorton)]

Author: jorton

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

Modified Files:
	.cvsignore httpd-2.0.45-deplibs.patch 
	httpd-2.0.54-selinux.patch httpd-2.1.10-apxs.patch 
	httpd-2.1.10-disablemods.patch httpd-2.1.10-layout.patch 
	httpd-2.1.10-pod.patch httpd-2.2.4-oldflush.patch 
Log Message:
Patch comment updates.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	22 Jan 2008 11:13:57 -0000	1.20
+++ .cvsignore	4 Jun 2008 11:35:50 -0000	1.21
@@ -1,3 +1,4 @@
 httpd-2.2.8.tar.gz
 x86_64
 *.log
+*.rpm

httpd-2.0.45-deplibs.patch:

Index: httpd-2.0.45-deplibs.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.0.45-deplibs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- httpd-2.0.45-deplibs.patch	13 Oct 2004 16:35:07 -0000	1.3
+++ httpd-2.0.45-deplibs.patch	4 Jun 2008 11:35:50 -0000	1.4
@@ -2,9 +2,7 @@
 apr and apr-util are patched to correctly depend on their deps, so
 it's sufficient to just link httpd against the .la file.
 
-Upstream-HEAD: needed
-Upstream-2.0: omit
-Upstream-Status: apr-util still to be fixed properly on HEAD
+Upstream-Status: needed
 
 --- httpd-2.0.45/configure.in.deplibs	2003-04-29 10:27:05.000000000 +0100
 +++ httpd-2.0.45/configure.in	2003-04-29 10:26:45.000000000 +0100

httpd-2.0.54-selinux.patch:

Index: httpd-2.0.54-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.0.54-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- httpd-2.0.54-selinux.patch	2 Dec 2005 10:43:00 -0000	1.2
+++ httpd-2.0.54-selinux.patch	4 Jun 2008 11:35:50 -0000	1.3
@@ -1,6 +1,9 @@
 
 If SELinux is enabled, log the context on startup.
 
+Upstream-Status: not submitted, needs #ifdef-goodness, probably
+		not worth the battle
+
 --- httpd-2.1.10/server/core.c.selinux
 +++ httpd-2.1.10/server/core.c
 @@ -51,6 +51,8 @@

httpd-2.1.10-apxs.patch:

Index: httpd-2.1.10-apxs.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.1.10-apxs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd-2.1.10-apxs.patch	19 Jul 2006 12:28:45 -0000	1.4
+++ httpd-2.1.10-apxs.patch	4 Jun 2008 11:35:50 -0000	1.5
@@ -3,6 +3,9 @@
 - drop unnecessary --libs output from ap?-?-config
 - make multilib-safe
 
+Upstream-Status: The is-mod_so-linked-in hack is done better on trunk.
+		The multilib hack is awful and can't go upstream.
+
 --- httpd-2.2.2/support/apxs.in.apxs
 +++ httpd-2.2.2/support/apxs.in
 @@ -25,7 +25,18 @@

httpd-2.1.10-disablemods.patch:

Index: httpd-2.1.10-disablemods.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.1.10-disablemods.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.1.10-disablemods.patch	2 Dec 2005 10:43:00 -0000	1.1
+++ httpd-2.1.10-disablemods.patch	4 Jun 2008 11:35:50 -0000	1.2
@@ -2,6 +2,8 @@
 Support "--enable-modules=none" to build an httpd binary with 
 no optional modules enabled.
 
+Upstream-Status: committed to trunk, r357168
+
 --- httpd-2.1.10/acinclude.m4.disablemods
 +++ httpd-2.1.10/acinclude.m4
 @@ -289,14 +289,19 @@

httpd-2.1.10-layout.patch:

Index: httpd-2.1.10-layout.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.1.10-layout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.1.10-layout.patch	2 Dec 2005 10:43:00 -0000	1.1
+++ httpd-2.1.10-layout.patch	4 Jun 2008 11:35:50 -0000	1.2
@@ -1,7 +1,8 @@
 
 Tweak the default config to get installbuilddir right.
-(should really make the RedHat layout DTRT again and
-use that layout instead)
+
+Upstream-Status: should really make the "RedHat" layout DTRT again and
+		use that layout instead
 
 --- httpd-2.1.10/config.layout.layout
 +++ httpd-2.1.10/config.layout

httpd-2.1.10-pod.patch:

Index: httpd-2.1.10-pod.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.1.10-pod.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- httpd-2.1.10-pod.patch	20 Jul 2006 09:31:15 -0000	1.2
+++ httpd-2.1.10-pod.patch	4 Jun 2008 11:35:50 -0000	1.3
@@ -5,6 +5,10 @@
 In 2.2 lr->protocol could be used instead to do this properly, if
 that was actually initialized properly by mod_ssl.
 
+Upstream-Status: not submitted, ugly hack which only makes a difference
+		to the default configuration used in Fedora.  Need to find
+		a way to do this properly.
+
 --- httpd-2.1.10/server/mpm_common.c.pod
 +++ httpd-2.1.10/server/mpm_common.c
 @@ -583,6 +584,7 @@

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- httpd-2.2.4-oldflush.patch	7 Sep 2007 18:48:27 -0000	1.2
+++ httpd-2.2.4-oldflush.patch	4 Jun 2008 11:35:50 -0000	1.3
@@ -1,6 +1,8 @@
 
 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