Index: debian/univention-mail-cyrus-kolab2.univention-config-registry
===================================================================
--- debian/univention-mail-cyrus-kolab2.univention-config-registry	(Revision 13454)
+++ debian/univention-mail-cyrus-kolab2.univention-config-registry	(Arbeitskopie)
@@ -68,6 +68,7 @@
 Variables: mail/cyrus/pop/maxchilds
 Variables: mail/cyrus/sieve/listen_host
 Variables: mail/cyrus/sieve/maxchilds
+Variables: mail/cyrus/ipv6
 
 Type: subfile
 Multifile: etc/imapd/cyrus.conf
@@ -95,6 +96,7 @@
 Variables: mail/cyrus/pop/maxchilds
 Variables: mail/cyrus/sieve/listen_host
 Variables: mail/cyrus/sieve/maxchilds
+Variables: mail/cyrus/ipv6
 
 Type: subfile
 Multifile: etc/imapd/cyrus.conf
Index: debian/univention-mail-cyrus-kolab2.univention-config-registry-variables
===================================================================
--- debian/univention-mail-cyrus-kolab2.univention-config-registry-variables	(Revision 13454)
+++ debian/univention-mail-cyrus-kolab2.univention-config-registry-variables	(Arbeitskopie)
@@ -82,6 +82,12 @@
 Type=str
 Categories=service-mail
 
+[mail/cyrus/ipv6]
+Description[de]=IPv6-Funktionalität des IMAP-Servers Ein- und Ausschalten
+Description[en]=Switches IPv6 functionality of IMAP server on and off
+Type=str
+Categories=service-mail
+
 [mail/cyrus/squatter/cron]
 Description[de]=Definiert den Intervall, in der Indexservice squatter Mails indiziert
 Description[en]=Defines the interval to have the indexservice squatter process mails
Index: debian/changelog
===================================================================
--- debian/changelog	(Revision 13454)
+++ debian/changelog	(Arbeitskopie)
@@ -1,3 +1,16 @@
+univention-mail-cyrus-kolab2 (2.1.1-1) unstable; urgency=low
+
+  * merged with trunk (Bug #15308)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu,  5 Nov 2009 09:28:32 +0100
+
+univention-mail-cyrus-kolab2 (2.1.0-1) unstable; urgency=low
+
+  * new UCR variable mail/cyrus/ipv6 switches IPv6 functionality on and off
+    (Bug #15308)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Tue, 25 Aug 2009 16:13:50 +0200
+
 univention-mail-cyrus-kolab2 (2.0.6-3) unstable; urgency=low
 
   * fixed cyrus services template (Bug: #16015) 
Index: debian/univention-mail-cyrus-kolab2.postinst
===================================================================
--- debian/univention-mail-cyrus-kolab2.postinst	(Revision 13454)
+++ debian/univention-mail-cyrus-kolab2.postinst	(Arbeitskopie)
@@ -72,6 +72,7 @@
 univention-config-registry set mail/cyrus/pop?yes
 univention-config-registry set ldap/port=389
 univention-config-registry set mail/cyrus/sieve/listen_host?all
+univention-config-registry set mail/cyrus/ipv6?yes
 
 dpkg-statoverride --add root sasl 660 /etc/sasldb2 || true
 
Index: conffiles/etc/imapd/cyrus.conf.d/20_SERVICES_spool
===================================================================
--- conffiles/etc/imapd/cyrus.conf.d/20_SERVICES_spool	(Revision 13454)
+++ conffiles/etc/imapd/cyrus.conf.d/20_SERVICES_spool	(Arbeitskopie)
@@ -15,6 +15,11 @@
 else:
 	frontend_emailId = "%s@%s" % ('.'.join([ baseConfig['hostname'], baseConfig.get('domainname','undefined') ]) , baseConfig.get('domainname','undefined'))
 
+if configRegistry.get('mail/cyrus/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
+        proto = 'proto=tcp4'
+else:
+        proto = ''
+
 # If we run without a Cyrus Murder Master MUPDATE server
 # or if we have registered as a 'kolab2' service provider (aka 'backend' or 'spool')
 if not (baseConfig.has_key('mail/cyrus/murder/master') and baseConfig['mail/cyrus/murder/master'] != '') \
@@ -36,17 +41,19 @@
 		else:
 			maxchild = '400'
 
-		print '\timap		cmd="/usr/lib/cyrus/bin/imapd -C /etc/imapd/imapd.conf -U 30" listen="%simap" prefork=0 maxchild=%s' % (bindprefix, maxchild)
-		print '\timaps		cmd="/usr/lib/cyrus/bin/imapd -C /etc/imapd/imapd.conf -s -U 30" listen="%simaps" prefork=0 maxchild=%s' % (bindprefix, maxchild)
+			
 
+		print '\timap		cmd="/usr/lib/cyrus/bin/imapd -C /etc/imapd/imapd.conf -U 30" listen="%simap" prefork=0 maxchild=%s %s' % (bindprefix, maxchild, proto)
+		print '\timaps		cmd="/usr/lib/cyrus/bin/imapd -C /etc/imapd/imapd.conf -s -U 30" listen="%simaps" prefork=0 maxchild=%s %s' % (bindprefix, maxchild, proto)
+
 	if baseConfig.has_key('mail/cyrus/pop') and baseConfig['mail/cyrus/pop'] == 'yes':
 		if baseConfig.has_key( 'mail/cyrus/pop/maxchilds' ):
 			maxchild = baseConfig[ 'mail/cyrus/pop/maxchilds' ]
 		else:
 			maxchild = '400'
 
-		print '\tpop3		cmd="/usr/lib/cyrus/bin/pop3d -C /etc/imapd/imapd.conf -U 30" listen="%spop3" prefork=0 maxchild=%s' % (bindprefix, maxchild)
-		print '\tpop3s		cmd="/usr/lib/cyrus/bin/pop3d -C /etc/imapd/imapd.conf -s -U 30" listen="%spop3s" prefork=0 maxchild=%s' % (bindprefix, maxchild)
+		print '\tpop3		cmd="/usr/lib/cyrus/bin/pop3d -C /etc/imapd/imapd.conf -U 30" listen="%spop3" prefork=0 maxchild=%s %s' % (bindprefix, maxchild, proto)
+		print '\tpop3s		cmd="/usr/lib/cyrus/bin/pop3d -C /etc/imapd/imapd.conf -s -U 30" listen="%spop3s" prefork=0 maxchild=%s %s' % (bindprefix, maxchild, proto)
 
 	print'''
 	# At least one form of LMTP is required for delivery
@@ -71,11 +78,11 @@
 		maxchild = '400'
 	if baseConfig.has_key('mail/cyrus/sieve/listen_host') and baseConfig['mail/cyrus/sieve/listen_host']:
 		if baseConfig['mail/cyrus/sieve/listen_host'] == "all":
-			print'\tsieve		cmd="timsieved -C /etc/imapd/imapd.conf" listen=":sieve" prefork=0 maxchild=%s' % maxchild
+			print'\tsieve		cmd="timsieved -C /etc/imapd/imapd.conf" listen=":sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
 		else:
-			print'\tsieve		cmd="timsieved -C /etc/imapd/imapd.conf" listen="%s:sieve" prefork=0 maxchild=%s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild )
+			print'\tsieve		cmd="timsieved -C /etc/imapd/imapd.conf" listen="%s:sieve" prefork=0 maxchild=%s %s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild, proto )
 	else:
-	    print'\tsieve		cmd="timsieved -C /etc/imapd/imapd.conf" listen="localhost:sieve" prefork=0 maxchild=%s' % maxchild
+	    print'\tsieve		cmd="timsieved -C /etc/imapd/imapd.conf" listen="localhost:sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
 
 elif baseConfig.has_key('mail/cyrus/murder/frontends') and frontend_emailId in baseConfig['mail/cyrus/murder/frontends'].split(' '):
 	print'\n\t# useful if you need to give users remote access to sieve'
@@ -87,11 +94,11 @@
 		maxchild = '400'
 	if baseConfig.has_key('mail/cyrus/sieve/listen_host') and baseConfig['mail/cyrus/sieve/listen_host']:
 		if baseConfig['mail/cyrus/sieve/listen_host'] == "all":
-			print'\tsieve		cmd="timsieved -C /etc/imapd/frontend.conf" listen=":sieve" prefork=0 maxchild=%s' % maxchild
+			print'\tsieve		cmd="timsieved -C /etc/imapd/frontend.conf" listen=":sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
 		else:
-			print'\tsieve		cmd="timsieved -C /etc/imapd/frontend.conf" listen="%s:sieve" prefork=0 maxchild=%s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild )
+			print'\tsieve		cmd="timsieved -C /etc/imapd/frontend.conf" listen="%s:sieve" prefork=0 maxchild=%s %s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild, proto )
 	else:
-	    print'\tsieve		cmd="timsieved -C /etc/imapd/frontend.conf" listen="localhost:sieve" prefork=0 maxchild=%s' % maxchild
+	    print'\tsieve		cmd="timsieved -C /etc/imapd/frontend.conf" listen="localhost:sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
 @!@
 
 	# this one is needed for the notification services