Date: Fri, 11 Jul 2014 10:46:41 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361521 - head/security/osiris Message-ID: <201407111046.s6BAkfa4099728@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Fri Jul 11 10:46:40 2014 New Revision: 361521 URL: http://svnweb.freebsd.org/changeset/ports/361521 QAT: https://qat.redports.org/buildarchive/r361521/ Log: - Add staging support, allow it as regular user - Use options subs - Update options descriptions to current standards Modified: head/security/osiris/Makefile head/security/osiris/pkg-plist Modified: head/security/osiris/Makefile ============================================================================== --- head/security/osiris/Makefile Fri Jul 11 10:26:02 2014 (r361520) +++ head/security/osiris/Makefile Fri Jul 11 10:46:40 2014 (r361521) @@ -7,90 +7,65 @@ CATEGORIES= security MASTER_SITES= http://osiris.shmoo.com/data/ \ http://redundancy.redundancy.org/mirror/ -MAINTAINER= ports@FreeBSD.org -COMMENT= The Shmoo client/server host integrity checker +MAINTAINER= ports@FreeBSD.org +COMMENT= Shmoo client/server host integrity checker + +GNU_CONFIGURE= yes +USE_RC_SUBR= yes OPTIONS_DEFINE= OSIRISMD OSIRISD PRINTDB CLI OPTIONS_DEFAULT= OSIRISD -OSIRISMD_DESC= Enable to build the management daemon -OSIRISD_DESC= Enable to build the osirisd scan agent -PRINTDB_DESC= Build database print tool -CLI_DESC= Enable to build the management CLI +OPTIONS_SUB= yes -GNU_CONFIGURE= yes -USE_RC_SUBR= yes +OSIRISMD_DESC= Management daemon +OSIRISD_DESC= Scan agent +PRINTDB_DESC= Database print tool +CLI_DESC= Management CLI -NO_STAGE= yes .include <bsd.port.pre.mk> .if exists(${LOCALBASE}/lib/libreadline.so.6) LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline .endif -.if ${PORT_OPTIONS:MOSIRISMD} -PLIST_SUB+= OSIRISMD="" -.else -PLIST_SUB+= OSIRISMD="@comment " -.endif -.if ! ${PORT_OPTIONS:MOSIRISD} -PLIST_SUB+= OSIRISD="@comment " -.else -PLIST_SUB+= OSIRISD="" -.endif -.if ${PORT_OPTIONS:MCLI} -PLIST_SUB+= CLI="" -.else -PLIST_SUB+= CLI="@comment " -.endif -.if ${PORT_OPTIONS:MPRINTDB} -PLIST_SUB+= PRINTDB="" -.else -PLIST_SUB+= PRINTDB="@comment " -.endif - post-build: .if ${PORT_OPTIONS:MPRINTDB} cd ${WRKSRC}/src/tools && ${MAKE} .endif do-install: - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - @${MKDIR} ${PREFIX}/osiris + @${MKDIR} ${STAGEDIR}${PREFIX}/osiris .if ${PORT_OPTIONS:MCLI} - ${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${STAGEDIR}${PREFIX}/sbin .endif .if ${PORT_OPTIONS:MPRINTDB} - ${INSTALL_PROGRAM} ${WRKSRC}/src/tools/printdb ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/tools/printdb ${STAGEDIR}${PREFIX}/bin .endif .if ${PORT_OPTIONS:MOSIRISD} ${SED} -e 's|@INSTALLDIR@|${PREFIX}/sbin|g' \ -e 's|@OSIRISDIR@|${PREFIX}/osiris|g' \ ${WRKSRC}/src/install/freebsd/osirisd.in > \ ${WRKSRC}/src/install/freebsd/osirisd.sh - ${INSTALL_PROGRAM} ${WRKSRC}/src/osirisd/osirisd ${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/src/osirisd/osirisd ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh \ - ${PREFIX}/etc/rc.d + ${STAGEDIR}${PREFIX}/etc/rc.d .endif .if ${PORT_OPTIONS:MOSIRISMD} ${SED} -e 's|@INSTALLDIR@|${PREFIX}/sbin|g' \ -e 's|@OSIRISDIR@|${PREFIX}/osiris|g' \ ${WRKSRC}/src/install/freebsd/osirismd.in > \ ${WRKSRC}/src/install/freebsd/osirismd.sh - @${MKDIR} ${PREFIX}/osiris/configs + @${MKDIR} ${STAGEDIR}${PREFIX}/osiris/configs .for os in aix bsdos darwin freebsd irix linux netbsd openbsd sunos \ unix-generic windows2000 windowsnt windowsserver2003 windowsxp \ wrt54g ${INSTALL_DATA} ${WRKSRC}/src/configs/default.${os} \ - ${PREFIX}/osiris/configs + ${STAGEDIR}${PREFIX}/osiris/configs .endfor - ${INSTALL_PROGRAM} -m 4755 -o osiris -g osiris \ - ${WRKSRC}/src/osirismd/osirismd ${PREFIX}/sbin + ${INSTALL_PROGRAM} -m 4755 ${WRKSRC}/src/osirismd/osirismd \ + ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirismd.sh \ - ${PREFIX}/etc/rc.d + ${STAGEDIR}${PREFIX}/etc/rc.d .endif - ${CHOWN} -R osiris:osiris ${PREFIX}/osiris - -post-install: - @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> Modified: head/security/osiris/pkg-plist ============================================================================== --- head/security/osiris/pkg-plist Fri Jul 11 10:26:02 2014 (r361520) +++ head/security/osiris/pkg-plist Fri Jul 11 10:46:40 2014 (r361521) @@ -1,11 +1,17 @@ %%CLI%%sbin/osiris %%PRINTDB%%bin/printdb %%OSIRISD%%sbin/osirisd +%%OSIRISMD%%@owner osiris +%%OSIRISMD%%@group osiris %%OSIRISMD%%sbin/osirismd +%%OSIRISMD%%@owner +%%OSIRISMD%%@group %%OSIRISD%%etc/rc.d/osirisd.sh %%OSIRISMD%%etc/rc.d/osirismd.sh @exec mkdir -p %D/osiris @exec chown osiris:osiris %D/osiris +%%OSIRISMD%%@owner osiris +%%OSIRISMD%%@group osiris %%OSIRISMD%%osiris/configs/default.aix %%OSIRISMD%%osiris/configs/default.bsdos %%OSIRISMD%%osiris/configs/default.darwin @@ -21,5 +27,7 @@ %%OSIRISMD%%osiris/configs/default.windowsserver2003 %%OSIRISMD%%osiris/configs/default.windowsxp %%OSIRISMD%%osiris/configs/default.wrt54g +%%OSIRISMD%%@owner +%%OSIRISMD%%@group %%OSIRISMD%%@dirrm osiris/configs @dirrm osiris
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407111046.s6BAkfa4099728>