[pkg-kolab] r1407 - in kolab-cyrus-imapd: scripts trunk/debian trunk/debian/patches

[Mathieu Parent]

Author: sathieu
Date: 2009-11-17 20:46:54 +0000 (Tue, 17 Nov 2009)
New Revision: 1407

Modified:
   kolab-cyrus-imapd/scripts/cyrus-to-kolab
   kolab-cyrus-imapd/trunk/debian/changelog
   kolab-cyrus-imapd/trunk/debian/copyright
   kolab-cyrus-imapd/trunk/debian/cyrus.conf
   kolab-cyrus-imapd/trunk/debian/patches/00list
Log:
  * Enable imaps by default
  * Updated copyright to remove mention of 101-fix_Makefile.in.dpatch
  * More doc in cyrus-to-kolab


Modified: kolab-cyrus-imapd/scripts/cyrus-to-kolab
===================================================================
--- kolab-cyrus-imapd/scripts/cyrus-to-kolab	2009-11-17 20:28:11 UTC (rev 1406)
+++ kolab-cyrus-imapd/scripts/cyrus-to-kolab	2009-11-17 20:46:54 UTC (rev 1407)
@@ -376,8 +376,14 @@
 cp $trunk_dir_debian/svn-deblayout $dest_dir_debian
 
 #cyrus.conf
+# enable imaps
+sed -i 's/^\([ \t]*\)#imaps\([ \t]\+\)cmd="\(imapd[^"]*\)"/\1imaps\2cmd="\3"/' $dest_dir_debian/cyrus.conf
+#imaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100
+# comment nntp
 sed -i 's/^\([ \t]*\)nntp\([ \t]\+\)/\1#nntp\2/' $dest_dir_debian/cyrus.conf
+# uncomment lmtp, use port 2003
 sed -i 's/^\([ \t]*\)#lmtp\([ \t]\+\)cmd="lmtpd"\([ \t]\+\)listen="localhost:lmtp"/\1lmtp\2cmd="lmtpd -a"\3listen="localhost:2003"/' $dest_dir_debian/cyrus.conf
+# sieve accepted from other hosts
 sed -i 's/listen="localhost:sieve"/listen="sieve"/' $dest_dir_debian/cyrus.conf
 
 #cyrus-makedirs

Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog	2009-11-17 20:28:11 UTC (rev 1406)
+++ kolab-cyrus-imapd/trunk/debian/changelog	2009-11-17 20:46:54 UTC (rev 1407)
@@ -1,3 +1,9 @@
+kolab-cyrus-imapd (2.2.13-9) UNRELEASED; urgency=low
+
+  * Enable imaps by default
+
+ -- Mathieu Parent <sathieu at debian.org>  Tue, 17 Nov 2009 21:43:35 +0100
+
 kolab-cyrus-imapd (2.2.13-8) unstable; urgency=low
 
   * Remove kolab-cyrus-common.linda 

Modified: kolab-cyrus-imapd/trunk/debian/copyright
===================================================================
--- kolab-cyrus-imapd/trunk/debian/copyright	2009-11-17 20:28:11 UTC (rev 1406)
+++ kolab-cyrus-imapd/trunk/debian/copyright	2009-11-17 20:46:54 UTC (rev 1407)
@@ -6,7 +6,6 @@
 
 The specific Kolab patches are:
 100-kolab-imapd.dpatch
-101-fix_Makefile.in.dpatch
 105-cyradm.sh.dpatch
 130-kolab-imapd-goodchars.dpatch
 140-kolab-ldap.dpatch

Modified: kolab-cyrus-imapd/trunk/debian/cyrus.conf
===================================================================
--- kolab-cyrus-imapd/trunk/debian/cyrus.conf	2009-11-17 20:28:11 UTC (rev 1406)
+++ kolab-cyrus-imapd/trunk/debian/cyrus.conf	2009-11-17 20:46:54 UTC (rev 1407)
@@ -30,7 +30,7 @@
 	# --- Normal cyrus spool, or Murder backends ---
 	# add or remove based on preferences
 	imap		cmd="imapd -U 30" listen="imap" prefork=0 maxchild=100
-	#imaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100
+	imaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100
 	pop3		cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=50
 	#pop3s		cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50
 	#nntp		cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100

Modified: kolab-cyrus-imapd/trunk/debian/patches/00list
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/00list	2009-11-17 20:28:11 UTC (rev 1406)
+++ kolab-cyrus-imapd/trunk/debian/patches/00list	2009-11-17 20:46:54 UTC (rev 1407)
@@ -69,7 +69,6 @@
 # 82-allow-from_-header.dpatch
 99-update-autoconf.dpatch
 100-kolab-imapd.dpatch
-#101-fix_Makefile.in.dpatch
 105-cyradm.sh.dpatch
 130-kolab-imapd-goodchars.dpatch
 140-kolab-ldap.dpatch