rpms/system-config-firewall/devel system-config-firewall-1.0.5-sysconfig.patch, NONE, 1.1 system-config-firewall.spec, 1.5, 1.6
Thomas Woerner (twoerner)
fedora-extras-commits at redhat.com
Wed Sep 5 16:43:13 UTC 2007
Author: twoerner
Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18819
Modified Files:
system-config-firewall.spec
Added Files:
system-config-firewall-1.0.5-sysconfig.patch
Log Message:
- fixed problem if /etc/sysconfig/system-config-securtylevel and
/etc/sysconfig/system-config-firewall are not readable
system-config-firewall-1.0.5-sysconfig.patch:
--- NEW FILE system-config-firewall-1.0.5-sysconfig.patch ---
diff -up system-config-firewall-1.0.5/src/fw_sysconfig.py.sysconfig system-config-firewall-1.0.5/src/fw_sysconfig.py
--- system-config-firewall-1.0.5/src/fw_sysconfig.py.sysconfig 2007-08-17 17:24:58.000000000 +0200
+++ system-config-firewall-1.0.5/src/fw_sysconfig.py 2007-09-05 18:39:06.000000000 +0200
@@ -31,7 +31,7 @@ def read_sysconfig_config(merge_config=N
try:
fd = open(filename, 'r')
except:
- return None
+ return merge_config
argv = [ ]
for line in fd.xreadlines():
if not line:
Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system-config-firewall.spec 31 Aug 2007 17:39:11 -0000 1.5
+++ system-config-firewall.spec 5 Sep 2007 16:42:34 -0000 1.6
@@ -1,7 +1,7 @@
Summary: A graphical interface for basic firewall setup
Name: system-config-firewall
Version: 1.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://fedora.redhat.com/projects/config-tools/
License: GPLv2+
ExclusiveOS: Linux
@@ -11,6 +11,7 @@
Source0: %{name}-%{version}.tar.bz2
Patch0: system-config-firewall-1.0.5-lokkit.patch
Patch1: system-config-firewall-1.0.5-modules.patch
+Patch2: system-config-firewall-1.0.5-sysconfig.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: intltool
@@ -49,6 +50,7 @@
%setup -q
%patch0 -p1 -b .lokkit
%patch1 -p1 -b .modules
+%patch2 -p1 -b .sysconfig
%install
rm -rf %{buildroot}
@@ -122,6 +124,10 @@
%ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel
%changelog
+* Wed Sep 5 2007 Thomas Woerner <twoerner at redhat.com> 1.0.5-4
+- fixed problem if /etc/sysconfig/system-config-securtylevel and
+ /etc/sysconfig/system-config-firewall are not readable
+
* Fri Aug 31 2007 Thomas Woerner <twoerner at redhat.com> 1.0.5-3
- fixed problem if IP*TABLES_MODULES is not set in config files
More information about the fedora-extras-commits
mailing list