bh: server/apache kolab.patch,1.7,1.8 Makefile,1.18,1.19

[cvs at intevation.de]

Author: bh

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

Modified Files:
	kolab.patch Makefile 
Log Message:
Update to OpenPKG 2.5


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab.patch	7 Sep 2005 02:28:38 -0000	1.7
+++ kolab.patch	9 Dec 2005 15:54:13 -0000	1.8
@@ -1,18 +1,18 @@
---- ../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.spec.orig	Wed Dec  7 18:43:26 2005
++++ apache.spec	Wed Dec  7 18:43:26 2005
+@@ -65,7 +65,7 @@ Class:        BASE
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.4.1
-+Release:      2.4.1_kolab
+-Release:      2.5.4
++Release:      2.5.4_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -212,6 +212,10 @@ Patch0:       apache.patch
+@@ -214,6 +214,10 @@ Patch1:       apache.patch.modowa
  Patch2:       apache.patch.php
- Patch3:       http://www.hardened-php.net/hardened-php-%{V_mod_php_hardened}.patch.gz
- Patch4:       apache.patch.modssl
+ Patch3:       http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
+ Patch4:       apache.patch.suphp
 +Patch5:       mod_auth_ldap.patch
 +Patch6:       php-getacl-backport.patch
 +Patch7:       php-imap-annotation.patch
@@ -20,7 +20,7 @@
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -521,6 +525,9 @@ AutoReqProv:  no
+@@ -527,6 +531,9 @@ AutoReqProv:  no
  %if "%{with_mod_php_hardened}" == "yes"
        %patch -p1 -P 3
  %endif
@@ -30,7 +30,7 @@
      ) || exit $?
  %endif
  %if "%{with_mod_dav}" == "yes"
-@@ -552,6 +559,7 @@ AutoReqProv:  no
+@@ -561,6 +568,7 @@ AutoReqProv:  no
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile	7 Sep 2005 02:28:38 -0000	1.18
+++ Makefile	9 Dec 2005 15:54:13 -0000	1.19
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/UPD
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/UPD
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -10,7 +10,7 @@
 
 PACKAGE=apache
 VERSION=1.3.33
-RELEASE=2.4.1
+RELEASE=2.5.4
 
 RPM=/kolab/bin/openpkg rpm