diff -Naur samhain.orig/Makefile samhain/Makefile --- samhain.orig/Makefile 2019-11-21 05:49:14.000000000 -0500 +++ samhain/Makefile 2020-07-21 09:06:30.869140000 -0400 @@ -1,8 +1,8 @@ # Created by: Nikola Kolev -# $FreeBSD: head/security/samhain/Makefile 518092 2019-11-21 10:49:14Z tobik $ +# $FreeBSD$ PORTNAME= samhain -PORTVERSION= 4.3.3 +PORTVERSION= 4.4.1 CATEGORIES= security MASTER_SITES= http://la-samhna.de/archive/ DISTNAME= samhain_signed-${PORTVERSION} @@ -17,7 +17,7 @@ BROKEN_mips64= fails to configure: error: Could not find the libwrap library OPTIONS_DEFINE= ASM DB_RELOAD DEBUG DNMALLOC DOCS ENCRYPT GNUPG IPV6 \ - KCHECK LIBWRAP LOGFILE_MONITOR LOGIN_WATCH MAIL \ + 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 @@ -29,7 +29,6 @@ DB_RELOAD_DESC= Enable database reload on SIGHUP DNMALLOC_DESC= Enable dnmalloc ENCRYPT_DESC= Enable client/server encryption -KCHECK_DESC= Enable rogue KLD detection LOGFILE_MONITOR_DESC= Enable monitor logfiles LOGIN_WATCH_DESC= Enable watch for login/logout MAIL_DESC= Enable internal SMTP mailer @@ -55,7 +54,8 @@ --with-alttimeserver=true USES= shebangfix -SHEBANG_FILES= scripts/samhainadmin.pl.in +SHEBANG_FILES= scripts/samhainadmin-gpg.pl.in \ + scripts/samhainadmin-sig.pl.in ASM_CONFIGURE_ENABLE= asm @@ -72,8 +72,6 @@ IPV6_CONFIGURE_ENABLE= ipv6 -KCHECK_CONFIGURE_WITH= kcheck - LIBWRAP_CONFIGURE_WITH= libwrap LOGFILE_MONITOR_CONFIGURE_ENABLE= logfile-monitor @@ -165,14 +163,6 @@ IGNORE= can't build client and server at once .endif -.if ${PORT_OPTIONS:MKCHECK} - @${ECHO_MSG} - @${ECHO_MSG} "Building with kernel checking requires reading /dev/kmem" - @${ECHO_MSG} "and /dev/mem. If you're not building as root, please hit" - @${ECHO_MSG} "Control-C and restart the build as root." - @${ECHO_MSG} -.endif - post-extract: @${TAR} -C ${WRKDIR} -xzf ${WRKSRC}.tar.gz @${RM} ${WRKSRC}.tar.gz ${WRKSRC}.tar.gz.asc diff -Naur samhain.orig/distinfo samhain/distinfo --- samhain.orig/distinfo 2019-10-07 11:25:35.000000000 -0400 +++ samhain/distinfo 2020-07-21 09:06:30.869307000 -0400 @@ -1,3 +1,3 @@ -TIMESTAMP = 1570039276 -SHA256 (samhain_signed-4.3.3.tar.gz) = 33ad4bc3dad4699694553bd9635a6b5827939f965d1f0f05fce0b4e9cdadf21b -SIZE (samhain_signed-4.3.3.tar.gz) = 2142337 +TIMESTAMP = 1583533568 +SHA256 (samhain_signed-4.4.1.tar.gz) = a15516f6809b1daf812b39fb5aa6be3fac1a51b5efca53568759fdf54572a2e9 +SIZE (samhain_signed-4.4.1.tar.gz) = 2159641 diff -Naur samhain.orig/files/patch-configure samhain/files/patch-configure --- samhain.orig/files/patch-configure 1969-12-31 19:00:00.000000000 -0500 +++ samhain/files/patch-configure 2020-07-21 09:58:52.028053000 -0400 @@ -0,0 +1,16 @@ +--- 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