rpms/system-config-firewall/devel system-config-firewall-1.0.5-lokkit.patch, NONE, 1.1 system-config-firewall.spec, 1.3, 1.4

[Thomas Woerner (twoerner)]

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15995

Modified Files:
	system-config-firewall.spec 
Added Files:
	system-config-firewall-1.0.5-lokkit.patch 
Log Message:
- fixed lokkit problem if selinux configuration is not available (rhbz#269601)



system-config-firewall-1.0.5-lokkit.patch:

--- NEW FILE system-config-firewall-1.0.5-lokkit.patch ---
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 [ ]


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system-config-firewall.spec	30 Aug 2007 15:43:19 -0000	1.3
+++ system-config-firewall.spec	31 Aug 2007 16:01:29 -0000	1.4
@@ -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 @@
 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 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .lokkit
 
 %install
 rm -rf %{buildroot}
@@ -118,6 +120,9 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel
 
 %changelog
+* Fri Aug 31 2007 Thomas Woerner <twoerner at redhat.com> 1.0.5-2
+- fixed lokkit problem if selinux configuration is not available (rhbz#269601)
+
 * Thu Aug 30 2007 Thomas Woerner <twoerner at redhat.com> 1.0.5-1
 - more translations
 - fixed IPsec description