From dca7bdb461bfff84759b2cdfe180218235395a7d Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Aug 31 2007 16:01:29 +0000 Subject: - fixed lokkit problem if selinux configuration is not available (rhbz#269601) --- diff --git a/system-config-firewall-1.0.5-lokkit.patch b/system-config-firewall-1.0.5-lokkit.patch new file mode 100644 index 0000000..9a122b5 --- /dev/null +++ b/system-config-firewall-1.0.5-lokkit.patch @@ -0,0 +1,12 @@ +diff -u -r1.6 lokkit +--- system-config-firewall-1.0.5/src/lokkit 20 Aug 2007 15:57:57 -0000 1.6 ++++ system-config-firewall-1.0.5/src/lokkit 31 Aug 2007 15:46:48 -0000 +@@ -45,8 +45,6 @@ + # parse /etc/sysconfig/system-config-firewall or + # /etc/sysconfig/system-config-securitylevel + old_config = read_sysconfig_config(old_config) +-if not old_config: +- old_config = [ ] + + # parse selinux config + selinux_args = fw_selinux.read() or [ ] diff --git a/system-config-firewall.spec b/system-config-firewall.spec index 1975eb5..53f7f8b 100644 --- a/system-config-firewall.spec +++ b/system-config-firewall.spec @@ -1,7 +1,7 @@ Summary: A graphical interface for basic firewall setup Name: system-config-firewall Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedora.redhat.com/projects/config-tools/ License: GPLv2+ ExclusiveOS: Linux @@ -9,6 +9,7 @@ Group: System Environment/Base BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 +Patch0: system-config-firewall-1.0.5-lokkit.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -45,6 +46,7 @@ interface for basic firewall setup. %prep %setup -q +%patch0 -p1 -b .lokkit %install rm -rf %{buildroot} @@ -118,6 +120,9 @@ fi %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel %changelog +* Fri Aug 31 2007 Thomas Woerner 1.0.5-2 +- fixed lokkit problem if selinux configuration is not available (rhbz#269601) + * Thu Aug 30 2007 Thomas Woerner 1.0.5-1 - more translations - fixed IPsec description