wilde: server/imapd Makefile,1.48,1.49 kolab.patch,1.43,1.44
cvs at kolab.org
cvs at kolab.org
Mon Feb 8 18:19:42 CET 2010
Author: wilde
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv24076/imapd
Modified Files:
Makefile kolab.patch
Log Message:
Added Bernhard Herzog's cross domain acl patch (see kolab/issue1141).
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Makefile 17 Jan 2010 13:22:55 -0000 1.48
+++ Makefile 8 Feb 2010 17:19:40 -0000 1.49
@@ -4,7 +4,7 @@
DOWNLOAD_VERSION=2.3.13
OPENPKG_RELEASE=20081020
VERSION=2.3.16
-RELEASE=20081020_kolab6
+RELEASE=20081020_kolab7
SOURCE_URL=ftp://ftp.andrew.cmu.edu/pub/cyrus
SOURCE_0=cyrus-imapd-2.3.16.tar.gz
@@ -14,11 +14,12 @@
patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Groups2.patch \
patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \
patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_timsieved_starttls-sendcaps.patch \
- patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_UID.patch
+ patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_UID.patch \
+ patches/cyrus-imapd-$(VERSION)/cyrus-imapd-cross-domain-acls.patch
EXTRA=$(PATCHES) kolab.patch imapd.patch
-BUILD_OPTIONS=--define 'with_fsl yes' --define 'with_group yes' --define 'with_group_igncase yes' --define 'with_atvdom yes' --define 'with_drac no' --define 'with_replication no' --define 'with_murder no' --define 'with_listext no' --define 'with_nntp no' --define 'with_ldap yes' --define 'with_annotate yes' --define 'with_morelogging yes' --define 'with_kolab yes' --define 'with_kolab_nocaps yes'
+BUILD_OPTIONS=--define 'with_fsl yes' --define 'with_group yes' --define 'with_group_igncase yes' --define 'with_atvdom yes' --define 'with_drac no' --define 'with_replication no' --define 'with_murder no' --define 'with_listext no' --define 'with_nntp no' --define 'with_ldap yes' --define 'with_annotate yes' --define 'with_morelogging yes' --define 'with_kolab yes' --define 'with_kolab_nocaps yes' --define 'with_crossdomain_acl yes'
include ../make-helper/package.mk
include ../make-helper/openpkg-patched.mk
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- kolab.patch 23 Dec 2009 20:22:57 -0000 1.43
+++ kolab.patch 8 Feb 2010 17:19:40 -0000 1.44
@@ -1,24 +1,48 @@
+diff -ur imapd.spec.orig imapd.spec
--- imapd.spec.orig 2008-10-20 20:12:23.000000000 +0200
-+++ imapd.spec 2009-01-25 22:19:52.000000000 +0100
-@@ -32,7 +32,7 @@
++++ imapd.spec 2010-02-08 17:49:08.705491666 +0100
+@@ -31,23 +31,25 @@
+ Class: BASE
Group: Mail
License: BSD
-Version: 2.3.13
-Release: 20081020
+Version: 2.3.16
-+Release: 20081020_kolab6
++Release: 20081020_kolab7
# package options
- %option with_fsl yes
-@@ -48,6 +48,7 @@
- %option with_annotate no
- %option with_morelogging no
- %option with_kolab no
-+%option with_kolab_nocaps no
+-%option with_fsl yes
+-%option with_group no
+-%option with_group_igncase no
+-%option with_atvdom no
+-%option with_drac no
+-%option with_replication no
+-%option with_murder no
+-%option with_listext no
+-%option with_nntp no
+-%option with_ldap no
+-%option with_annotate no
+-%option with_morelogging no
+-%option with_kolab no
++%option with_fsl yes
++%option with_group no
++%option with_group_igncase no
++%option with_atvdom no
++%option with_drac no
++%option with_replication no
++%option with_murder no
++%option with_listext no
++%option with_nntp no
++%option with_ldap no
++%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,14 @@
+@@ -67,12 +69,13 @@
Source3: imapd.conf
Source4: fsl.imapd
Patch0: imapd.patch
@@ -29,8 +53,7 @@
-Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_UID.patch
-Patch6: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Folder-names.patch
+Patch1: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Groups2.patch
-+#Patch2 is just a duplicated dummy entry to avoid rewriting the whole patch. The patch number 2 is not used anymore.
-+Patch2: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Groups2.patch
++Patch2: patches/cyrus-imapd-%{version}/cyrus-imapd-cross-domain-acls.patch
+Patch3: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Cyradm_Annotations.patch
+Patch4: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Logging.patch
+Patch5: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_UID.patch
@@ -39,7 +62,7 @@
# build information
Prefix: %{l_prefix}
-@@ -120,11 +122,7 @@
+@@ -120,19 +123,19 @@
# add optional group file support with support to ignore case
%if "%{with_group}" == "yes"
@@ -52,15 +75,20 @@
%{l_shtool} subst \
-e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
lib/auth_unix.c
-@@ -132,7 +130,6 @@
+ %endif
++ # kolab/issue1141 (Cannot give users from other domains access to a folder (rt#5747))
++%if "%{with_crossdomain_acl}" == "yes"
++ %patch -p0 -P 2
++%endif
++
# add optional folder annotation support
%if "%{with_annotate}" == "yes"
- sed <%{PATCH2} -e '5,27d' | %{l_patch} -p1
%patch -p1 -P 3
%endif
-@@ -152,6 +150,11 @@
+@@ -152,6 +155,11 @@
%patch -p1 -P 6
%endif
@@ -72,7 +100,7 @@
# add optional DRAC file support
%if "%{with_drac}" == "yes"
%{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -287,7 +290,11 @@
+@@ -287,7 +295,11 @@
%if "%{with_nntp}" == "yes"
--enable-nntp \
%endif
@@ -84,7 +112,7 @@
--without-krb
# build program
-@@ -411,9 +418,6 @@
+@@ -411,9 +423,6 @@
# before erase, stop service and remove log and temporary files
if [ $1 -eq 0 ]; then
%{l_rc} imapd stop 2>/dev/null
@@ -94,8 +122,9 @@
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
+diff -ur fsl.imapd.orig fsl.imapd
+--- fsl.imapd.orig 2007-12-11 10:53:12.000000000 +0100
++++ fsl.imapd 2010-02-08 17:35:54.886390975 +0100
@@ -14,7 +14,7 @@
}
};
More information about the commits
mailing list