rpms/system-config-firewall/F-8 system-config-firewall-1.0.12-0600.patch, NONE, 1.1 system-config-firewall-1.0.12-icon.patch, NONE, 1.1 system-config-firewall.spec, 1.15, 1.16

[Thomas Woerner (twoerner)]

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3810

Modified Files:
	system-config-firewall.spec 
Added Files:
	system-config-firewall-1.0.12-0600.patch 
	system-config-firewall-1.0.12-icon.patch 
Log Message:
- fixed icon problem (rhbz#425796)
- using mode 0600 for all config files



system-config-firewall-1.0.12-0600.patch:

--- NEW FILE system-config-firewall-1.0.12-0600.patch ---
diff -up system-config-firewall-1.0.12/src/fw_sysconfig.py.security system-config-firewall-1.0.12/src/fw_sysconfig.py
--- system-config-firewall-1.0.12/src/fw_sysconfig.py.security	2007-09-25 17:16:30.000000000 +0200
+++ system-config-firewall-1.0.12/src/fw_sysconfig.py	2007-12-17 12:25:12.000000000 +0100
@@ -51,6 +51,7 @@ def write_sysconfig_config(filename, con
     except:
         return False
     
+    os.chmod(filename, 0600)
     fd.write("# Configuration file for system-config-firewall\n")
     fd.write("\n")
 
diff -up system-config-firewall-1.0.12/src/fw_iptables.py.security system-config-firewall-1.0.12/src/fw_iptables.py
--- system-config-firewall-1.0.12/src/fw_iptables.py.security	2007-11-05 17:43:22.000000000 +0100
+++ system-config-firewall-1.0.12/src/fw_iptables.py	2007-12-17 12:24:53.000000000 +0100
@@ -85,6 +85,7 @@ class ip4tablesConfig:
             return
 
         (temp_file, temp) = tempfile.mkstemp("iptables-config")
+        os.chmod(temp, 0600)
         modified = False
         file = open(self.filename, "r")
         for line in file.xreadlines():
@@ -134,13 +135,12 @@ class ip4tablesConfig:
             return
         # copy tempfile
         try:
-            shutil.copy(temp, self.filename)
+            shutil.copymode(temp, self.filename)
         except:
             os.remove(temp)
             raise IOError, "Permission denied: '%s'" % self.filename
         else:
             os.remove(temp)
-            os.chmod(self.filename, 0600)
 
     def _write(self, fd, key, value):
         if isinstance(value, types.ListType) or \
@@ -182,6 +182,7 @@ class iptablesClass:
                     custom_filter.append(_filename)
 
         fd = open(self.filename, "w")
+        os.chmod(self.filename, 0600)
 
         fd.write("# Firewall configuration written by system-config-firewall\n")
         fd.write("# Manual customization of this file is not recommended.\n")
@@ -333,6 +334,7 @@ class ip6tablesClass(iptablesClass):
                     custom_filter.append(_filename)
 
         fd = open(self.filename, "w")
+        os.chmod(self.filename, 0600)
 
         fd.write("# Firewall configuration written by system-config-firewall\n")
         fd.write("# Manual customization of this file is not recommended.\n")

system-config-firewall-1.0.12-icon.patch:

--- NEW FILE system-config-firewall-1.0.12-icon.patch ---
diff -up system-config-firewall-1.0.12/Makefile.icon system-config-firewall-1.0.12/Makefile
--- system-config-firewall-1.0.12/Makefile.icon	2007-12-10 18:38:40.000000000 +0100
+++ system-config-firewall-1.0.12/Makefile	2007-12-17 12:22:36.000000000 +0100
@@ -43,6 +43,7 @@ install: ${PKGNAME}.desktop
 	install $(PKGNAME).console $(INSTROOT)$(SECURITY_DIR)/$(PKGNAME)
 	install $(PKGNAME).conf $(INSTROOT)/etc/sysconfig/$(PKGNAME)
 	install src/pixmaps/wizard*.png $(INSTROOT)$(PKGIMAGEDIR)
+	install src/pixmaps/${PKGNAME}*.png $(INSTROOT)$(PKGIMAGEDIR)
 	install src/pixmaps/${PKGNAME}_48.png $(INSTROOT)/usr/share/icons/hicolor/48x48/apps/${PKGNAME}.png
 	install $(PKGNAME).desktop $(INSTROOT)/usr/share/applications/$(PKGNAME).desktop
 	ln -sf consolehelper $(INSTROOT)/usr/bin/$(PKGNAME)


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-8/system-config-firewall.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- system-config-firewall.spec	13 Dec 2007 12:53:08 -0000	1.15
+++ system-config-firewall.spec	17 Dec 2007 11:30:54 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
 Version: 1.0.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
 ExclusiveOS: Linux
@@ -9,6 +9,8 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
+Patch0: system-config-firewall-1.0.12-icon.patch
+Patch1: system-config-firewall-1.0.12-0600.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -45,6 +47,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .icon
+%patch1 -p1 -b .0600
 
 %install
 rm -rf %{buildroot}
@@ -119,6 +123,10 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel
 
 %changelog
+* Mon Dec 17 2007 Thomas Woerner <twoerner at redhat.com> 1.0.12-3
+- fixed icon problem (rhbz#425796)
+- using mode 0600 for all config files
+
 * Thu Dec 13 2007 Thomas Woerner <twoerner at redhat.com> 1.0.12-2
 - fixed lokkit command problem for non english languages
 - using latest translations