From 3bcc74d62620fec22b31bca27dc5e5b4fa3fb07e Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Jul 08 2014 11:39:14 +0000
Subject: - renamed fedora specific zones to FedoraServer and FedoraWorkstation for

  zone name limitations (length and allowed chars)

---

diff --git a/FedoraServer.xml b/FedoraServer.xml
new file mode 100644
index 0000000..617e131
--- /dev/null
+++ b/FedoraServer.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<zone>
+  <short>Public</short>
+  <description>For use in public areas. You do not trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted.</description>
+  <service name="ssh"/>
+  <service name="dhcpv6-client"/>
+  <service name="cockpit"/>
+</zone>
diff --git a/FedoraWorkstation.xml b/FedoraWorkstation.xml
new file mode 100644
index 0000000..d29d550
--- /dev/null
+++ b/FedoraWorkstation.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<zone>
+  <short>Fedora Workstation</short>
+  <description>Unsolicited incoming network packets are rejected from port 1 to 1024, except for select network services. Incoming packets that are related to outgoing network connections are accepted. Outgoing network connections are allowed.</description>
+  <service name="dhcpv6-client"/>
+  <service name="ssh"/>
+  <service name="samba-client"/>
+  <port protocol="udp" port="1025-65535"/>
+  <port protocol="tcp" port="1025-65535"/>
+</zone>
diff --git a/fedora-server.xml b/fedora-server.xml
deleted file mode 100644
index 617e131..0000000
--- a/fedora-server.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<zone>
-  <short>Public</short>
-  <description>For use in public areas. You do not trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted.</description>
-  <service name="ssh"/>
-  <service name="dhcpv6-client"/>
-  <service name="cockpit"/>
-</zone>
diff --git a/fedora-workstation.xml b/fedora-workstation.xml
deleted file mode 100644
index d29d550..0000000
--- a/fedora-workstation.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<zone>
-  <short>Fedora Workstation</short>
-  <description>Unsolicited incoming network packets are rejected from port 1 to 1024, except for select network services. Incoming packets that are related to outgoing network connections are accepted. Outgoing network connections are allowed.</description>
-  <service name="dhcpv6-client"/>
-  <service name="ssh"/>
-  <service name="samba-client"/>
-  <port protocol="udp" port="1025-65535"/>
-  <port protocol="tcp" port="1025-65535"/>
-</zone>
diff --git a/firewalld.spec b/firewalld.spec
index 0f58e80..d6c8e0a 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -1,13 +1,13 @@
 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 Name: firewalld
 Version: 0.3.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://fedorahosted.org/firewalld
 License: GPLv2+
 Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2
 %if 0%{?fedora}
-Source1: fedora-server.xml
-Source2: fedora-workstation.xml
+Source1: FedoraServer.xml
+Source2: FedoraWorkstation.xml
 Patch0: firewalld-0.2.6-MDNS-default.patch
 %endif
 BuildArch: noarch
@@ -111,8 +111,8 @@ desktop-file-install --delete-original \
   %{buildroot}%{_datadir}/applications/firewall-config.desktop
 
 install -d -m 755 %{buildroot}%{_prefix}/lib/firewalld/zones/
-install -c -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/firewalld/zones/fedora-server.xml
-install -c -m 644 %{SOURCE2} %{buildroot}%{_prefix}/lib/firewalld/zones/fedora-workstation.xml
+install -c -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/firewalld/zones/FedoraServer.xml
+install -c -m 644 %{SOURCE2} %{buildroot}%{_prefix}/lib/firewalld/zones/FedoraWorkstation.xml
 
 %if 0%{?fedora} > 20
 # standard firewalld.conf
@@ -122,13 +122,13 @@ mv %{buildroot}%{_sysconfdir}/firewalld/firewalld.conf \
 # server firewalld.conf
 cp -a %{buildroot}%{_sysconfdir}/firewalld/firewalld-standard.conf \
     %{buildroot}%{_sysconfdir}/firewalld/firewalld-server.conf
-sed -i 's|^DefaultZone=*|DefaultZone=fedora-server|g' \
+sed -i 's|^DefaultZone=*|DefaultZone=FedoraServer|g' \
     %{buildroot}%{_sysconfdir}/firewalld/firewalld-server.conf
 
 # workstation firewalld.conf
 cp -a %{buildroot}%{_sysconfdir}/firewalld/firewalld-standard.conf \
     %{buildroot}%{_sysconfdir}/firewalld/firewalld-workstation.conf
-sed -i 's|^DefaultZone=*|DefaultZone=fedora-workstation|g' \
+sed -i 's|^DefaultZone=*|DefaultZone=FedoraWorkstation|g' \
     %{buildroot}%{_sysconfdir}/firewalld/firewalld-workstation.conf
 
 rm -f %{buildroot}%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
@@ -300,6 +300,10 @@ fi
 %endif
 
 %changelog
+* Tue Jul  8 2014 Thomas Woerner <twoerner@redhat.com> - 0.3.10-4
+- renamed fedora specific zones to FedoraServer and FedoraWorkstation for 
+  zone name limitations (length and allowed chars)
+
 * Mon Jul  7 2014 Thomas Woerner <twoerner@redhat.com> - 0.3.10-3
 - New support for Fedora per-product configuration settings for Fedora.next
   https://fedoraproject.org/wiki/Per-Product_Configuration_Packaging_Draft