From owner-svn-ports-head@freebsd.org Sat Sep 26 09:02:14 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D34883F8D8D; Sat, 26 Sep 2020 09:02:14 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bz2pt5HZhz4LFl; Sat, 26 Sep 2020 09:02:14 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 993F021C0A; Sat, 26 Sep 2020 09:02:14 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08Q92Ec9054611; Sat, 26 Sep 2020 09:02:14 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08Q92EtO054609; Sat, 26 Sep 2020 09:02:14 GMT (envelope-from pi@FreeBSD.org) Message-Id: <202009260902.08Q92EtO054609@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 26 Sep 2020 09:02:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550138 - in head/security/samhain: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/security/samhain: . files X-SVN-Commit-Revision: 550138 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Sep 2020 09:02:14 -0000 Author: pi Date: Sat Sep 26 09:02:13 2020 New Revision: 550138 URL: https://svnweb.freebsd.org/changeset/ports/550138 Log: 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 (maintainer) Added: head/security/samhain/files/patch-init_samhain.startFreeBSD.in (contents, props changed) Modified: head/security/samhain/Makefile head/security/samhain/pkg-plist Modified: head/security/samhain/Makefile ============================================================================== --- head/security/samhain/Makefile Sat Sep 26 08:36:54 2020 (r550137) +++ head/security/samhain/Makefile Sat Sep 26 09:02:13 2020 (r550138) @@ -3,6 +3,7 @@ PORTNAME= samhain PORTVERSION= 4.4.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://la-samhna.de/archive/ DISTNAME= samhain_signed-${PORTVERSION} @@ -169,12 +170,12 @@ post-extract: post-install: .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 @${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc/samhainrc.sample ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain .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 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yulectl Added: head/security/samhain/files/patch-init_samhain.startFreeBSD.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/samhain/files/patch-init_samhain.startFreeBSD.in Sat Sep 26 09:02:13 2020 (r550138) @@ -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" Modified: head/security/samhain/pkg-plist ============================================================================== --- head/security/samhain/pkg-plist Sat Sep 26 08:36:54 2020 (r550137) +++ head/security/samhain/pkg-plist Sat Sep 26 09:02:13 2020 (r550138) @@ -1,3 +1,4 @@ +@dir /var/lib %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/FAQ.html %%PORTDOCS%%%%DOCSDIR%%/HOWTO-client+server-troubleshooting.html @@ -10,10 +11,9 @@ %%PORTDOCS%%%%DOCSDIR%%/sh_mounts.txt %%PORTDOCS%%%%DOCSDIR%%/sh_userfiles.txt %%PORTDOCS%%@dir %%DOCSDIR%% -%%SAMHAIN%%@dir /var/lib %%SAMHAIN%%@dir /var/lib/samhain %%SAMHAIN%%@sample etc/samhainrc.sample -%%SAMHAIN%%etc/rc.d/samhain.sh +%%SAMHAIN%%etc/rc.d/samhain %%SAMHAIN%%man/man5/samhainrc.5.gz %%SAMHAIN%%man/man8/samhain.8.gz %%SAMHAIN%%sbin/samhain @@ -22,8 +22,8 @@ %%YULE%%@dir /var/lib/yule %%YULE%%@dir /var/log/yule %%YULE%%@sample etc/yulerc.sample -%%YULE%%@unexec echo "To delete the yule user permanently, use 'pw userdel yule'" -%%YULE%%etc/rc.d/yule.sh +%%YULE%%@postunexec echo "To delete the yule user permanently, use 'pw userdel yule'" +%%YULE%%etc/rc.d/yule %%YULE%%man/man5/yulerc.5.gz %%YULE%%man/man8/yule.8.gz %%YULE%%sbin/yule