summaryrefslogtreecommitdiff
path: root/imapd
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2008-03-11 15:42:19 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2008-03-11 15:42:19 (GMT)
commitdca68350bb6ba8eea7c3ef6a92153b58a91f09f0 (patch)
treefd868dc7999dc407695baf63f9dc58421c9ccde2 /imapd
parentfce1b7a134df18e6cffa1c3788d542d4757ff190 (diff)
downloadserver-dca68350bb6ba8eea7c3ef6a92153b58a91f09f0.tar.gz
Added server/imapd with everything needed to build imapd-2.3.11-20080101_kolab
timsieved-starttls-sendcaps.patch is not yet integrated into Gunnar's patch queue or in the OpenPKG package, so I moved it to this directory. http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/openpkg-orig-srpms/ should show up on the mirrors soon.
Diffstat (limited to 'imapd')
-rw-r--r--imapd/.cvsignore1
-rw-r--r--imapd/Makefile42
-rw-r--r--imapd/README3
-rw-r--r--imapd/kolab.patch39
-rw-r--r--imapd/timsieved-starttls-sendcaps.patch19
5 files changed, 104 insertions, 0 deletions
diff --git a/imapd/.cvsignore b/imapd/.cvsignore
new file mode 100644
index 0000000..77fcdcb
--- /dev/null
+++ b/imapd/.cvsignore
@@ -0,0 +1 @@
+*.src.rpm
diff --git a/imapd/Makefile b/imapd/Makefile
new file mode 100644
index 0000000..bc5f1d8
--- /dev/null
+++ b/imapd/Makefile
@@ -0,0 +1,42 @@
+ifeq "x$(KOLABPKGURI)" "x"
+ KOLABPKGURI = http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/openpkg-orig-srpms/
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABCVSDIR)" "x"
+ KOLABCVSDIR = $(CURDIR)
+endif
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+
+PACKAGE=imapd
+VERSION=2.3.11
+RELEASE=20080101
+KOLABRELEASE=20080101_kolab
+
+PATCHES=$(KOLABCVSDIR)/timsieved-starttls-sendcaps.patch
+
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
+ $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+ cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
+
+ cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for imapd.spec
+ cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/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'
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
+ wget -c $(KOLABPKGURI)/imapd-$(VERSION)-$(RELEASE).src.rpm
+
+dist: all
+ cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+
+clean:
+ rm $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
diff --git a/imapd/README b/imapd/README
new file mode 100644
index 0000000..e6515f2
--- /dev/null
+++ b/imapd/README
@@ -0,0 +1,3 @@
+for a short time, maintain a patch for the openpkg source rpm
+
+to build imapd for kolab run make
diff --git a/imapd/kolab.patch b/imapd/kolab.patch
new file mode 100644
index 0000000..fd1a488
--- /dev/null
+++ b/imapd/kolab.patch
@@ -0,0 +1,39 @@
+--- imapd.spec.orig 2008-02-02 11:40:34.000000000 +0100
++++ imapd.spec 2008-01-01 15:31:56.000000000 +0100
+@@ -32,7 +32,7 @@
+ Group: Mail
+ License: BSD
+ Version: 2.3.11
+-Release: 20080101_kolab
++Release: 20080101
+
+ # package options
+ %option with_fsl yes
+@@ -48,7 +48,6 @@
+ %option with_annotate no
+ %option with_morelogging no
+ %option with_kolab no
+-%option with_kolab_nocaps no
+
+ # fixing implicit inter-module dependencies and correlations
+ %if "%{with_kolab}" == "yes"
+@@ -74,7 +73,6 @@
+ Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Logging.patch
+ 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
+-Patch7: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/imapd/timsieved-starttls-sendcaps.patch
+
+ # build information
+ Prefix: %{l_prefix}
+@@ -154,11 +152,6 @@
+ %patch -p1 -P 6
+ %endif
+
+- # kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls)
+-%if "%{with_kolab_nocaps}" == "yes"
+- %patch -p2 -R -P 7
+-%endif
+-
+ # add optional DRAC file support
+ %if "%{with_drac}" == "yes"
+ %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
diff --git a/imapd/timsieved-starttls-sendcaps.patch b/imapd/timsieved-starttls-sendcaps.patch
new file mode 100644
index 0000000..db41702
--- /dev/null
+++ b/imapd/timsieved-starttls-sendcaps.patch
@@ -0,0 +1,19 @@
+This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45
+(minus the CVS keywords)
+
+It should be reverse-applied with patch -p2 -R to work around the kontact
+behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends
+capabilities after starttls) and can be dropped as soon as kontact has a way
+to work with old and new cyrus imapd servers.
+
+--- src/cyrus/timsieved/parser.c 2007/11/26 20:23:06 1.44
++++ src/cyrus/timsieved/parser.c 2007/12/10 14:47:08 1.45
+@@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea
+
+ starttls_done = 1;
+
+- return result;
++ return capabilities(sieved_out, sieved_saslconn, starttls_done, authenticated);
+ }
+ #else
+ static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in)