rpms/system-config-securitylevel/F-7 system-config-securitylevel-1.7.0-desktopfile.patch, NONE, 1.1 system-config-securitylevel-1.7.0-disable.patch, NONE, 1.1 system-config-securitylevel-1.7.0-dirty.patch, 1.2, 1.3 system-config-securitylevel.spec, 1.97, 1.98
Thomas Woerner (twoerner)
fedora-extras-commits at redhat.com
Thu Aug 2 08:54:36 UTC 2007
- Previous message (by thread): rpms/hardinfo/FC-6 fixsensors.patch, NONE, 1.1 hardinfo.spec, 1.1, 1.2 disablesensors.patch, 1.1, NONE
- Next message (by thread): rpms/util-linux/F-7 util-linux-2.12a-mount-lockperm.patch, NONE, 1.1 util-linux.spec, 1.154, 1.155
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twoerner
Update of /cvs/pkgs/rpms/system-config-securitylevel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32448
Modified Files:
system-config-securitylevel-1.7.0-dirty.patch
system-config-securitylevel.spec
Added Files:
system-config-securitylevel-1.7.0-desktopfile.patch
system-config-securitylevel-1.7.0-disable.patch
Log Message:
[tw]
- rebuild of F devel package for F-7
system-config-securitylevel-1.7.0-desktopfile.patch:
--- NEW FILE system-config-securitylevel-1.7.0-desktopfile.patch ---
--- system-config-securitylevel-1.7.0/system-config-securitylevel.desktop.in.desktopfile 2007-01-05 19:18:38.000000000 +0100
+++ system-config-securitylevel-1.7.0/system-config-securitylevel.desktop.in 2007-06-08 18:24:58.000000000 +0200
@@ -2,8 +2,9 @@
_Name=Firewall and SELinux
_Comment=Configure firewall rules and SELinux setting
Icon=system-config-securitylevel.png
-Categories=Application;SystemSetup;
+Categories=System;Settings;
Exec=/usr/bin/system-config-securitylevel
Type=Application
StartupNotify=true
Terminal=false
+Encoding=UTF-8
system-config-securitylevel-1.7.0-disable.patch:
--- NEW FILE system-config-securitylevel-1.7.0-disable.patch ---
diff -up system-config-securitylevel-1.7.0/src/lokkit.c.disable system-config-securitylevel-1.7.0/src/lokkit.c
--- system-config-securitylevel-1.7.0/src/lokkit.c.disable 2007-07-30 18:25:05.000000000 +0200
+++ system-config-securitylevel-1.7.0/src/lokkit.c 2007-07-30 18:30:45.000000000 +0200
@@ -1430,23 +1430,11 @@ int main(int argc, char **argv) {
if (!enabled && !nostart) {
char path[256];
- snprintf(path, 255,"/sbin/iptables -D INPUT -j %s 2>/dev/null", CHAIN_NAME);
- system(path);
- snprintf(path, 255,"/sbin/iptables -D FORWARD -j %s 2>/dev/null", CHAIN_NAME);
- system(path);
- snprintf(path, 255,"/sbin/iptables -F %s 2>/dev/null", CHAIN_NAME);
- system(path);
- snprintf(path, 255,"/sbin/iptables -X %s 2>/dev/null", CHAIN_NAME);
+ snprintf(path, 255,"service iptables stop 2>/dev/null");
system(path);
unlink(fwscript);
- snprintf(path, 255,"/sbin/ip6tables -D INPUT -j %s 2>/dev/null", CHAIN_NAME);
- system(path);
- snprintf(path, 255,"/sbin/ip6tables -D FORWARD -j %s 2>/dev/null", CHAIN_NAME);
- system(path);
- snprintf(path, 255,"/sbin/ip6tables -F %s 2>/dev/null", CHAIN_NAME);
- system(path);
- snprintf(path, 255,"/sbin/ip6tables -X %s 2>/dev/null", CHAIN_NAME);
+ snprintf(path, 255,"service ip6tables stop 2>/dev/null");
system(path);
unlink(fw6script);
}
system-config-securitylevel-1.7.0-dirty.patch:
Index: system-config-securitylevel-1.7.0-dirty.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-securitylevel/F-7/system-config-securitylevel-1.7.0-dirty.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- system-config-securitylevel-1.7.0-dirty.patch 8 Jun 2007 16:01:52 -0000 1.2
+++ system-config-securitylevel-1.7.0-dirty.patch 2 Aug 2007 08:54:03 -0000 1.3
@@ -1,6 +1,119 @@
---- system-config-securitylevel-1.7.0/src/securitylevel.py.1.7.0 2007-01-12 16:24:59.000000000 +0100
-+++ system-config-securitylevel-1.7.0/src/securitylevel.py 2007-06-06 17:14:47.000000000 +0200
-@@ -147,6 +147,7 @@
+diff -up system-config-securitylevel-1.7.0/src/checklist.py.dirty system-config-securitylevel-1.7.0/src/checklist.py
+--- system-config-securitylevel-1.7.0/src/checklist.py.dirty 2006-01-27 19:57:20.000000000 +0100
++++ system-config-securitylevel-1.7.0/src/checklist.py 2007-07-31 14:42:46.000000000 +0200
+@@ -22,8 +22,13 @@ class CheckList (gtk.TreeView):
+ """A class (derived from gtk.TreeView) that provides a list of
+ checkbox / text string pairs"""
+
++ __gsignals__ = {
++ "check-dirty": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ())
++ }
++
+ # XXX need to handle the multicolumn case better still....
+ def __init__ (self, columns=1):
++ self.__gobject_init__()
+ self.store = gtk.ListStore(gobject.TYPE_BOOLEAN,
+ gobject.TYPE_STRING, gobject.TYPE_STRING)
+
+@@ -86,6 +91,7 @@ class CheckList (gtk.TreeView):
+ val = self.store.get_value(iter, 0)
+ self.store.set_value(iter, 0, not val)
+ self.dirty=True
++ self.emit("check-dirty")
+
+
+ def clear (self):
+diff -up system-config-securitylevel-1.7.0/src/advancedPage.py.dirty system-config-securitylevel-1.7.0/src/advancedPage.py
+--- system-config-securitylevel-1.7.0/src/advancedPage.py.dirty 2007-01-12 16:24:59.000000000 +0100
++++ system-config-securitylevel-1.7.0/src/advancedPage.py 2007-07-31 14:42:46.000000000 +0200
+@@ -19,8 +19,15 @@
+ # You should have received a copy of the GNU General Public License
+ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ #
+-class AdvancedPage:
++import gobject, gtk
++
++class AdvancedPage(gobject.GObject):
++ __gsignals__ = {
++ "check-dirty": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ())
++ }
++
+ def __init__(self, xml):
++ self.__gobject_init__()
+ self.xml = xml
+ self.origFilename = None
+ self.dirty = False
+@@ -29,13 +36,23 @@ class AdvancedPage:
+ self.advancedVBox = self.xml.get_widget("advancedVBox")
+ self.customRulesCheckbox = self.xml.get_widget("customRulesCheckbox")
+ self.customRulesChooser = self.xml.get_widget("customRulesChooser")
++ self.selection_changed_handler = self.customRulesChooser.connect( \
++ "selection-changed", self.file_changed)
+
+ # Set up initial sensitivity of things on the advanced page.
+ self.customRulesChooser.set_sensitive(False)
+- self.customRulesCheckbox.connect("clicked", self.custom_changed_cb)
++ self.custom_changed_handler = self.customRulesCheckbox.connect( \
++ "clicked", self.custom_changed_cb)
+
+ def custom_changed_cb(self, button, *args):
+ self.customRulesChooser.set_sensitive(button.get_active())
++ self.dirty = True
++ self.emit("check-dirty")
++
++ def set_active(self, bool):
++ self.customRulesCheckbox.handler_block(self.custom_changed_handler)
++ self.customRulesCheckbox.set_active(bool)
++ self.customRulesCheckbox.handler_unblock(self.custom_changed_handler)
+
+ def set_sensitive(self, bool):
+ self.customRulesCheckbox.set_sensitive(bool)
+@@ -43,24 +60,19 @@ class AdvancedPage:
+ if self.customRulesCheckbox.get_active():
+ self.customRulesChooser.set_sensitive(bool)
+
++ def file_changed(self, *args):
++ if self.customRulesChooser.get_filename() != self.origFilename:
++ self.dirty = True
++ self.emit("check-dirty")
++
+ def set_filename(self, file):
++ self.customRulesChooser.handler_block(self.selection_changed_handler)
+ self.customRulesChooser.set_filename(file)
++ self.customRulesChooser.handler_unblock(self.selection_changed_handler)
+
+ def apply(self):
+ if self.customRulesCheckbox.get_active():
+ newFilename = self.customRulesChooser.get_filename()
+-
+- if newFilename != self.origFilename:
+- self.dirty = True
+-
+ if newFilename != "":
+ return "--custom-rules=%s" % newFilename
+- else:
+- return ""
+- else:
+- # They used to have a custom rules file enabled, but no longer do.
+- # Set the dirty flag so we know to re-run lokkit without the arg
+- if self.origFilename:
+- self.dirty = True
+-
+- return ""
++ return ""
+diff -up system-config-securitylevel-1.7.0/src/securitylevel.py.dirty system-config-securitylevel-1.7.0/src/securitylevel.py
+--- system-config-securitylevel-1.7.0/src/securitylevel.py.dirty 2007-07-31 14:42:46.000000000 +0200
++++ system-config-securitylevel-1.7.0/src/securitylevel.py 2007-07-31 14:42:46.000000000 +0200
+@@ -86,6 +86,8 @@ class childWindow:
+ self.selinuxPage = None
+ self.advancedPage = None
+ self.other_changed_firsttime = True
++ self.applyButton = None
++ self.okButton = None
+
+ self.serviceList = [Service(name="ssh", description="SSH",
+ ports=[("ssh", "tcp")]),
+@@ -147,6 +149,7 @@ class childWindow:
# Set up the trusted services checklist.
self.incomingList = checklist.CheckList(columns=1)
@@ -8,7 +121,7 @@
keyList = map(lambda svc: svc.description, self.serviceList)
keyList.sort()
-@@ -201,7 +202,7 @@
+@@ -201,7 +204,7 @@ class childWindow:
if self.advancedPage:
self.advancedPage.set_sensitive(True)
@@ -17,7 +130,7 @@
def none_activated(self, *args):
self.trustedServicesBox.set_sensitive(False)
-@@ -210,12 +211,15 @@
+@@ -210,12 +213,15 @@ class childWindow:
if self.advancedPage:
self.advancedPage.set_sensitive(False)
@@ -34,7 +147,7 @@
self.portEntry.set_text("")
self.protoCombo.set_active(0)
-@@ -233,7 +237,7 @@
+@@ -233,7 +239,7 @@ class childWindow:
else:
if self._findPortInStore(portStr, proto) is None:
self.otherPortsStore.append([portStr, proto])
@@ -43,7 +156,7 @@
break
else:
break
-@@ -254,7 +258,7 @@
+@@ -254,7 +260,7 @@ class childWindow:
if iter is not None:
# Need to get past the TreeModelSort to whatever's underneath.
model.get_model().remove(iter)
@@ -52,7 +165,7 @@
def security_changed_cb(self, combobox, *args):
if self.security_changed_firsttime:
-@@ -274,7 +278,7 @@
+@@ -274,7 +280,7 @@ class childWindow:
if self.other_changed_firsttime:
self.other_changed_firsttime = False
return
@@ -61,7 +174,7 @@
def okClicked(self, *args):
rc = self.apply()
-@@ -348,11 +352,11 @@
+@@ -348,11 +354,11 @@ class childWindow:
if arg in ["--high", "--medium", "--enabled"]:
self.securityOptionMenu.set_active(0)
self.firewall_activated()
@@ -75,7 +188,7 @@
elif arg.startswith("--trust="):
key, device = string.split(arg, "=")
devicesList.append(string.strip(device))
-@@ -376,7 +380,7 @@
+@@ -376,7 +382,7 @@ class childWindow:
key, file = string.split(arg, "=")
if self.advancedPage:
@@ -84,7 +197,7 @@
self.advancedPage.set_sensitive(True)
self.advancedPage.origFilename = file
self.advancedPage.set_filename(file)
-@@ -466,13 +470,14 @@
+@@ -466,13 +472,14 @@ class childWindow:
if self.advancedPage:
advancedArgs = self.advancedPage.apply()
@@ -102,7 +215,7 @@
return 0
index = self.securityOptionMenu.get_active()
-@@ -519,10 +524,25 @@
+@@ -555,10 +562,28 @@ class childWindow:
# Set these to False so if you click Apply followed by OK, you're not
# prompted twice.
@@ -120,16 +233,19 @@
+ if self.dirty or self.incomingList.dirty or \
+ (self.advancedPage != None and self.advancedPage.dirty) or \
+ (self.selinuxPage != None and self.selinuxPage.dirty):
-+ self.applyButton.set_sensitive(True)
-+ self.okButton.set_sensitive(True)
++ val = True
+ else:
-+ self.applyButton.set_sensitive(False)
-+ self.okButton.set_sensitive(False)
++ val = False
++
++ if self.applyButton:
++ self.applyButton.set_sensitive(val)
++ if self.okButton:
++ self.okButton.set_sensitive(val)
+
def launch(self, doDebug = None):
self.doDebug = doDebug
self.setupScreen()
-@@ -548,7 +605,9 @@
+@@ -585,7 +610,9 @@ class childWindow:
self.cancelButton = self.xml.get_widget("cancelButton")
self.applyButton = self.xml.get_widget("applyButton")
self.advancedPage = advancedPage.AdvancedPage(xml)
@@ -139,33 +255,10 @@
self.mainWindow.connect("destroy", self.destroy)
self.okButton.connect("clicked", self.okClicked)
---- system-config-securitylevel-1.7.0/src/checklist.py.1.7.0 2006-01-27 19:57:20.000000000 +0100
-+++ system-config-securitylevel-1.7.0/src/checklist.py 2007-06-06 12:14:28.000000000 +0200
-@@ -22,8 +22,13 @@
- """A class (derived from gtk.TreeView) that provides a list of
- checkbox / text string pairs"""
-
-+ __gsignals__ = {
-+ "check-dirty": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ())
-+ }
-+
- # XXX need to handle the multicolumn case better still....
- def __init__ (self, columns=1):
-+ self.__gobject_init__()
- self.store = gtk.ListStore(gobject.TYPE_BOOLEAN,
- gobject.TYPE_STRING, gobject.TYPE_STRING)
-
-@@ -86,6 +91,7 @@
- val = self.store.get_value(iter, 0)
- self.store.set_value(iter, 0, not val)
- self.dirty=True
-+ self.emit("check-dirty")
-
-
- def clear (self):
---- system-config-securitylevel-1.7.0/src/selinuxPage.py.1.7.0 2007-01-04 20:17:09.000000000 +0100
-+++ system-config-securitylevel-1.7.0/src/selinuxPage.py 2007-06-06 15:03:48.000000000 +0200
-@@ -59,8 +59,12 @@
+diff -up system-config-securitylevel-1.7.0/src/selinuxPage.py.dirty system-config-securitylevel-1.7.0/src/selinuxPage.py
+--- system-config-securitylevel-1.7.0/src/selinuxPage.py.dirty 2007-01-04 20:17:09.000000000 +0100
++++ system-config-securitylevel-1.7.0/src/selinuxPage.py 2007-07-31 14:42:46.000000000 +0200
+@@ -59,8 +59,12 @@ def waitCmd (msg, cmd):
dialog.destroy()
return (status, output)
@@ -179,7 +272,7 @@
self.xml = xml
self.selinuxsupport = True
self.needRelabel = False
-@@ -130,6 +134,7 @@
+@@ -130,6 +134,7 @@ class selinuxPage:
self.needRelabel = True
else:
self.needRelabel = False
@@ -187,7 +280,7 @@
def read_selinux_config(self):
self.initEnabled = DISABLED
-@@ -157,6 +162,7 @@
+@@ -157,6 +162,7 @@ class selinuxPage:
self.initEnabled = DISABLED
self.enabledOptionMenu.set_active(DISABLED)
@@ -195,80 +288,3 @@
self.enabled_changed(self.enabledOptionMenu)
return 0
---- system-config-securitylevel-1.7.0/src/advancedPage.py.1.7.0 2007-01-12 16:24:59.000000000 +0100
-+++ system-config-securitylevel-1.7.0/src/advancedPage.py 2007-06-06 14:53:09.000000000 +0200
-@@ -19,8 +19,15 @@
- # You should have received a copy of the GNU General Public License
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- #
--class AdvancedPage:
-+import gobject, gtk
-+
-+class AdvancedPage(gobject.GObject):
-+ __gsignals__ = {
-+ "check-dirty": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ())
-+ }
-+
- def __init__(self, xml):
-+ self.__gobject_init__()
- self.xml = xml
- self.origFilename = None
- self.dirty = False
-@@ -29,13 +36,23 @@
- self.advancedVBox = self.xml.get_widget("advancedVBox")
- self.customRulesCheckbox = self.xml.get_widget("customRulesCheckbox")
- self.customRulesChooser = self.xml.get_widget("customRulesChooser")
-+ self.selection_changed_handler = self.customRulesChooser.connect( \
-+ "selection-changed", self.file_changed)
-
- # Set up initial sensitivity of things on the advanced page.
- self.customRulesChooser.set_sensitive(False)
-- self.customRulesCheckbox.connect("clicked", self.custom_changed_cb)
-+ self.custom_changed_handler = self.customRulesCheckbox.connect( \
-+ "clicked", self.custom_changed_cb)
-
- def custom_changed_cb(self, button, *args):
- self.customRulesChooser.set_sensitive(button.get_active())
-+ self.dirty = True
-+ self.emit("check-dirty")
-+
-+ def set_active(self, bool):
-+ self.customRulesCheckbox.handler_block(self.custom_changed_handler)
-+ self.customRulesCheckbox.set_active(bool)
-+ self.customRulesCheckbox.handler_unblock(self.custom_changed_handler)
-
- def set_sensitive(self, bool):
- self.customRulesCheckbox.set_sensitive(bool)
-@@ -43,24 +60,19 @@
- if self.customRulesCheckbox.get_active():
- self.customRulesChooser.set_sensitive(bool)
-
-+ def file_changed(self, *args):
-+ if self.customRulesChooser.get_filename() != self.origFilename:
-+ self.dirty = True
-+ self.emit("check-dirty")
-+
- def set_filename(self, file):
-+ self.customRulesChooser.handler_block(self.selection_changed_handler)
- self.customRulesChooser.set_filename(file)
-+ self.customRulesChooser.handler_unblock(self.selection_changed_handler)
-
- def apply(self):
- if self.customRulesCheckbox.get_active():
- newFilename = self.customRulesChooser.get_filename()
--
-- if newFilename != self.origFilename:
-- self.dirty = True
--
- if newFilename != "":
- return "--custom-rules=%s" % newFilename
-- else:
-- return ""
-- else:
-- # They used to have a custom rules file enabled, but no longer do.
-- # Set the dirty flag so we know to re-run lokkit without the arg
-- if self.origFilename:
-- self.dirty = True
--
-- return ""
-+ return ""
- Previous message (by thread): rpms/hardinfo/FC-6 fixsensors.patch, NONE, 1.1 hardinfo.spec, 1.1, 1.2 disablesensors.patch, 1.1, NONE
- Next message (by thread): rpms/util-linux/F-7 util-linux-2.12a-mount-lockperm.patch, NONE, 1.1 util-linux.spec, 1.154, 1.155
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list