Index: head/security/samhain/Makefile =================================================================== --- head/security/samhain/Makefile (revision 547555) +++ head/security/samhain/Makefile (revision 547556) @@ -1,201 +1,201 @@ # Created by: Nikola Kolev # $FreeBSD$ PORTNAME= samhain -PORTVERSION= 4.4.1 +PORTVERSION= 4.4.2 CATEGORIES= security MASTER_SITES= http://la-samhna.de/archive/ DISTNAME= samhain_signed-${PORTVERSION} MAINTAINER= freebsd@gregv.net COMMENT= Samhain Intrusion Detection System LICENSE= GPLv2 BROKEN_aarch64= fails to build: undefined reference to sbrk BROKEN_mips= fails to configure: error: Could not find the libwrap library BROKEN_mips64= fails to configure: error: Could not find the libwrap library +USES= shebangfix +SHEBANG_FILES= scripts/samhainadmin-gpg.pl.in \ + scripts/samhainadmin-sig.pl.in + OPTIONS_DEFINE= ASM DB_RELOAD DEBUG DNMALLOC DOCS ENCRYPT GNUPG IPV6 \ LIBWRAP LOGFILE_MONITOR LOGIN_WATCH MAIL \ MOUNTS_CHECK PORT_CHECK POSIX_ACL PRELUDE PROCESS_CHECK \ PTRACE SRP STATIC SUIDCHECK UDP USERFILES XML_LOGS OPTIONS_DEFAULT= ASM DNMALLOC ENCRYPT LIBWRAP MAIL SRP OPTIONS_RADIO= DB OPTIONS_RADIO_DB= MYSQL ODBC PGSQL OPTIONS_SUB= yes DB_DESC= Database support DB_RELOAD_DESC= Enable database reload on SIGHUP DNMALLOC_DESC= Enable dnmalloc ENCRYPT_DESC= Enable client/server encryption LOGFILE_MONITOR_DESC= Enable monitor logfiles LOGIN_WATCH_DESC= Enable watch for login/logout MAIL_DESC= Enable internal SMTP mailer MOUNTS_CHECK_DESC= Enable check mount options on filesystems PORT_CHECK_DESC= Enable check ports PROCESS_CHECK_DESC= Enable check processes POSIX_ACL_DESC= Enable check posix acls PRELUDE_DESC= Enable Prelude Framework support PTRACE_DESC= Enable use anti-debugger options SRP_DESC= Enable SRP for authentication SUIDCHECK_DESC= Enable check for suid/sgid files UDP_DESC= Enable UDP server USERFILES_DESC= Enable check for users config files XML_LOGS_DESC= Enable XML-formatted logs WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ --with-logserver=true \ --with-altlogserver=true \ --with-timeserver=true \ --with-alttimeserver=true - -USES= shebangfix -SHEBANG_FILES= scripts/samhainadmin-gpg.pl.in \ - scripts/samhainadmin-sig.pl.in ASM_CONFIGURE_ENABLE= asm DB_RELOAD_CONFIGURE_ENABLE= db-reload DEBUG_CONFIGURE_ENABLE= debug DNMALLOC_CONFIGURE_ENABLE= dnmalloc ENCRYPT_CONFIGURE_ENABLE= encrypt GNUPG_CONFIGURE_WITH= gpg=${PREFIX}/bin/gpg GNUPG_BUILD_DEPENDS= gpg:security/gnupg IPV6_CONFIGURE_ENABLE= ipv6 LIBWRAP_CONFIGURE_WITH= libwrap LOGFILE_MONITOR_CONFIGURE_ENABLE= logfile-monitor LOGIN_WATCH_CONFIGURE_ENABLE= login-watch MAIL_CONFIGURE_ENABLE= mail MOUNTS_CHECK_CONFIGURE_ENABLE= mounts-check MYSQL_IMPLIES= XML_LOGS MYSQL_USES= mysql MYSQL_CONFIGURE_ON= --with-database=mysql ODBC_IMPLIES= XML_LOGS ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC ODBC_CONFIGURE_ON= --with-database=odbc PGSQL_IMPLIES= XML_LOGS PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-database=postgresql PORT_CHECK_CONFIGURE_ENABLE= port-check PROCESS_CHECK_CONFIGURE_ENABLE= process-check POSIX_ACL_CONFIGURE_ENABLE= posix-acl PRELUDE_LIB_DEPENDS= libprelude.so:security/libprelude PRELUDE_CONFIGURE_WITH= prelude PTRACE_CONFIGURE_ENABLE= ptrace SRP_CONFIGURE_ENABLE= srp STATIC_CONFIGURE_ENABLE= static SUIDCHECK_CONFIGURE_ENABLE= suidcheck UDP_CONFIGURE_ENABLE= udp USERFILES_CONFIGURE_ENABLE= userfiles XML_LOGS_CONFIGURE_ENABLE= xml-log .include .if ${ARCH} == "amd64" CFLAGS+= -fPIC .endif .if defined(WITH_RUNAS_USER) CONFIGURE_ARGS+= --enable-identity=${WITH_RUNAS_USER} .else CONFIGURE_ARGS+= --enable-identity=yule .endif .if defined(WITH_CLIENT) CONFIGURE_ARGS+= --enable-network=client \ --with-data-file=REQ_FROM_SERVER/var/lib/samhain/data.samhain \ --with-config-file=REQ_FROM_SERVER PLIST_SUB+= SAMHAIN="" SETPWD="" YULE="@comment " EXTRA_PATCHES+= ${FILESDIR}/fixsamhainrc.patch .elif defined(WITH_SERVER) USERS= yule GROUPS= yule CONFIGURE_ARGS+= --enable-network=server SUB_LIST+= WITH_YULE="yes" PLIST_SUB+= YULE="" SAMHAIN="@comment " SETPWD="@comment " EXTRA_PATCHES+= ${FILESDIR}/fixyulerc.patch .else SUB_LIST+= WITH_YULE="" PLIST_SUB+= SAMHAIN="" YULE="@comment " SETPWD="@comment " EXTRA_PATCHES+= ${FILESDIR}/fixsamhainrc.patch .endif pre-everything:: .if !defined(WITH_CLIENT) && !defined(WITH_SERVER) @${ECHO_MSG} @${ECHO_MSG} "Building Samhain in standalone mode." @${ECHO_MSG} "If you wish to enable networked mode, please hit CTRL-C" @${ECHO_MSG} "now, and build samhain from the samhain-client and" @${ECHO_MSG} "samhain-server ports." @${ECHO_MSG} .endif .if defined(WITH_CLIENT) && defined(WITH_SERVER) IGNORE= can't build client and server at once .endif post-extract: @${TAR} -C ${WRKDIR} -xzf ${WRKSRC}.tar.gz @${RM} ${WRKSRC}.tar.gz ${WRKSRC}.tar.gz.asc post-install: .if !defined(WITH_SERVER) @${CP} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/samhain.sh @${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 @${CP} ${WRKSRC}/yulerc ${STAGEDIR}${PREFIX}/etc/yulerc.sample ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yulectl ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule_setpwd .endif .if defined(WITH_CLIENT) ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain_setpwd .endif post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/MANUAL-2_4.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/HOWTO-client+server.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/HOWTO-client+server-troubleshooting.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/HOWTO-samhain+GnuPG.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/HOWTO-write-modules.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/FAQ.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/README.UPGRADE ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/BUGS ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/sh_mounts.txt ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/sh_userfiles.txt ${STAGEDIR}${DOCSDIR} .include Index: head/security/samhain/distinfo =================================================================== --- head/security/samhain/distinfo (revision 547555) +++ head/security/samhain/distinfo (revision 547556) @@ -1,3 +1,3 @@ -TIMESTAMP = 1583533568 -SHA256 (samhain_signed-4.4.1.tar.gz) = a15516f6809b1daf812b39fb5aa6be3fac1a51b5efca53568759fdf54572a2e9 -SIZE (samhain_signed-4.4.1.tar.gz) = 2159641 +TIMESTAMP = 1599228563 +SHA256 (samhain_signed-4.4.2.tar.gz) = 2bb2750b32646be32517d0b2259402559c72b96979800f6c33774fcdea327fff +SIZE (samhain_signed-4.4.2.tar.gz) = 2160169 Index: head/security/samhain/files/patch-configure =================================================================== --- head/security/samhain/files/patch-configure (revision 547555) +++ head/security/samhain/files/patch-configure (nonexistent) @@ -1,16 +0,0 @@ ---- configure.orig 2020-07-21 09:51:28.253298000 -0400 -+++ configure 2020-07-21 09:54:19.024797000 -0400 -@@ -13998,6 +13998,13 @@ - then - cp -a scripts/samhainadmin-gpg.pl scripts/samhainadmin.pl - fi -+# Default action if building as network server but without GPG. -+# Note in that case the provided functionality won't actually work, -+# but this will keep the install-program target from barfing... -+if test "x${mygpg}" == x && test "x${mysignify}" == x -+then -+ cp -a scripts/samhainadmin-gpg.pl scripts/samhainadmin.pl -+fi - - - if test "x${cross_compiling}" = xyes Property changes on: head/security/samhain/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/samhain/pkg-plist =================================================================== --- head/security/samhain/pkg-plist (revision 547555) +++ head/security/samhain/pkg-plist (revision 547556) @@ -1,31 +1,32 @@ %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/FAQ.html %%PORTDOCS%%%%DOCSDIR%%/HOWTO-client+server-troubleshooting.html %%PORTDOCS%%%%DOCSDIR%%/HOWTO-client+server.html %%PORTDOCS%%%%DOCSDIR%%/HOWTO-samhain+GnuPG.html %%PORTDOCS%%%%DOCSDIR%%/HOWTO-write-modules.html %%PORTDOCS%%%%DOCSDIR%%/MANUAL-2_4.pdf %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.UPGRADE %%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%%man/man5/samhainrc.5.gz %%SAMHAIN%%man/man8/samhain.8.gz %%SAMHAIN%%sbin/samhain %%SETPWD%%sbin/samhain_setpwd %%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%%man/man5/yulerc.5.gz %%YULE%%man/man8/yule.8.gz %%YULE%%sbin/yule %%YULE%%sbin/yule_setpwd -%%YULE%%sbin/yuleadmin.pl +%%YULE%%sbin/yuleadmin-gpg.pl +%%YULE%%sbin/yuleadmin-sig.pl %%YULE%%sbin/yulectl