steffen: server/apache Makefile, 1.16.2.1, 1.16.2.2 kolab.patch, 1.5.2.1, 1.5.2.2

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/apache
In directory doto:/tmp/cvs-serv13695

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
updated apache

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -d -r1.16.2.1 -r1.16.2.2
--- Makefile	19 Jul 2005 21:00:59 -0000	1.16.2.1
+++ Makefile	3 Sep 2005 00:19:47 -0000	1.16.2.2
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/UPD
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -10,7 +10,7 @@
 
 PACKAGE=apache
 VERSION=1.3.33
-RELEASE=2.4.0
+RELEASE=2.4.1
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- kolab.patch	19 Jul 2005 21:00:59 -0000	1.5.2.1
+++ kolab.patch	3 Sep 2005 00:19:47 -0000	1.5.2.2
@@ -4,19 +4,19 @@
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.4.0
-+Release:      2.4.0_kolab
+-Release:      2.4.1
++Release:      2.4.1_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -213,6 +213,10 @@ Patch0:       apache.patch
- Patch1:       apache.patch.modowa
+@@ -214,6 +214,10 @@ Patch0:       apache.patch
  Patch2:       apache.patch.php
  Patch3:       http://www.hardened-php.net/hardened-php-%{V_mod_php_hardened}.patch.gz
-+Patch4:       mod_auth_ldap.patch
-+Patch5:       php-getacl-backport.patch
-+Patch6:       php-imap-annotation.patch
-+Patch7:       php-imap-status-current.patch
+ Patch4:       apache.patch.modssl
++Patch5:       mod_auth_ldap.patch
++Patch6:       php-getacl-backport.patch
++Patch7:       php-imap-annotation.patch
++Patch8:       php-imap-status-current.patch
  
  #   build information
  Prefix:       %{l_prefix}
@@ -24,9 +24,9 @@
  %if "%{with_mod_php_hardened}" == "yes"
        %patch -p1 -P 3
  %endif
-+     %patch -p1 -P 5
 +     %patch -p1 -P 6
-+     %patch -p0 -P 7
++     %patch -p1 -P 7
++     %patch -p0 -P 8
      ) || exit $?
  %endif
  %if "%{with_mod_dav}" == "yes"
@@ -34,7 +34,7 @@
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14
-+    %patch -p0 -P 4
++    %patch -p0 -P 5
  %endif
  %if "%{with_mod_auth_radius}" == "yes"
      %setup -q -T -D -a 15