steffen: server/apache Makefile,1.15,1.16 kolab.patch,1.4,1.5

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
integrated patches from Martin. Had to upgrade to imap-2004c-2.3.0 because patch was rejected by 2004a-2.2.0

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	22 Dec 2004 00:59:13 -0000	1.15
+++ Makefile	16 Jun 2005 03:04:13 -0000	1.16
@@ -8,17 +8,21 @@
   KOLABCVSDIR = $(CURDIR)
 endif
 
+PACKAGE=apache
 VERSION=1.3.31
 RELEASE=2.2.3
 
 RPM=/kolab/bin/openpkg rpm
  
-all: apache-$(VERSION)-$(RELEASE).src.rpm
-	$(RPM) -ihv apache-$(VERSION)-$(RELEASE).src.rpm
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
-	cp $(KOLABCVSDIR)/mod_auth_ldap.patch $(KOLABRPMSRC)/apache/
+	cp $(KOLABCVSDIR)/mod_auth_ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/
+	cp $(KOLABCVSDIR)/../php/php-getacl-backport.patch $(KOLABRPMSRC)/$(PACKAGE)/
+	cp $(KOLABCVSDIR)/../php/php-imap-annotation.patch $(KOLABRPMSRC)/$(PACKAGE)/
+	cp $(KOLABCVSDIR)/../php/php-imap-status-current.patch $(KOLABRPMSRC)/$(PACKAGE)/
 
-	cd $(KOLABRPMSRC)/apache && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba apache.spec \
+	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 		--define 'with_mod_auth_ldap yes' \
 		--define 'with_mod_dav yes' \
 		--define 'with_mod_php yes' \
@@ -31,8 +35,8 @@
 		--define 'with_mod_php_dom yes' \
 		--define 'with_mod_ssl yes' 
 
-apache-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/apache-$(VERSION)-$(RELEASE).src.rpm
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
+	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 clean:
-	rm -rf /kolab/RPM/TMP/apache-$(VERSION)* 
+	rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)* 

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab.patch	22 Dec 2004 00:59:13 -0000	1.4
+++ kolab.patch	16 Jun 2005 03:04:13 -0000	1.5
@@ -1,23 +1,36 @@
---- /kolab/RPM/SRC/apache/apache.spec.orig	2004-10-29 13:13:01.000000000 +0200
-+++ /kolab/RPM/SRC/apache/apache.spec	2004-11-22 14:00:41.000000000 +0100
+--- ../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
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
 -Release:      2.2.3
-+Release:      2.2.3_kolab
++Release:      2.2.3_kolab2
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -213,6 +213,7 @@ Patch0:       apache.patch
+@@ -213,6 +213,10 @@ Patch0:       apache.patch
  Patch1:       apache.patch.modowa
  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
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -552,6 +553,7 @@ AutoReqProv:  no
+@@ -521,6 +525,9 @@ AutoReqProv:  no
+ %if "%{with_mod_php_hardened}" == "yes"
+       %patch -p1 -P 3
+ %endif
++     %patch -p1 -P 5
++     %patch -p1 -P 6
++     %patch -p0 -P 7
+     ) || exit $?
+ %endif
+ %if "%{with_mod_dav}" == "yes"
+@@ -552,6 +559,7 @@ AutoReqProv:  no
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14