Index: debian/changelog
===================================================================
--- debian/changelog	(.../ucs/services/univention-bind)	(Revision 10864)
+++ debian/changelog	(.../component/ipv6/univention-bind)	(Revision 13421)
@@ -1,3 +1,27 @@
+univention-bind (4.1.3-1) unstable; urgency=low
+
+  * set bind/ipv6=no again on install to reflect default UCS behavior (Bug #15304)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Tue, 20 Oct 2009 16:25:06 +0200
+
+univention-bind (4.1.2-1) unstable; urgency=low
+
+  * UCR variable bind/ipv6 also enables/disables IPv6 in univention-bind-proxy (Bug #15304)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Mon, 19 Oct 2009 14:29:02 +0200
+
+univention-bind (4.1.1-1) unstable; urgency=low
+
+  * set bind/ipv6=yes on install to reflect default UCS behavior (Bug #15304)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu, 15 Oct 2009 16:51:16 +0200
+
+univention-bind (4.1.0-1) unstable; urgency=low
+
+  * new UCR variable bind/ipv6 will switch IPv6 functionality on and off (Bug #15304)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Mon, 24 Aug 2009 09:54:23 +0200
+
 univention-bind (4.0.2-1) unstable; urgency=low
 
   * bumped version (Bug #13505)
Index: debian/univention-bind.postinst
===================================================================
--- debian/univention-bind.postinst	(.../ucs/services/univention-bind)	(Revision 10864)
+++ debian/univention-bind.postinst	(.../component/ipv6/univention-bind)	(Revision 13421)
@@ -34,6 +34,7 @@
 chmod g+w /etc/bind/*
 
 univention-baseconfig set bind/autostart?yes
+univention-baseconfig set bind/ipv6?no
 
 if [ "$1" = "configure" -a -n "$2" ]; then
 
Index: debian/univention-bind-proxy.univention-config-registry-variables
===================================================================
--- debian/univention-bind-proxy.univention-config-registry-variables	(.../ucs/services/univention-bind)	(Revision 10864)
+++ debian/univention-bind-proxy.univention-config-registry-variables	(.../component/ipv6/univention-bind)	(Revision 13421)
@@ -34,3 +34,8 @@
 Type=str
 Categories=service-bind,system-services
 
+[bind/ipv6]
+Description[de]=Schaltet IPv6-Funktionalität in Bind an und aus
+Description[en]=Switches bind's IPv6 functionality on and off
+Type=str
+Categories=service-bind
Index: debian/univention-bind.univention-config-registry
===================================================================
--- debian/univention-bind.univention-config-registry	(.../ucs/services/univention-bind)	(Revision 10864)
+++ debian/univention-bind.univention-config-registry	(.../component/ipv6/univention-bind)	(Revision 13421)
@@ -1,5 +1,6 @@
 Type: file
 File: etc/bind/named.conf
+Variables: bind/ipv6
 
 Type: file
 File: etc/runit/univention-bind/run
Index: conffiles/etc/bind/named.conf
===================================================================
--- conffiles/etc/bind/named.conf	(.../ucs/services/univention-bind)	(Revision 10864)
+++ conffiles/etc/bind/named.conf	(.../component/ipv6/univention-bind)	(Revision 13421)
@@ -18,6 +18,12 @@
     also-notify {
         127.0.0.1;
     };
+@!@
+if not configRegistry.get('bind/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
+        print '    listen-on-v6 { any; };'
+else:
+        print '    listen-on-v6 { none; };'
+@!@
 };
 
 include "/etc/bind/univention.conf";
Index: conffiles/etc/bind/named.conf.proxy
===================================================================
--- conffiles/etc/bind/named.conf.proxy	(.../ucs/services/univention-bind)	(Revision 10864)
+++ conffiles/etc/bind/named.conf.proxy	(.../component/ipv6/univention-bind)	(Revision 13421)
@@ -15,6 +15,12 @@
 };			
 options {
     directory "/var/cache/bind";
+@!@
+if not configRegistry.get('bind/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
+        print '    listen-on-v6 { any; };'
+else:
+        print '    listen-on-v6 { none; };'
+@!@
 };
 logging {
    category lame-servers { null; };