steffen: server/apache Makefile, 1.16.2.2, 1.16.2.3 kolab.patch, 1.5.2.2, 1.5.2.3

[cvs at intevation.de]

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
updated to lastes openpkg 2.4 apache

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -r1.16.2.2 -r1.16.2.3
--- Makefile	3 Sep 2005 00:19:47 -0000	1.16.2.2
+++ Makefile	19 Dec 2005 13:11:16 -0000	1.16.2.3
@@ -10,7 +10,7 @@
 
 PACKAGE=apache
 VERSION=1.3.33
-RELEASE=2.4.1
+RELEASE=2.4.4
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- kolab.patch	3 Sep 2005 00:19:47 -0000	1.5.2.2
+++ kolab.patch	19 Dec 2005 13:11:16 -0000	1.5.2.3
@@ -1,40 +1,40 @@
---- ../apache.orig/apache.spec	2004-12-16 21:23:03.000000000 +0100
-+++ apache.spec	2005-06-16 04:34:29.000000000 +0200
-@@ -66,7 +66,7 @@ Class:        BASE
+--- ../apache.orig/apache.spec	2005-12-03 18:51:46.000000000 +0100
++++ apache.spec	2005-12-19 13:50:36.000000000 +0100
+@@ -65,7 +65,7 @@ Class:        BASE
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.4.1
-+Release:      2.4.1_kolab
+-Release:      2.4.4
++Release:      2.4.4_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -214,6 +214,10 @@ Patch0:       apache.patch
- Patch2:       apache.patch.php
+@@ -215,6 +215,10 @@ Patch2:       apache.patch.php
  Patch3:       http://www.hardened-php.net/hardened-php-%{V_mod_php_hardened}.patch.gz
  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
+ Patch5:       apache.patch.suphp
++Patch6:       mod_auth_ldap.patch
++Patch7:       php-getacl-backport.patch
++Patch8:       php-imap-annotation.patch
++Patch9:       php-imap-status-current.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -521,6 +525,9 @@ AutoReqProv:  no
+@@ -529,6 +533,9 @@ AutoReqProv:  no
  %if "%{with_mod_php_hardened}" == "yes"
        %patch -p1 -P 3
  %endif
-+     %patch -p1 -P 6
 +     %patch -p1 -P 7
-+     %patch -p0 -P 8
++     %patch -p1 -P 8
++     %patch -p0 -P 9
      ) || exit $?
  %endif
  %if "%{with_mod_dav}" == "yes"
-@@ -552,6 +559,7 @@ AutoReqProv:  no
+@@ -563,6 +570,7 @@ AutoReqProv:  no
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14
-+    %patch -p0 -P 5
++    %patch -p0 -P 6
  %endif
  %if "%{with_mod_auth_radius}" == "yes"
      %setup -q -T -D -a 15