wilde: server/imapd Makefile, 1.40.2.6, 1.40.2.7 kolab.patch, 1.39.2.3, 1.39.2.4
cvs at kolab.org
cvs at kolab.org
Thu Feb 4 10:44:49 CET 2010
Author: wilde
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv28393/imapd
Modified Files:
Tag: kolab_2_2_branch
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.40.2.6
retrieving revision 1.40.2.7
diff -u -d -r1.40.2.6 -r1.40.2.7
--- Makefile 17 Dec 2009 11:09:41 -0000 1.40.2.6
+++ Makefile 4 Feb 2010 09:44:47 -0000 1.40.2.7
@@ -3,7 +3,7 @@
PACKAGE=imapd
VERSION=2.3.13
RELEASE=20081020
-KOLABRELEASE=20081020_kolab4
+KOLABRELEASE=20081020_kolab4+crossdomainacl1
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 \
@@ -12,6 +12,7 @@
../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \
../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_timsieved_starttls-sendcaps.patch \
../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_UID.patch \
+ ../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/cyrus-imapd-cross-domain-acls-20091211.diff \
CVE-2009-2632.patch
.PHONY: all
@@ -22,7 +23,7 @@
cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
- cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --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'
+ cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --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'
cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.39.2.3
retrieving revision 1.39.2.4
diff -u -d -r1.39.2.3 -r1.39.2.4
--- kolab.patch 4 Dec 2009 09:00:49 -0000 1.39.2.3
+++ kolab.patch 4 Feb 2010 09:44:47 -0000 1.39.2.4
@@ -1,11 +1,11 @@
--- imapd.spec.orig 2008-10-20 20:12:23.000000000 +0200
-+++ imapd.spec 2009-09-22 16:13:53.049428455 +0200
++++ imapd.spec 2010-02-02 17:53:21.186946571 +0100
@@ -32,7 +32,7 @@
Group: Mail
License: BSD
Version: 2.3.13
-Release: 20081020
-+Release: 20081020_kolab4
++Release: 20081020_kolab4+crossdomainacl1
# package options
%option with_fsl yes
@@ -17,7 +17,7 @@
# fixing implicit inter-module dependencies and correlations
%if "%{with_kolab}" == "yes"
-@@ -67,12 +68,14 @@
+@@ -67,12 +68,15 @@
Source3: imapd.conf
Source4: fsl.imapd
Patch0: imapd.patch
@@ -35,10 +35,11 @@
+Patch6: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Folder-names.patch
+Patch7: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_timsieved_starttls-sendcaps.patch
+Patch8: CVE-2009-2632.patch
++Patch9: https://issues.kolab.org/file1295/cyrus-imapd-cross-domain-acls-20091211.diff
# build information
Prefix: %{l_prefix}
-@@ -120,11 +123,7 @@
+@@ -120,11 +124,7 @@
# add optional group file support with support to ignore case
%if "%{with_group}" == "yes"
@@ -51,7 +52,7 @@
%{l_shtool} subst \
-e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
lib/auth_unix.c
-@@ -132,7 +131,7 @@
+@@ -132,7 +132,7 @@
# add optional folder annotation support
%if "%{with_annotate}" == "yes"
@@ -60,7 +61,7 @@
%patch -p1 -P 3
%endif
-@@ -152,12 +151,20 @@
+@@ -152,12 +152,25 @@
%patch -p1 -P 6
%endif
@@ -78,10 +79,15 @@
+ # CVE-2009-2632
+ %patch -p1 -P 8
+
++ # kolab/issue1141 (Cannot give users from other domains access to a folder (rt#5747))
++%if "%{with_crossdomain_acl}" == "yes"
++ %patch -p0 -P 9
++%endif
++
# make sure config2header rebuilds imapopts based on imapoptions
rm -f lib/imapopts.h lib/imapopts.c >/dev/null 2>&1 || true
-@@ -287,7 +294,11 @@
+@@ -287,7 +300,11 @@
%if "%{with_nntp}" == "yes"
--enable-nntp \
%endif
@@ -93,7 +99,7 @@
--without-krb
# build program
-@@ -411,9 +422,6 @@
+@@ -411,9 +428,6 @@
# before erase, stop service and remove log and temporary files
if [ $1 -eq 0 ]; then
%{l_rc} imapd stop 2>/dev/null
More information about the commits
mailing list