From 1c507f68d908fe8f3ab1219bf1a5e99ca964172b Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Thu, 20 Sep 2012 10:00:59 +0100 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Mageia. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r5960 | dmorgan | 2012-09-20 10:00:59 +0100 (Thu, 20 Sep 2012) | 1 line Import msec ------------------------------------------------------------------------ --- conf/level.audit_daily | 2 +- conf/level.audit_weekly | 2 +- conf/level.fileserver | 2 +- conf/level.netbook | 2 +- conf/level.secure | 2 +- conf/level.standard | 2 +- conf/level.webserver | 2 +- conf/perm.secure | 2 +- cron-sh/functions.sh | 0 po/uk.po | 2 +- src/msec/compile.py | 2 +- src/msec/config.py | 0 src/msec/msecgui.py | 4 ++-- src/msec/plugins/audit.py | 0 src/msec/plugins/log.py | 0 src/msec/plugins/msec.py | 0 src/msec/plugins/network.py | 0 src/msec/plugins/pam.py | 0 src/msec/plugins/sectool.py | 0 src/msec/plugins/sudo.py | 0 src/msec/tools.py | 2 +- src/msec/version.py | 0 22 files changed, 13 insertions(+), 13 deletions(-) mode change 100644 => 100755 cron-sh/functions.sh mode change 100644 => 100755 src/msec/config.py mode change 100644 => 100755 src/msec/plugins/audit.py mode change 100644 => 100755 src/msec/plugins/log.py mode change 100644 => 100755 src/msec/plugins/msec.py mode change 100644 => 100755 src/msec/plugins/network.py mode change 100644 => 100755 src/msec/plugins/pam.py mode change 100644 => 100755 src/msec/plugins/sectool.py mode change 100644 => 100755 src/msec/plugins/sudo.py mode change 100644 => 100755 src/msec/tools.py mode change 100644 => 100755 src/msec/version.py diff --git a/conf/level.audit_daily b/conf/level.audit_daily index 9d87b99..33dedbf 100644 --- a/conf/level.audit_daily +++ b/conf/level.audit_daily @@ -3,7 +3,7 @@ CHECK_WRITABLE=daily MAIL_EMPTY_CONTENT=no CHECK_PERMS=no CHECK_PERMS_ENFORCE=no -CHECK_SECTOOL=daily +CHECK_SECTOOL= CHECK_SECTOOL_LEVEL=3 CHECK_USER_FILES=daily CHECK_CHKROOTKIT=daily diff --git a/conf/level.audit_weekly b/conf/level.audit_weekly index fdc1d8c..c4e345f 100644 --- a/conf/level.audit_weekly +++ b/conf/level.audit_weekly @@ -3,7 +3,7 @@ CHECK_WRITABLE=weekly MAIL_EMPTY_CONTENT=no CHECK_PERMS=no CHECK_PERMS_ENFORCE=no -CHECK_SECTOOL=weekly +CHECK_SECTOOL= CHECK_SECTOOL_LEVEL=3 CHECK_USER_FILES=weekly CHECK_CHKROOTKIT=weekly diff --git a/conf/level.fileserver b/conf/level.fileserver index 73cd4f2..3dbe2bb 100644 --- a/conf/level.fileserver +++ b/conf/level.fileserver @@ -6,7 +6,7 @@ MAIL_EMPTY_CONTENT=no ACCEPT_BROADCASTED_ICMP_ECHO=yes CHECK_PERMS=daily CHECK_PERMS_ENFORCE=yes -CHECK_SECTOOL=weekly +CHECK_SECTOOL= CHECK_SECTOOL_LEVEL=3 CHECK_USER_FILES=daily ALLOW_XSERVER_TO_LISTEN=no diff --git a/conf/level.netbook b/conf/level.netbook index b34b7d8..ee1036d 100644 --- a/conf/level.netbook +++ b/conf/level.netbook @@ -6,7 +6,7 @@ MAIL_EMPTY_CONTENT=no ACCEPT_BROADCASTED_ICMP_ECHO=yes CHECK_PERMS=no CHECK_PERMS_ENFORCE=no -CHECK_SECTOOL=weekly +CHECK_SECTOOL= CHECK_SECTOOL_LEVEL=2 CHECK_USER_FILES=weekly ALLOW_XSERVER_TO_LISTEN=no diff --git a/conf/level.secure b/conf/level.secure index f007a52..ec2ed08 100644 --- a/conf/level.secure +++ b/conf/level.secure @@ -6,7 +6,7 @@ MAIL_EMPTY_CONTENT=yes ACCEPT_BROADCASTED_ICMP_ECHO=no CHECK_PERMS=daily CHECK_PERMS_ENFORCE=yes -CHECK_SECTOOL=daily +CHECK_SECTOOL= CHECK_SECTOOL_LEVEL=3 CHECK_USER_FILES=daily ALLOW_XSERVER_TO_LISTEN=no diff --git a/conf/level.standard b/conf/level.standard index 2f99dea..a9c4840 100644 --- a/conf/level.standard +++ b/conf/level.standard @@ -6,7 +6,7 @@ MAIL_EMPTY_CONTENT=no ACCEPT_BROADCASTED_ICMP_ECHO=yes CHECK_PERMS=no CHECK_PERMS_ENFORCE=no -CHECK_SECTOOL=weekly +CHECK_SECTOOL= CHECK_SECTOOL_LEVEL=3 CHECK_USER_FILES=daily ALLOW_XSERVER_TO_LISTEN=no diff --git a/conf/level.webserver b/conf/level.webserver index 290d541..a362ad6 100644 --- a/conf/level.webserver +++ b/conf/level.webserver @@ -6,7 +6,7 @@ MAIL_EMPTY_CONTENT=no ACCEPT_BROADCASTED_ICMP_ECHO=yes CHECK_PERMS=daily CHECK_PERMS_ENFORCE=yes -CHECK_SECTOOL=weekly +CHECK_SECTOOL= CHECK_SECTOOL_LEVEL=3 CHECK_USER_FILES=daily ALLOW_XSERVER_TO_LISTEN=no diff --git a/conf/perm.secure b/conf/perm.secure index d9eb7b7..df680d2 100644 --- a/conf/perm.secure +++ b/conf/perm.secure @@ -81,7 +81,7 @@ /usr/tmp root.adm 1773 /var/ root.root 755 /var/lib/rpm/Packages rpm.rpm 640 -/var/lib/svn svn.svn 770 +#/var/lib/svn svn.svn 770 /var/lock/subsys root.adm 750 /var/log/ root.adm 751 /var/log/* root.root 640 diff --git a/cron-sh/functions.sh b/cron-sh/functions.sh old mode 100644 new mode 100755 diff --git a/po/uk.po b/po/uk.po index 082e868..554d095 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,5 +1,5 @@ # translation of msec.po to ukrainian -# $Id$ +# $Id: uk.po 268627 2010-05-12 18:06:36Z btr0001 $ # Copyright (C) 2000,2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc. # # Dmytro Kovalov , 2000. diff --git a/src/msec/compile.py b/src/msec/compile.py index c42a0c2..f3bec02 100755 --- a/src/msec/compile.py +++ b/src/msec/compile.py @@ -4,7 +4,7 @@ # Package : rpmlint # Author : Frederic Lepied # Created on : Sat Oct 23 23:40:21 1999 -# Version : $Id$ +# Version : $Id: compile.py 250876 2009-01-06 21:31:46Z eugeni $ # Purpose : byte compile all python files given in arguments. ############################################################################# diff --git a/src/msec/config.py b/src/msec/config.py old mode 100644 new mode 100755 diff --git a/src/msec/msecgui.py b/src/msec/msecgui.py index 8693c08..63eec41 100755 --- a/src/msec/msecgui.py +++ b/src/msec/msecgui.py @@ -605,8 +605,8 @@ class MsecGui: row += 1 # updates - create_security_item(table, row, _("Updates"), "/usr/share/mcc/themes/default/mdkonline-mdk.png") - updates = tools.get_updates_status(log) + create_security_item(table, row, _("Updates"), "/usr/share/mcc/themes/default/MageiaUpdate.png") + updates = tools.get_updates_status(log) label = gtk.Label(updates) label.set_property("xalign", 0.0) label.set_property("yalign", 0.5) diff --git a/src/msec/plugins/audit.py b/src/msec/plugins/audit.py old mode 100644 new mode 100755 diff --git a/src/msec/plugins/log.py b/src/msec/plugins/log.py old mode 100644 new mode 100755 diff --git a/src/msec/plugins/msec.py b/src/msec/plugins/msec.py old mode 100644 new mode 100755 diff --git a/src/msec/plugins/network.py b/src/msec/plugins/network.py old mode 100644 new mode 100755 diff --git a/src/msec/plugins/pam.py b/src/msec/plugins/pam.py old mode 100644 new mode 100755 diff --git a/src/msec/plugins/sectool.py b/src/msec/plugins/sectool.py old mode 100644 new mode 100755 diff --git a/src/msec/plugins/sudo.py b/src/msec/plugins/sudo.py old mode 100644 new mode 100755 diff --git a/src/msec/tools.py b/src/msec/tools.py old mode 100644 new mode 100755 index b628d96..69b60ba --- a/src/msec/tools.py +++ b/src/msec/tools.py @@ -18,7 +18,7 @@ except IOError: # constants FIREWALL_CMD = "drakfirewall &" -UPDATE_CMD = "MandrivaUpdate &" +UPDATE_CMD = "MageiaUpdate &" def find_firewall_info(log): """Finds information about firewall""" diff --git a/src/msec/version.py b/src/msec/version.py old mode 100644 new mode 100755 -- cgit v1.2.1