rpms/system-config-firewall/F-8 system-config-firewall-1.0.12-0600.patch, 1.1, 1.2 system-config-firewall.spec, 1.16, 1.17

[Thomas Woerner (twoerner)]

Author: twoerner

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

Modified Files:
	system-config-firewall-1.0.12-0600.patch 
	system-config-firewall.spec 
Log Message:
- do not use copymode



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

Index: system-config-firewall-1.0.12-0600.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-8/system-config-firewall-1.0.12-0600.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-firewall-1.0.12-0600.patch	17 Dec 2007 11:30:54 -0000	1.1
+++ system-config-firewall-1.0.12-0600.patch	17 Dec 2007 18:32:49 -0000	1.2
@@ -1,17 +1,6 @@
-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
+diff -up system-config-firewall-1.0.12/src/fw_iptables.py.0600 system-config-firewall-1.0.12/src/fw_iptables.py
+--- system-config-firewall-1.0.12/src/fw_iptables.py.0600	2007-11-05 17:43:22.000000000 +0100
++++ system-config-firewall-1.0.12/src/fw_iptables.py	2007-12-17 19:30:22.000000000 +0100
 @@ -85,6 +85,7 @@ class ip4tablesConfig:
              return
  
@@ -20,22 +9,7 @@
          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:
+@@ -182,6 +183,7 @@ class iptablesClass:
                      custom_filter.append(_filename)
  
          fd = open(self.filename, "w")
@@ -43,7 +17,7 @@
  
          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):
+@@ -333,6 +335,7 @@ class ip6tablesClass(iptablesClass):
                      custom_filter.append(_filename)
  
          fd = open(self.filename, "w")
@@ -51,3 +25,14 @@
  
          fd.write("# Firewall configuration written by system-config-firewall\n")
          fd.write("# Manual customization of this file is not recommended.\n")
+diff -up system-config-firewall-1.0.12/src/fw_sysconfig.py.0600 system-config-firewall-1.0.12/src/fw_sysconfig.py
+--- system-config-firewall-1.0.12/src/fw_sysconfig.py.0600	2007-09-25 17:16:30.000000000 +0200
++++ system-config-firewall-1.0.12/src/fw_sysconfig.py	2007-12-17 12:28:46.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")
+ 


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-8/system-config-firewall.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- system-config-firewall.spec	17 Dec 2007 11:30:54 -0000	1.16
+++ system-config-firewall.spec	17 Dec 2007 18:32:49 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
 Version: 1.0.12
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
 ExclusiveOS: Linux
@@ -123,6 +123,9 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel
 
 %changelog
+* Mon Dec 17 2007 Thomas Woerner <twoerner at redhat.com> 1.0.12-3.1
+- do not use copymode
+
 * 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