[system-config-firewall] - only write ipv6-dhcp for ipv6 (rhbz#815555)

[Thomas Woerner]

commit f98252d0e48dced332e06b0c1ec03b0ffa011b2a
Author: Thomas Woerner <twoerner at redhat.com>
Date:   Mon Apr 23 23:19:41 2012 +0200

    - only write ipv6-dhcp for ipv6 (rhbz#815555)

 system-config-firewall-1.2.29-ipv6-dhcp.patch |    7 ++++---
 system-config-firewall.spec                   |    5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/system-config-firewall-1.2.29-ipv6-dhcp.patch b/system-config-firewall-1.2.29-ipv6-dhcp.patch
index 4c7fb60..79a838b 100644
--- a/system-config-firewall-1.2.29-ipv6-dhcp.patch
+++ b/system-config-firewall-1.2.29-ipv6-dhcp.patch
@@ -1,12 +1,13 @@
 diff -up system-config-firewall-1.2.29/src/fw_iptables.py.ipv6-dhcp system-config-firewall-1.2.29/src/fw_iptables.py
 --- system-config-firewall-1.2.29/src/fw_iptables.py.ipv6-dhcp	2012-04-20 18:44:49.788614086 +0200
-+++ system-config-firewall-1.2.29/src/fw_iptables.py	2012-04-20 18:44:56.171630987 +0200
-@@ -368,6 +368,8 @@ class iptablesClass:
++++ system-config-firewall-1.2.29/src/fw_iptables.py	2012-04-23 23:14:31.745233715 +0200
+@@ -368,6 +368,9 @@ class iptablesClass:
          self._icmp(conf, fd, "INPUT", reject_type)
          # trust lo
          fd.write("-A INPUT -i lo -j ACCEPT\n")
 +        # Always allow ipv6-dhcp
-+        fd.write("-A INPUT -m state --state NEW -m udp -p udp --dport 546 -d fe80::/64 -j ACCEPT\n")
++        if self.type == "ipv6":
++            fd.write("-A INPUT -m state --state NEW -m udp -p udp --dport 546 -d fe80::/64 -j ACCEPT\n")
          # trusted interfaces
          if conf.trust:
              for dev in conf.trust:
diff --git a/system-config-firewall.spec b/system-config-firewall.spec
index 0c25444..ab2741c 100644
--- a/system-config-firewall.spec
+++ b/system-config-firewall.spec
@@ -16,7 +16,7 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
 Version: 1.2.29
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
 ExclusiveOS: Linux
@@ -181,6 +181,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/system-config-firewall/fw_tui.*
 
 %changelog
+* Mon Apr 23 2012 Thomas Woerner <twoerner at redhat.com> 1.2.29-7
+- only write ipv6-dhcp for ipv6 (rhbz#815555)
+ 
 * Fri Apr 20 2012 Thomas Woerner <twoerner at redhat.com> 1.2.29-6
 - Always allow ipv6-dhcp