thomas: server/imapd Makefile, 1.40.2.7, 1.40.2.8 kolab.patch, 1.39.2.4, 1.39.2.5

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv7360/imapd

Modified Files:
      Tag: kolab_2_2_branch
	Makefile kolab.patch 
Log Message:
imapd: Add %option with_crossdomain_acl and drop +crossdomainacl1 from release


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.40.2.7
retrieving revision 1.40.2.8
diff -u -d -r1.40.2.7 -r1.40.2.8
--- Makefile	4 Feb 2010 09:44:47 -0000	1.40.2.7
+++ Makefile	25 Jun 2010 14:02:40 -0000	1.40.2.8
@@ -3,7 +3,7 @@
 PACKAGE=imapd
 VERSION=2.3.13
 RELEASE=20081020
-KOLABRELEASE=20081020_kolab4+crossdomainacl1
+KOLABRELEASE=20081020_kolab5
 
 PATCHES=../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-cyradm-$(VERSION)_Annotations.patch \
 	../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.39.2.4
retrieving revision 1.39.2.5
diff -u -d -r1.39.2.4 -r1.39.2.5
--- kolab.patch	4 Feb 2010 09:44:47 -0000	1.39.2.4
+++ kolab.patch	25 Jun 2010 14:02:40 -0000	1.39.2.5
@@ -1,23 +1,24 @@
 --- imapd.spec.orig	2008-10-20 20:12:23.000000000 +0200
-+++ imapd.spec	2010-02-02 17:53:21.186946571 +0100
++++ imapd.spec	2010-06-25 15:36:57.213108201 +0200
 @@ -32,7 +32,7 @@
  Group:        Mail
  License:      BSD
  Version:      2.3.13
 -Release:      20081020
-+Release:      20081020_kolab4+crossdomainacl1
++Release:      20081020_kolab5
  
  #   package options
  %option       with_fsl           yes
-@@ -48,6 +48,7 @@
+@@ -48,6 +48,8 @@
  %option       with_annotate      no
  %option       with_morelogging   no
  %option       with_kolab         no
 +%option       with_kolab_nocaps  no
++%option       with_crossdomain_acl  no
  
  #   fixing implicit inter-module dependencies and correlations
  %if "%{with_kolab}" == "yes"
-@@ -67,12 +68,15 @@
+@@ -67,12 +69,15 @@
  Source3:      imapd.conf
  Source4:      fsl.imapd
  Patch0:       imapd.patch
@@ -39,7 +40,7 @@
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -120,11 +124,7 @@
+@@ -120,11 +125,7 @@
  
      #   add optional group file support with support to ignore case
  %if "%{with_group}" == "yes"
@@ -52,7 +53,7 @@
      %{l_shtool} subst \
          -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
          lib/auth_unix.c
-@@ -132,7 +132,7 @@
+@@ -132,7 +133,7 @@
  
      #   add optional folder annotation support
  %if "%{with_annotate}" == "yes"
@@ -61,7 +62,7 @@
      %patch -p1 -P 3
  %endif
  
-@@ -152,12 +152,25 @@
+@@ -152,12 +153,25 @@
       %patch -p1 -P 6
  %endif
  
@@ -87,7 +88,7 @@
      #   make sure config2header rebuilds imapopts based on imapoptions
      rm -f lib/imapopts.h lib/imapopts.c >/dev/null 2>&1 || true
  
-@@ -287,7 +300,11 @@
+@@ -287,7 +301,11 @@
  %if "%{with_nntp}" == "yes"
          --enable-nntp \
  %endif
@@ -99,7 +100,7 @@
          --without-krb
  
      #   build program
-@@ -411,9 +428,6 @@
+@@ -411,9 +429,6 @@
      #   before erase, stop service and remove log and temporary files
      if [ $1 -eq 0 ]; then
          %{l_rc} imapd stop 2>/dev/null
@@ -109,8 +110,8 @@
          rm -f  $RPM_INSTALL_PREFIX/var/imapd/socket/*   >/dev/null 2>&1 || true
          rm -rf $RPM_INSTALL_PREFIX/var/imapd/tmp/*      >/dev/null 2>&1 || true
      fi
---- fsl.imapd.orig      2009-12-04 09:47:01.156452673 +0100
-+++ fsl.imapd   2009-12-04 09:47:14.204765811 +0100
+--- fsl.imapd.orig	2010-06-25 15:40:39.182628020 +0200
++++ fsl.imapd	2010-06-25 15:35:24.158800536 +0200
 @@ -14,7 +14,7 @@
      }
  };