From 621401bf156388b96408605ecacf5e1c29bd1102 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Tue, 30 Apr 2013 18:24:00 +0200
Subject: [PATCH] 0.3.2

- Fix signal handling for SIGTERM
- Additional service files (RHBZ#914859)
- Updated po files
- s/persistent/permanent/ (Trac Ticket #7)
- Better behaviour when running without valid DISPLAY (RHBZ#955414)
- client.handle_exceptions(): do not loop forever
- Set Zone.defaults in zone_reader (RHBZ#951747)
- client: do not pass the dbus exception name to handler
- IO_Object_XMLGenerator: make it work with Python 2.7.4 (RHBZ#951741)
- firewall-cmd: do not use deprecated BaseException.message
- client.py: fix handle_exceptions() (RHBZ#951314)
- firewall-config: check zone/service/icmptype name (RHBZ#947820)
- Allow 3121/tcp (pacemaker_remote) in cluster-suite service. (RHBZ#885257)
- firewall-applet: fix default zone hangling in 'shields-up' (RHBZ#947230)
- FirewallError.get_code(): check for unknown error
---
 .gitignore               |  1 +
 firewalld-bz951741.patch | 42 ----------------------------------------
 firewalld.spec           | 23 ++++++++++++++++++----
 sources                  |  2 +-
 4 files changed, 21 insertions(+), 47 deletions(-)
 delete mode 100644 firewalld-bz951741.patch

diff --git a/.gitignore b/.gitignore
index 0b3c74d..482656b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /firewalld-0.2.12.tar.bz2
 /firewalld-0.3.0.tar.bz2
 /firewalld-0.3.1.tar.bz2
+/firewalld-0.3.2.tar.bz2
diff --git a/firewalld-bz951741.patch b/firewalld-bz951741.patch
deleted file mode 100644
index 88a0aa3..0000000
--- a/firewalld-bz951741.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fb2576f79e3b8cec62116ee27052c1c92906f6da Mon Sep 17 00:00:00 2001
-From: Jiri Popelka <jpopelka@redhat.com>
-Date: Wed, 17 Apr 2013 09:58:42 +0200
-Subject: [PATCH] IO_Object_XMLGenerator: make it work with Python 2.7.4
- (RHBZ#951741)
-
-Since Python 2.7.4 saxutils.XMLGenerator has been using
-io.TextIOBase.write() which takes unicode string.
-
-This should be transparent for us, the problem is that in
-IO_Object_XMLGenerator.simpleElement() we've been
-calling directly saxutils.XMLGenerator._write() which now
-takes unicode instead of str.
-
-IO_Object_XMLGenerator.simpleElement() is almost a copy of
-saxutils.XMLGenerator.startElement() so we can change it the
-same way.
----
- src/firewall/core/io/io_object.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/firewall/core/io/io_object.py b/src/firewall/core/io/io_object.py
-index 0931190..934db98 100644
---- a/src/firewall/core/io/io_object.py
-+++ b/src/firewall/core/io/io_object.py
-@@ -187,10 +187,10 @@ class IO_Object_XMLGenerator(saxutils.XMLGenerator):
-         saxutils.XMLGenerator.__init__(self, out, "utf-8")
- 
-     def simpleElement(self, name, attrs):
--        self._write('<' + name)
-+        self._write(u'<' + name)
-         for (name, value) in attrs.items():
--            self._write(' %s=%s' % (name, saxutils.quoteattr(value)))
--        self._write('/>')
-+            self._write(u' %s=%s' % (name, saxutils.quoteattr(value)))
-+        self._write(u'/>')
- 
- def check_port(port):
-     port_range = functions.getPortRange(port)
--- 
-1.8.2
-
diff --git a/firewalld.spec b/firewalld.spec
index 7980019..c6e5a85 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -1,7 +1,7 @@
 Summary: A firewall daemon with D-BUS interface providing a dynamic firewall
 Name: firewalld
-Version: 0.3.1
-Release: 2%{?dist}
+Version: 0.3.2
+Release: 1%{?dist}
 URL: http://fedorahosted.org/firewalld
 License: GPLv2+
 ExclusiveOS: Linux
@@ -10,7 +10,6 @@ BuildArch: noarch
 Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2
 %if 0%{?fedora} > 17
 Patch0: firewalld-0.2.6-MDNS-default.patch
-Patch1: firewalld-bz951741.patch
 %endif
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -75,7 +74,6 @@ firewalld.
 %setup -q
 %if 0%{?fedora} > 17
 %patch0 -p1
-%patch1 -p1
 %endif
 
 %build
@@ -196,6 +194,23 @@ fi
 %{_datadir}/icons/hicolor/*/apps/firewall-config*.*
 
 %changelog
+* Tue Apr 30 2013 Jiri Popelka <jpopelka@redhat.com> - 0.3.2-1
+- Fix signal handling for SIGTERM
+- Additional service files (RHBZ#914859)
+- Updated po files
+- s/persistent/permanent/ (Trac Ticket #7)
+- Better behaviour when running without valid DISPLAY (RHBZ#955414)
+- client.handle_exceptions(): do not loop forever
+- Set Zone.defaults in zone_reader (RHBZ#951747)
+- client: do not pass the dbus exception name to handler
+- IO_Object_XMLGenerator: make it work with Python 2.7.4 (RHBZ#951741)
+- firewall-cmd: do not use deprecated BaseException.message
+- client.py: fix handle_exceptions() (RHBZ#951314)
+- firewall-config: check zone/service/icmptype name (RHBZ#947820)
+- Allow 3121/tcp (pacemaker_remote) in cluster-suite service. (RHBZ#885257)
+- firewall-applet: fix default zone hangling in 'shields-up' (RHBZ#947230)
+- FirewallError.get_code(): check for unknown error
+
 * Wed Apr 17 2013 Jiri Popelka <jpopelka@redhat.com> - 0.3.1-2
 - Make permanenent changes work with Python 2.7.4 (RHBZ#951741)
 
diff --git a/sources b/sources
index 95fd901..fb5fde4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73715460bfa58d8526117b6f6ae6d809  firewalld-0.3.1.tar.bz2
+42f09947c793400dfd3bff655b73c38d  firewalld-0.3.2.tar.bz2