SPECS: apache1.spec - added khk patch from Apache 1.3 from Ra

[marcus]

Author: marcus                       Date: Fri Dec  2 20:10:08 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added khk patch from Apache 1.3 from Ra

---- Files affected:
SPECS:
   apache1.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.123 SPECS/apache1.spec:1.124
--- SPECS/apache1.spec:1.123	Thu Dec  1 13:59:16 2005
+++ SPECS/apache1.spec	Fri Dec  2 21:10:03 2005
@@ -71,23 +71,25 @@
 Patch3:		%{name}-apxs.patch
 Patch4:		%{name}-mod_ssl-addon.patch
 Patch5:		%{name}-mod_ssl-eapi.patch
-Patch6:		%{name}-EAPI_MM_CORE_PATH-correction.patch
-Patch7:		%{name}-EAPI_MM=SYSTEM.patch
-Patch8:		%{name}-ipv6-PLD.patch
-Patch9:		%{name}-modules_symbols.patch
-Patch10:	%{name}-apxs_force_rm_cp.patch
-Patch11:	%{name}-db3.patch
-Patch12:	%{name}-lookup_map_ldap.patch
-Patch13:	%{name}-man.patch
-Patch14:	%{name}-fpic.patch
-Patch15:	%{name}-buff.patch
-Patch16:	%{name}-mkstemp.patch
-Patch17:	%{name}-EAPI-missing_files.patch
-Patch18:	%{name}-PLD-nov6.patch
-Patch19:	%{name}-configdir_skip_backups.patch
-Patch20:	%{name}-apxs-quiet.patch
-Patch21:	%{name}-db4.patch
-Patch22:	%{name}-less-libs.patch
+# http://allafrica.com/tools/apache/mod_proxy/mod_proxy-khk_1.3.26-patch.diff with eapi duplicates removed
+Patch6:         %{name}-mod_proxy-khk.patch
+Patch7:		%{name}-EAPI_MM_CORE_PATH-correction.patch
+Patch8:		%{name}-EAPI_MM=SYSTEM.patch
+Patch9:		%{name}-ipv6-PLD.patch
+Patch10:	%{name}-modules_symbols.patch
+Patch11:	%{name}-apxs_force_rm_cp.patch
+Patch12:	%{name}-db3.patch
+Patch13:	%{name}-lookup_map_ldap.patch
+Patch14:	%{name}-man.patch
+Patch15:	%{name}-fpic.patch
+Patch16:	%{name}-buff.patch
+Patch17:	%{name}-mkstemp.patch
+Patch18:	%{name}-EAPI-missing_files.patch
+Patch19:	%{name}-PLD-nov6.patch
+Patch20:	%{name}-configdir_skip_backups.patch
+Patch21:	%{name}-apxs-quiet.patch
+Patch22:	%{name}-db4.patch
+Patch23:	%{name}-less-libs.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	db-devel >= 4.1
 BuildRequires:	mm-devel >= 1.3.0
@@ -1055,12 +1057,14 @@
 Apache. It implements proxying capability for FTP, CONNECT (for SSL),
 HTTP/0.9, and HTTP/1.0. The module can be configured to connect to
 other proxy modules for these and other protocols.
+Contains patch from: http://allafrica.com/tools/apache/mod_proxy/
 
 %description mod_proxy -l pl
 Moduł zawiera implementację serwera proxy/cache dla Apache.
 Iplementacja zawiera obsługę FTP, CONNECT (dla SSL), HTTP/0.9 i
 HTTP/1.0. Ten moduł może być skonfigurowany tak, aby łączył się z
 innymi modułami proxy dla tych i innych protokołów.
+Zawiera łatę z http://allafrica.com/tools/apache/mod_proxy/
 
 %package mod_rewrite
 Summary:	Apache module with rule-based engine for rewrite requested URLs on the fly
@@ -1248,21 +1252,22 @@
 %patch5 -p0
 %patch6 -p1
 %patch7 -p1
-%{?with_ipv6:%patch8 -p1}
-%patch9 -p1
+%patch8 -p1
+%{?with_ipv6:%patch9 -p1}
 %patch10 -p1
 %patch11 -p1
-%{?with_rewrite_ldap:%patch12 -p1}
-%patch13 -p1
+%patch12 -p1
+%{?with_rewrite_ldap:%patch13 -p1}
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%{!?with_ipv6:%patch18 -p1}
-%patch19 -p1
+%patch18 -p1
+%{!?with_ipv6:%patch19 -p1}
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %if %{with lingerd}
 mv lingerd-* _lingerd
@@ -2405,6 +2410,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2005/12/02 20:10:03  marcus
+- added khk patch from Apache 1.3 from Ra
+
 Revision 1.123  2005/12/01 12:59:16  glen
 - unify monitrd filename, fix permission
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.123&r2=1.124&f=u