security/samhain: housekeeping

- The port comes in three flavors, standalone, -server, and -client.
  All three use one or more files under /var/lib.  Remove the logic
  that only includes that dir in plist for some of those flavors,
  and include it for all.
- Get rid of .sh extensions on rc scripts.
- Use INSTALL_SCRIPT instead of CP to ensure the rc scripts have
  useful permissions.
- Patch the rc script source so they properly respect settings in rc.conf.
- Use @postunexec in plist instead of the deprecated @unexec.

PR:		249433
Submitted by:	Greg Veldman <freebsd@gregv.net> (maintainer)
This commit is contained in:
Kurt Jaeger 2020-09-26 09:02:13 +00:00
parent 5f11b9367b
commit 104e766eb8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=550138
3 changed files with 18 additions and 6 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= samhain PORTNAME= samhain
PORTVERSION= 4.4.2 PORTVERSION= 4.4.2
PORTREVISION= 1
CATEGORIES= security CATEGORIES= security
MASTER_SITES= http://la-samhna.de/archive/ MASTER_SITES= http://la-samhna.de/archive/
DISTNAME= samhain_signed-${PORTVERSION} DISTNAME= samhain_signed-${PORTVERSION}
@ -169,12 +170,12 @@ post-extract:
post-install: post-install:
.if !defined(WITH_SERVER) .if !defined(WITH_SERVER)
@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/samhain.sh ${INSTALL_SCRIPT} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/samhain
@${CP} ${WRKSRC}/samhainrc ${STAGEDIR}${PREFIX}/etc/samhainrc.sample @${CP} ${WRKSRC}/samhainrc ${STAGEDIR}${PREFIX}/etc/samhainrc.sample
@${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc/samhainrc.sample @${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc/samhainrc.sample
${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain
.else .else
@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/yule.sh ${INSTALL_SCRIPT} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/yule
@${CP} ${WRKSRC}/yulerc ${STAGEDIR}${PREFIX}/etc/yulerc.sample @${CP} ${WRKSRC}/yulerc ${STAGEDIR}${PREFIX}/etc/yulerc.sample
${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule
${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yulectl ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yulectl

View file

@ -0,0 +1,11 @@
--- init/samhain.startFreeBSD.in.orig 2015-11-01 00:03:11 UTC
+++ init/samhain.startFreeBSD.in
@@ -37,7 +37,7 @@
load_rc_config "$name"
if ! is_set ${rcvar}; then
- eval "${rcvar}=YES"
+ eval "${rcvar}=NO"
fi
run_rc_command "$1"

View file

@ -1,3 +1,4 @@
@dir /var/lib
%%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/FAQ.html %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
%%PORTDOCS%%%%DOCSDIR%%/HOWTO-client+server-troubleshooting.html %%PORTDOCS%%%%DOCSDIR%%/HOWTO-client+server-troubleshooting.html
@ -10,10 +11,9 @@
%%PORTDOCS%%%%DOCSDIR%%/sh_mounts.txt %%PORTDOCS%%%%DOCSDIR%%/sh_mounts.txt
%%PORTDOCS%%%%DOCSDIR%%/sh_userfiles.txt %%PORTDOCS%%%%DOCSDIR%%/sh_userfiles.txt
%%PORTDOCS%%@dir %%DOCSDIR%% %%PORTDOCS%%@dir %%DOCSDIR%%
%%SAMHAIN%%@dir /var/lib
%%SAMHAIN%%@dir /var/lib/samhain %%SAMHAIN%%@dir /var/lib/samhain
%%SAMHAIN%%@sample etc/samhainrc.sample %%SAMHAIN%%@sample etc/samhainrc.sample
%%SAMHAIN%%etc/rc.d/samhain.sh %%SAMHAIN%%etc/rc.d/samhain
%%SAMHAIN%%man/man5/samhainrc.5.gz %%SAMHAIN%%man/man5/samhainrc.5.gz
%%SAMHAIN%%man/man8/samhain.8.gz %%SAMHAIN%%man/man8/samhain.8.gz
%%SAMHAIN%%sbin/samhain %%SAMHAIN%%sbin/samhain
@ -22,8 +22,8 @@
%%YULE%%@dir /var/lib/yule %%YULE%%@dir /var/lib/yule
%%YULE%%@dir /var/log/yule %%YULE%%@dir /var/log/yule
%%YULE%%@sample etc/yulerc.sample %%YULE%%@sample etc/yulerc.sample
%%YULE%%@unexec echo "To delete the yule user permanently, use 'pw userdel yule'" %%YULE%%@postunexec echo "To delete the yule user permanently, use 'pw userdel yule'"
%%YULE%%etc/rc.d/yule.sh %%YULE%%etc/rc.d/yule
%%YULE%%man/man5/yulerc.5.gz %%YULE%%man/man5/yulerc.5.gz
%%YULE%%man/man8/yule.8.gz %%YULE%%man/man8/yule.8.gz
%%YULE%%sbin/yule %%YULE%%sbin/yule