summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2010-06-25 14:02:40 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2010-06-25 14:02:40 (GMT)
commitdbcadeda570236b8be7504b01cc5f5877c41f6b6 (patch)
treef85039f547498220422591ed996eb228814da8de
parent18cc800ffcf46eadefaec27da3a34b7cf72a85a0 (diff)
downloadserver-dbcadeda570236b8be7504b01cc5f5877c41f6b6.tar.gz
imapd: Add %option with_crossdomain_acl and drop +crossdomainacl1 from release
-rw-r--r--imapd/Makefile2
-rw-r--r--imapd/kolab.patch23
-rwxr-xr-xinstall-kolab.sh4
-rw-r--r--release-notes.txt4
4 files changed, 17 insertions, 16 deletions
diff --git a/imapd/Makefile b/imapd/Makefile
index 6b4e553..bc9b9cf 100644
--- a/imapd/Makefile
+++ b/imapd/Makefile
@@ -3,7 +3,7 @@ include ../kolab.mk
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 \
diff --git a/imapd/kolab.patch b/imapd/kolab.patch
index f915fe5..4048f8b 100644
--- a/imapd/kolab.patch
+++ b/imapd/kolab.patch
@@ -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 @@
}
};
diff --git a/install-kolab.sh b/install-kolab.sh
index 1f23130..eba60dc 100755
--- a/install-kolab.sh
+++ b/install-kolab.sh
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Copyright (C) 2007, 2008, 2009 by Intevation GmbH
+# Copyright (C) 2007, 2008, 2009, 2010 by Intevation GmbH
# Copyright (C) 2007 by Gunnar Wrobel
#
# Authors:
@@ -20,7 +20,7 @@ USER=""
PREFIX=""
PACKAGES="openpkg-tools openldap postfix kolabd kolab-webadmin kolab-fbview kolab-webclient"
-DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps"
+DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D imapd::with_crossdomain_acl"
EXCLUDEPKGS=""
#Flags
diff --git a/release-notes.txt b/release-notes.txt
index d005768..8679dbb 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -96,7 +96,7 @@ Changes between 2.2.3 and 2.2.4:
which is from a now *not* shared, before
shared calendar folder)
- - imapd-2.3.13-20081020_kolab4+crossdomainacl1
+ - imapd-2.3.13-20081020_kolab5
kolab/issue1141 (Cannot give users from other domains access
to a folder (rt#5747))
@@ -195,7 +195,7 @@ Changes between 2.2.3 and 2.2.4:
apache-2.2.15-20100406
apache-php-5.2.13-20100624_kolab1
- imapd-2.3.13-20081020_kolab4+crossdomainacl1
+ imapd-2.3.13-20081020_kolab5
openssl-1.0.0a-20100624
php-5.2.13-20100624_kolab1