gunnar: server/imapd imapd.patch, 1.2, 1.3 Makefile, 1.44, 1.45 kolab.patch, 1.41, 1.42

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Makefile kolab.patch 
Added Files:
	imapd.patch 
Log Message:
Update to cyrus-imapd-2.3.15 and merge bug fix for  kolab/issue3838 (no logging for pop3).

Remarks:

 OpenPKG did not update cyrus imapd in a while. Maybe it is still considered unstable or maybe they did not have the man power to maintain the package.
 In order to update now I had to add the imapd.patch from 2.3.14 that they provide (we could also offer the cyrus-imapd-2.3.14 src RPM from the
 Kolab download site instead). In case the versions available from OpenPKG lag behind even more we might consider pulling in the complete source from
 there.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Makefile	9 Jul 2009 15:31:59 -0000	1.44
+++ Makefile	4 Dec 2009 10:58:01 -0000	1.45
@@ -1,9 +1,12 @@
 include ../Base.mk
 
 PACKAGE=imapd
-VERSION=2.3.13
+DOWNLOAD_VERSION=2.3.13
+VERSION=2.3.15
 RELEASE=20081020
-KOLABRELEASE=20081020_kolab2
+KOLABRELEASE=20081020_kolab5
+
+SOURCE_0=ftp://ftp.andrew.cmu.edu/pub/cyrus/cyrus-imapd-2.3.15.tar.gz
 
 PATCHES=patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Cyradm_Annotations.patch \
 	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \
@@ -12,21 +15,23 @@
 	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 \
-	kolab.patch
+	kolab.patch \
+	imapd.patch
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm $(PATCHES) Makefile
+	$(RPM) -ihv $(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
+	cd $(KOLABRPMSRC)/$(PACKAGE) && wget $(SOURCE_0)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < 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 .
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm:
+	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm
 
 .PHONY: dist
 dist: all

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- kolab.patch	23 Apr 2009 21:43:17 -0000	1.41
+++ kolab.patch	4 Dec 2009 10:58:01 -0000	1.42
@@ -3,9 +3,10 @@
 @@ -32,7 +32,7 @@
  Group:        Mail
  License:      BSD
- Version:      2.3.13
+-Version:      2.3.13
 -Release:      20081020
-+Release:      20081020_kolab2
++Version:      2.3.15
++Release:      20081020_kolab5
  
  #   package options
  %option       with_fsl           yes
@@ -93,3 +94,14 @@
          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
+@@ -14,7 +14,7 @@
+     }
+ };
+ 
+-ident (pop3.)/.+ q{
++ident (pop3d|pop3s|pop3)/.+ q{
+     prefix(
+         prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+     )