From a3297657f0f9e2df142b02dab2cef1b75e7524b8 Mon Sep 17 00:00:00 2001 From: Frederic Lepied Date: Fri, 15 Feb 2002 05:22:40 +0000 Subject: 0.18-6mdk --- msec.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/msec.spec b/msec.spec index d2e64b1..5403383 100644 --- a/msec.spec +++ b/msec.spec @@ -1,7 +1,7 @@ Summary: Security Level & Program for the Mandrake Linux distribution Name: msec Version: 0.18 -Release: 5mdk +Release: 6mdk Url: http://www.linux-mandrake.com/ Source0: %{name}-%{version}.tar.bz2 Source1: msec.logrotate @@ -11,6 +11,7 @@ Source3: msec.csh License: GPL Group: System/Base BuildRoot: %_tmppath/%name-%version-%release-root +BuildRequires: python Requires: /bin/bash /bin/touch perl-base diffutils textutils /usr/bin/python /usr/bin/chage gawk Requires: setup >= 2.2.0-21mdk Requires: chkconfig >= 1.2.24-3mdk @@ -72,14 +73,14 @@ touch $RPM_BUILD_ROOT/var/log/security.log touch /var/log/security.log if [ $1 != 1 -a -f /etc/security/msec/security.conf ]; then + SL=$SECURE_LEVEL + [ ! -r /etc/sysconfig/msec ] || SL=`sed -n 's/SECURE_LEVEL=//p' < /etc/sysconfig/msec` || : if grep -q "# Mandrake-Security : if you remove this comment" /etc/security/msec/security.conf; then - SL= - [ ! -r /etc/sysconfig/msec ] || SL=`sed -n 's/SECURE_LEVEL=//p' < /etc/sysconfig/msec` || : [ -z "$SL" -a -r /etc/profile.d/msec.sh ] && SL=`sed -n 's/.*SECURE_LEVEL=//p' < /etc/profile.d/msec.sh` || : /usr/share/msec/cleanold.sh || : [ -n "$SL" ] && msec $SL < /dev/null || : else - msec < /dev/null || : + [ -n "$SL" ] && msec < /dev/null || : fi # remove the old way of doing the daily cron rm -f /etc/cron.d/msec @@ -118,6 +119,11 @@ rm -rf $RPM_BUILD_ROOT # MAKE THE CHANGES IN CVS: NO PATCH OR SOURCE ALLOWED %changelog +* Fri Feb 15 2002 Frederic Lepied 0.18-6mdk +- promisc_check.sh: use complete path to the ip command +- correct upgrade when secure level isn't set +- enable_console_log support an arg to specify what to log + * Wed Feb 13 2002 Frederic Lepied 0.18-5mdk - perm.5: /etc/sendmail.cf 640 for sendmail to work. - set umask and . in path according to the secure level -- cgit v1.2.1