Index: debian/postinst
===================================================================
--- debian/postinst	(Revision 13467)
+++ debian/postinst	(Arbeitskopie)
@@ -32,6 +32,7 @@
 
 univention-config-registry set postfix/autostart?yes \
                                postfix/allow-unauth?yes
+univention-config-registry set postfix/ipv6?no
 
 eval $(univention-config-registry shell)
 
Index: debian/univention-mail-postfix-kolab2.univention-config-registry
===================================================================
--- debian/univention-mail-postfix-kolab2.univention-config-registry	(Revision 13467)
+++ debian/univention-mail-postfix-kolab2.univention-config-registry	(Arbeitskopie)
@@ -23,6 +23,7 @@
 Variables: mail/localmailboxsizelimit
 Variables: postfix/masquerade/domains
 Variables: postfix/masquerade/exceptions
+Variables: postfix/ipv6
 Variables: mail/maps/canonical/sender/enable
 Variables: mail/maps/canonical/sender/classes
 Variables: mail/maps/canonical/recipient/enable
Index: debian/changelog
===================================================================
--- debian/changelog	(Revision 13467)
+++ debian/changelog	(Arbeitskopie)
@@ -1,3 +1,16 @@
+univention-mail-postfix-kolab2 (3.1.1-1) unstable; urgency=low
+
+  * merged with trunk (Bug #15307)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu,  5 Nov 2009 10:51:01 +0100
+
+univention-mail-postfix-kolab2 (3.1.0-1) unstable; urgency=low
+
+  * new UCR variable postfix/ipv6 will enable / disable IPv6 functionality
+    for Postfix (Bug #15307)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Mon, 24 Aug 2009 16:24:37 +0200
+
 univention-mail-postfix-kolab2 (3.0.2-2) unstable; urgency=low
 
   * updated UCR variable description of mail/postfix/ldap/timeout (Bug 14208)
Index: debian/univention-mail-postfix-kolab2.univention-config-registry-variables
===================================================================
--- debian/univention-mail-postfix-kolab2.univention-config-registry-variables	(Revision 13467)
+++ debian/univention-mail-postfix-kolab2.univention-config-registry-variables	(Arbeitskopie)
@@ -88,6 +88,12 @@
 Type=str
 Categories=service-mail
 
+[postfix/ipv6]
+Description[de]=Aktiviert/Deaktiviert IPv6-Funktionalität in Postfix
+Description[en]=Enables/Disables IPv6 funtionality for Postfix
+Type=str
+Categories=service-mail
+
 [postfix/masquerade/domains]
 Description[de]=Liste von Domänen für die Masquerading aktiviert ist
 Description[en]=List of domains for which masquerading is enabled
Index: conffiles/etc/postfix/main.cf.d/10_general
===================================================================
--- conffiles/etc/postfix/main.cf.d/10_general	(Revision 13467)
+++ conffiles/etc/postfix/main.cf.d/10_general	(Arbeitskopie)
@@ -95,3 +95,14 @@
 	print 'smtp_sasl_security_options = noanonymous'
 	print 'smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth'
 @!@
+
+#
+# IPv6 support
+# possible settings for inet_protocols are: ipv4 ; all ; ipv4,ipv6 ; ipv6
+#
+@!@
+if not configRegistry.get('postfix/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
+        print 'inet_protocols = all'
+else:
+        print 'inet_protocols = ipv4'
+@!@