From 2b8e74fdfd4c6c64633bee108680681219dd782b Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Tue, 6 Mar 2012 13:56:05 +0100 Subject: [PATCH] new version 0.2.2 - enabled dhcpv6-client service for zones home and work - new dhcpv6-client service - firewall-cmd: query mode returns reversed values - new zone.changeZone(zone, interface) - moved zones, services and icmptypes to /usr/lib/firewalld, can be overloaded by files in /etc/firewalld (no overload of immutable zones block, drop, trusted) - reset MinimalMark in firewalld.cnf to default value - fixed service destination (addresses not used) - fix xmlplus to be compatible with the python xml sax parser and python 3 by adding __contains__ to xml.sax.xmlreader.AttributesImpl - use icon and glib related post, postun and posttrans scriptes for firewall - firewall-cmd: fix typo in state - firewall-cmd: fix usage() - firewall-cmd: fix interface action description in usage() - client.py: fix definition of queryInterface() - client.py: fix typo in getInterfaces() - firewalld.service: do not fork - firewall-cmd: fix bug in --list=port and --port action help message - firewall-cmd: fix bug in --list=service --- .gitignore | 1 + firewalld.spec | 69 +++++++++++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 8b44695..476a21b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /firewalld-0.1.3.tar.bz2 /firewalld-0.2.0.tar.bz2 /firewalld-0.2.1.tar.bz2 +/firewalld-0.2.2.tar.bz2 diff --git a/firewalld.spec b/firewalld.spec index de78088..d88b43e 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -2,7 +2,7 @@ Summary: A firewall daemon with D-BUS interface providing a dynamic firewall Name: firewalld -Version: 0.2.1 +Version: 0.2.2 Release: 1%{?dist} URL: http://fedorahosted.org/firewalld License: GPLv2+ @@ -87,10 +87,6 @@ if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl enable firewalld.service >/dev/null 2>&1 || : fi -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi %preun if [ $1 -eq 0 ]; then # Package removal, not upgrade @@ -103,13 +99,6 @@ fi if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall /bin/systemctl try-restart firewalld.service >/dev/null 2>&1 || : fi -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi -if [ $1 -eq 0 ] ; then - /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -fi %triggerun -- firewalld < 0.1.3-3 # Save the current service runlevel info @@ -121,7 +110,22 @@ fi /sbin/chkconfig --del firewalld >/dev/null 2>&1 || : /bin/systemctl try-restart firewalld.service >/dev/null 2>&1 || : -%posttrans +%post -n firewall-applet +touch --no-create %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + gtk-update-icon-cache -q %{_datadir}/icons/hicolor +fi + +%postun -n firewall-applet +touch --no-create %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + gtk-update-icon-cache -q %{_datadir}/icons/hicolor +fi +if [ $1 -eq 0 ] ; then + /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +fi + +%posttrans -n firewall-applet /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : @@ -131,14 +135,18 @@ fi %{_sbindir}/firewalld %{_bindir}/firewall-cmd %defattr(0640,root,root) +%attr(0750,root,root) %dir %{_prefix}/lib/firewalld +%attr(0750,root,root) %dir %{_prefix}/lib/firewalld/icmptypes +%attr(0750,root,root) %dir %{_prefix}/lib/firewalld/services +%attr(0750,root,root) %dir %{_prefix}/lib/firewalld/zones +%{_prefix}/lib/firewalld/icmptypes/*.xml +%{_prefix}/lib/firewalld/services/*.xml +%{_prefix}/lib/firewalld/zones/*.xml %attr(0750,root,root) %dir %{_sysconfdir}/firewalld +%config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/icmptypes %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones -%{_sysconfdir}/firewalld/icmptypes/*.xml -%{_sysconfdir}/firewalld/services/*.xml -%{_sysconfdir}/firewalld/zones/*.xml -%config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf %defattr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/firewalld #%attr(0755,root,root) %{_initrddir}/firewalld @@ -174,6 +182,33 @@ fi #%{_datadir}/icons/hicolor/*/apps/firewall-config*.* %changelog +* Tue Mar 6 2012 Thomas Woerner 0.2.2-1 +- enabled dhcpv6-client service for zones home and work +- new dhcpv6-client service +- firewall-cmd: query mode returns reversed values +- new zone.changeZone(zone, interface) +- moved zones, services and icmptypes to /usr/lib/firewalld, can be overloaded + by files in /etc/firewalld (no overload of immutable zones block, drop, + trusted) +- reset MinimalMark in firewalld.cnf to default value +- fixed service destination (addresses not used) +- fix xmlplus to be compatible with the python xml sax parser and python 3 + by adding __contains__ to xml.sax.xmlreader.AttributesImpl +- use icon and glib related post, postun and posttrans scriptes for firewall +- firewall-cmd: fix typo in state +- firewall-cmd: fix usage() +- firewall-cmd: fix interface action description in usage() +- client.py: fix definition of queryInterface() +- client.py: fix typo in getInterfaces() +- firewalld.service: do not fork +- firewall-cmd: fix bug in --list=port and --port action help message +- firewall-cmd: fix bug in --list=service + +* Mon Mar 5 2012 Thomas Woerner +- moved zones, services and icmptypes to /usr/lib/firewalld, can be overloaded + by files in /etc/firewalld (no overload of immutable zones block, drop, + trusted) + * Tue Feb 21 2012 Thomas Woerner 0.2.1-1 - added missing firewall.dbus_utils diff --git a/sources b/sources index 0803874..1be2d04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -593fcfee73f87943146af133302d921e firewalld-0.2.1.tar.bz2 +833984002803b56794fdf2bfca271d8f firewalld-0.2.2.tar.bz2