aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xcron-sh/security_check.sh7
-rw-r--r--msec.spec9
-rw-r--r--share/Config.py4
-rw-r--r--share/ConfigFile.py2
-rw-r--r--share/Log.py6
-rw-r--r--share/Makefile2
-rwxr-xr-xshare/Perms.py2
-rw-r--r--share/README2
-rwxr-xr-xshare/draksec_help.py2
-rwxr-xr-xshare/man.py4
-rwxr-xr-xshare/msec2
-rwxr-xr-xshare/shadow.py2
13 files changed, 26 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index 632342e..d80940b 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ buildsrpm:
rpm -ts $(PACKAGE)-$(VERSION).tar.bz2
buildrpm:
- rpm -ta --clean --rmsource --rmspec $(PACKAGE)-$(VERSION).tar.bz2
+ rpm -ta --clean $(PACKAGE)-$(VERSION).tar.bz2
# rules to build a distributable rpm
diff --git a/cron-sh/security_check.sh b/cron-sh/security_check.sh
index ec6bbeb..2960e23 100755
--- a/cron-sh/security_check.sh
+++ b/cron-sh/security_check.sh
@@ -67,12 +67,13 @@ while read username uid homedir; do
if ! expr "$homedir" : "$FILTER" > /dev/null; then
for f in ${list} ; do
file="${homedir}/${f}"
- if [[ -f ${file} ]] ; then
- printf "${uid} ${username} ${file} `ls -LldcGn ${file}`\n"
+ if [[ -f "${file}" ]] ; then
+ res=`ls -LldcGn "${file}"`
+ printf "${uid}:${username}:${file}:${res}\n"
fi
done
fi
-done | awk '$1 != $6 && $6 != "0" \
+done | awk -F: '$1 != $6 && $6 != "0" \
{ print "\t\t- " $3 " : file is owned by uid " $6 "." }
$4 ~ /^-...r/ \
{ print "\t\t- " $3 " : file is group readable." }
diff --git a/msec.spec b/msec.spec
index 261f574..42406b1 100644
--- a/msec.spec
+++ b/msec.spec
@@ -1,6 +1,6 @@
Summary: Security Level management for the Mandriva Linux distribution
Name: msec
-Version: 0.46
+Version: 0.47
Release: 1mdk
Url: http://www.mandrivalinux.com/
Source0: %{name}-%{version}.tar.bz2
@@ -75,6 +75,8 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
touch $RPM_BUILD_ROOT/var/log/security.log
+%find_lang %name
+
%pre
%_pre_groupadd xgrp
%_pre_groupadd ntools
@@ -130,7 +132,7 @@ fi
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING share/README share/CHANGES
%doc ChangeLog doc/*.txt
@@ -155,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
# MAKE THE CHANGES IN CVS: NO PATCH OR SOURCE ALLOWED
%changelog
+* Mon Aug 8 2005 Frederic Lepied <flepied@mandriva.com> 0.47-1mdk
+- fix single user mode in enable_sulogin.
+
* Fri Jun 17 2005 Frederic Lepied <flepied@mandriva.com> 0.46-1mdk
- Mandriva
- new function enable_pam_root_from_wheel to allow transparent root
diff --git a/share/Config.py b/share/Config.py
index 37a176f..14699b4 100644
--- a/share/Config.py
+++ b/share/Config.py
@@ -1,6 +1,6 @@
#---------------------------------------------------------------
-# Project : Linux-Mandrake
-# Module : msec2
+# Project : Mandriva Linux
+# Module : msec
# File : Config.py
# Version : $Id$
# Author : Frederic Lepied
diff --git a/share/ConfigFile.py b/share/ConfigFile.py
index 349e52f..4a044f8 100644
--- a/share/ConfigFile.py
+++ b/share/ConfigFile.py
@@ -1,5 +1,5 @@
#---------------------------------------------------------------
-# Project : Mandrakelinux
+# Project : Mandriva Linux
# Module : msec
# File : ConfigFile.py
# Version : $Id$
diff --git a/share/Log.py b/share/Log.py
index 11e021f..061a5fb 100644
--- a/share/Log.py
+++ b/share/Log.py
@@ -1,12 +1,12 @@
#---------------------------------------------------------------
-# Project : Mandrakelinux
-# Module : msec2
+# Project : Mandriva Llinux
+# Module : msec
# File : Log.py
# Version : $Id$
# Author : Frederic Lepied
# Created On : Wed Dec 5 23:50:29 2001
# Purpose : write log through syslog conforming to
-# the Mandrakelinux guideline for the explanations
+# the Mandriva Linux guideline for the explanations
# in tools. Errors are reported to stderr.
#---------------------------------------------------------------
diff --git a/share/Makefile b/share/Makefile
index 51a6b3a..a7a208d 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,5 +1,5 @@
#---------------------------------------------------------------
-# Project : Mandrakelinux
+# Project : Mandriva Linux
# Module : share
# File : Makefile
# Version : $Id$
diff --git a/share/Perms.py b/share/Perms.py
index a89e821..59dab97 100755
--- a/share/Perms.py
+++ b/share/Perms.py
@@ -1,6 +1,6 @@
#!/usr/bin/python -O
#---------------------------------------------------------------
-# Project : Mandrakelinux
+# Project : Mandriva Linux
# Module : msec
# File : Perms.py
# Version : $Id$
diff --git a/share/README b/share/README
index 02ee036..4bb3846 100644
--- a/share/README
+++ b/share/README
@@ -4,7 +4,7 @@ Shell scripts in /usr/share/msec.
******************
Suggestions & comments:
-flepied@mandrakesoft.com
+flepied@mandriva.com
******************
Doc of the rewritting in python:
diff --git a/share/draksec_help.py b/share/draksec_help.py
index cfd86d1..b57ab86 100755
--- a/share/draksec_help.py
+++ b/share/draksec_help.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#---------------------------------------------------------------
-# Project : Mandrakelinux
+# Project : Mandriva Linux
# Module : share
# File : draksec_help.py
# Version : $Id$
diff --git a/share/man.py b/share/man.py
index 358ff86..c57f7a4 100755
--- a/share/man.py
+++ b/share/man.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#---------------------------------------------------------------
-# Project : Mandrakelinux
+# Project : Mandriva Linux
# Module : share
# File : man.py
# Version : $Id$
@@ -15,7 +15,7 @@ import imp
import inspect
header = '''.ds q \N'34'
-.TH mseclib 3 V0 msec "Mandrakelinux"
+.TH mseclib 3 V0 msec "Mandriva Linux"
.SH NAME
mseclib
.SH SYNOPSIS
diff --git a/share/msec b/share/msec
index 7e2c632..f19cd9b 100755
--- a/share/msec
+++ b/share/msec
@@ -1,6 +1,6 @@
#!/bin/sh
#---------------------------------------------------------------
-# Project : Mandrakelinux
+# Project : Mandriva Linux
# Module : share
# File : msec
# Version : $Id$
diff --git a/share/shadow.py b/share/shadow.py
index 03ca6d9..8fbc8c6 100755
--- a/share/shadow.py
+++ b/share/shadow.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#---------------------------------------------------------------
-# Project : Mandrakelinux
+# Project : Mandriva Linux
# Module : msec/share
# File : shadow.py
# Version : $Id$