aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile23
-rwxr-xr-xinit-sh/level0.sh5
-rw-r--r--msec.spec13
4 files changed, 20 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e47681..4d3cc30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
2000-03-07 Yoann Vandoorselaere <yoann@mandrakesoft.com>
+ * use /etc/security/msec for config file only.
+ * Renamed init.sh to msec, and install it in /usr/sbin.
+ * The other shell scripts are located in /usr/share/msec
+
+2000-03-07 Yoann Vandoorselaere <yoann@mandrakesoft.com>
* Included patch from Stefan Siegel which fix these item :
* Files that should not be owned by someone else or readable:
-> added ".gnupg/secring.gpg" as Mandrake uses GNUPG as default
diff --git a/Makefile b/Makefile
index 3085b4f..634c2d6 100644
--- a/Makefile
+++ b/Makefile
@@ -11,29 +11,6 @@ clean:
promisc_check:
(cd src/promisc_check; make)
-rpm_install: all
- rm -rf $(RPM_BUILD_ROOT)
- mkdir -p $(RPM_BUILD_ROOT)/etc/security/msec/{init-sh,cron-sh}/
- mkdir -p $(RPM_BUILD_ROOT)/usr/bin
- mkdir -p $(RPM_BUILD_ROOT)/usr/man/man8/
- cp init-sh/level*.sh $(RPM_BUILD_ROOT)/etc/security/msec/init-sh
- cp init-sh/lib.sh $(RPM_BUILD_ROOT)/etc/security/msec/init-sh
- cp init-sh/init.sh $(RPM_BUILD_ROOT)/etc/security/msec
- cp init-sh/file_perm.sh $(RPM_BUILD_ROOT)/etc/security/msec/init-sh
- cp init-sh/perm.[0-5] $(RPM_BUILD_ROOT)/etc/security/msec/init-sh
- cp init-sh/server.* $(RPM_BUILD_ROOT)/etc/security/msec/init-sh
- cp init-sh/grpuser.sh $(RPM_BUILD_ROOT)/etc/security/msec/init-sh
- cp init-sh/custom.sh $(RPM_BUILD_ROOT)/etc/security/msec/init-sh
- cp cron-sh/*.sh $(RPM_BUILD_ROOT)/etc/security/msec/cron-sh
- mkdir -p $(RPM_BUILD_ROOT)/var/log/security
- touch $(RPM_BUILD_ROOT)/etc/security/msec/security.conf
- touch $(RPM_BUILD_ROOT)/var/log/security.log
- install -s src/promisc_check/promisc_check $(RPM_BUILD_ROOT)/usr/bin
- install -d $(RPM_BUILD_ROOT)/usr/man/man8/
- install -m644 doc/*8 $(RPM_BUILD_ROOT)/usr/man/man8/
- bzip2 -9f $(RPM_BUILD_ROOT)/usr/man/man8/*8
- @echo "Install complete"
-
dis: clean
rm -rf msec-$(VERSION) ../msec-$(VERSION).tar*
mkdir -p msec-$(VERSION)
diff --git a/init-sh/level0.sh b/init-sh/level0.sh
index b979b61..00dc54c 100755
--- a/init-sh/level0.sh
+++ b/init-sh/level0.sh
@@ -6,9 +6,10 @@
#
-if [[ -f /etc/security/msec/init-sh/lib.sh ]]; then
- . /etc/security/msec/init-sh/lib.sh
+if [[ -f /usr/share/msec/lib.sh ]]; then
+ . /usr/share/msec/lib.sh
else
+ echo "Can't find /usr/share/msec/lib.sh, exiting."
exit 1
fi
diff --git a/msec.spec b/msec.spec
index 1a322d5..c93f455 100644
--- a/msec.spec
+++ b/msec.spec
@@ -38,13 +38,24 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%doc AUTHORS COPYING Makefile README
%doc doc/*txt ChangeLog doc/*ps
-/etc/security/msec
/usr/bin/promisc_check
+/usr/sbin/msec
+/usr/share/msec
/var/log/security.log
/var/log/security
/usr/man/*/*
+%config
+/etc/security/msec/
+
%changelog
+* Tue Mar 07 Yoann Vandoorselaere <yoann@mandrakesoft.com>
+- use %config for config file ( thanks to Frederic Lepied ).
+- use /etc/security/msec for config file only.
+- Renamed init.sh to msec, and install it in /usr/sbin.
+- The other shell scripts are located in /usr/share/msec
+- Included patch from Stefan Siegel.
+
* Tue Jan 18 2000 Yoann Vandoorselaere <yoann@mandrakesoft.com>
- custom.sh : fix a nasty typo.