Index: debian/postinst
===================================================================
--- debian/postinst	(Revision 13463)
+++ debian/postinst	(Arbeitskopie)
@@ -31,6 +31,7 @@
 #DEBHELPER#
 
 univention-config-registry set postfix/autostart=yes
+univention-config-registry set postfix/ipv6?no
 
 eval $(univention-config-registry shell)
 
Index: debian/univention-mail-postfix.univention-config-registry-variables
===================================================================
--- debian/univention-mail-postfix.univention-config-registry-variables	(Revision 13463)
+++ debian/univention-mail-postfix.univention-config-registry-variables	(Arbeitskopie)
@@ -76,6 +76,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: debian/changelog
===================================================================
--- debian/changelog	(Revision 13463)
+++ debian/changelog	(Arbeitskopie)
@@ -1,3 +1,22 @@
+univention-mail-postfix (2.1.2-1) unstable; urgency=low
+
+  * merged with trunk (Bug #15307)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu,  5 Nov 2009 10:21:28 +0100
+
+univention-mail-postfix (2.1.1-1) unstable; urgency=low
+
+  * small fixes (Bug #15307)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu,  5 Nov 2009 10:06:59 +0100
+
+univention-mail-postfix (2.1.0-1) unstable; urgency=low
+
+  * new UCR variable postfix/ipv6 will enable / disable IPv6 functionality
+    (Bug #15307)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Mon, 24 Aug 2009 13:07:39 +0200
+
 univention-mail-postfix (2.0.2-2) unstable; urgency=low
 
   * updated UCR variable description of mail/postfix/ldap/timeout (Bug 14208)
Index: debian/univention-mail-postfix.univention-config-registry
===================================================================
--- debian/univention-mail-postfix.univention-config-registry	(Revision 13463)
+++ debian/univention-mail-postfix.univention-config-registry	(Arbeitskopie)
@@ -32,6 +32,7 @@
 Variables: mail/smtpauth
 Variables: mail/smtpport
 Variables: postfix/zarafa
+Variables: postfix/ipv6
 
 Type: file
 File: etc/mailname
Index: conffiles/etc/postfix/main.cf
===================================================================
--- conffiles/etc/postfix/main.cf	(Revision 13463)
+++ conffiles/etc/postfix/main.cf	(Arbeitskopie)
@@ -197,3 +197,13 @@
 	print '#message_size_limit = 0'
 @!@
 
+#
+# 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'
+@!@