- Update to version 1.8.0

PR:		58790
Submitted by:	maintainer

3 files changed, 30 insertions, 24 deletions

diff --git a/security/samhain/Makefile b/security/samhain/Makefile
index 46809f4c8aef..d6ef02dc71b2 100644
--- a/security/samhain/Makefile
+++ b/security/samhain/Makefile
@@ -25,6 +25,9 @@
 # WITH_POSTGRESQL:
 #	Enable support for logging to a Postgres database.  Untested.
 #
+# WITH_LIBWRAP:
+#	Enable support for TCP wrappers.
+#
 # SERVER:
 #	Builds as Yule, Samhain's central logging server.  Mutually exclusive
 #	with CLIENT.
@@ -35,7 +38,7 @@
 #
 
 PORTNAME=	samhain
-PORTVERSION=	1.7.12
+PORTVERSION=	1.8.0
 CATEGORIES=	security
 MASTER_SITES=	http://la-samhna.de/archive/ \
 		http://cold.darkambient.net/
@@ -48,8 +51,8 @@ COMMENT=	The Samhain Intrusion Detection System
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 .endif
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-login-watch --localstatedir=/var \
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-login-watch --localstatedir=/var \
 		--mandir=${PREFIX}/man --enable-suidcheck
 
 .if defined(RUNAS_USER)
@@ -69,25 +72,28 @@ CONFIGURE_ARGS+=	--with-database=mysql \
 .if defined(WITH_POSTGRES)
 CONFIGURE_ARGS+=	--with-database=postgresql --enable-xml-log
 .endif
+.if defined(WITH_LIBWRAP)
+CONFIGURE_ARGS+=	--with-libwrap
+.endif
 .if defined(CLIENT)
-CONFIGURE_ARGS+= --enable-network=client \
+CONFIGURE_ARGS+=	--enable-network=client \
 		--with-data-file=REQ_FROM_SERVER/var/lib/samhain/data.samhain \
 		--with-config-file=REQ_FROM_SERVER --with-logserver=${LOG_SERVER}
 PLIST_SUB+=	SAMHAIN="" SETPWD="" YULE="@comment "
-EXTRA_PATCHES+= ${FILESDIR}/fixsamhainrc.patch
-MAN5= samhainrc.5
-MAN8= samhain.8
+EXTRA_PATCHES+=	${FILESDIR}/fixsamhainrc.patch
+MAN5=	samhainrc.5
+MAN8=	samhain.8
 .elif defined(SERVER)
 CONFIGURE_ARGS+=	--enable-network=server
 PLIST_SUB+=	YULE="" SAMHAIN="@comment " SETPWD="@comment "
-EXTRA_PATCHES+= ${FILESDIR}/fixyulerc.patch
-MAN5= yulerc.5
-MAN8= yule.8
+EXTRA_PATCHES+=	${FILESDIR}/fixyulerc.patch
+MAN5=	yulerc.5
+MAN8=	yule.8
 .else
 PLIST_SUB+=	SAMHAIN="" YULE="@comment " SETPWD="@comment "
-EXTRA_PATCHES+= ${FILESDIR}/fixsamhainrc.patch
-MAN5= samhainrc.5
-MAN8= samhain.8
+EXTRA_PATCHES+=	${FILESDIR}/fixsamhainrc.patch
+MAN5=	samhainrc.5
+MAN8=	samhain.8
 .endif
 .if defined(ALT_LOG_SERVER)
 CONFIGURE_ARGS+=	--with-altlogserver=${ALT_LOG_SERVER}
@@ -137,11 +143,11 @@ post-install:
 	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${PREFIX}/etc/rc.d/yule.sh.sample
 .endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/samhain
-	${INSTALL_MAN} ${WRKSRC}/docs/MANUAL-1_7.ps ${PREFIX}/share/doc/samhain
-	${INSTALL_MAN} ${WRKSRC}/docs/MANUAL-1_7.html.tar ${PREFIX}/share/doc/samhain
-	${INSTALL_MAN} ${WRKSRC}/docs/HOWTO-client+server.html ${PREFIX}/share/doc/samhain
-	${INSTALL_MAN} ${WRKSRC}/docs/HOWTO-samhain+GnuPG.html ${PREFIX}/share/doc/samhain
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/MANUAL-1_8.ps ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/MANUAL-1_8.html.tar ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/HOWTO-client+server.html ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/HOWTO-samhain+GnuPG.html ${DOCSDIR}
 .endif
 
 install-user:
diff --git a/security/samhain/distinfo b/security/samhain/distinfo
index e5851afc5d84..ee33a40247a3 100644
--- a/security/samhain/distinfo
+++ b/security/samhain/distinfo
@@ -1 +1 @@
-MD5 (samhain_signed-1.7.12.tar.gz) = 04c94c3bf7f0b0cc946f2feddb6932df
+MD5 (samhain_signed-1.8.0.tar.gz) = 30b8993c497cca3947a55ed935121918
diff --git a/security/samhain/pkg-plist b/security/samhain/pkg-plist
index b3a5c51704dd..0547d976573d 100644
--- a/security/samhain/pkg-plist
+++ b/security/samhain/pkg-plist
@@ -9,8 +9,8 @@
 %%SAMHAIN%%etc/samhainrc.sample
 %%SAMHAIN%%@unexec rmdir /var/lib/samhain 2>/dev/null || true
 %%SETPWD%%sbin/samhain_setpwd
-%%PORTDOCS%%share/doc/samhain/MANUAL-1_7.ps
-%%PORTDOCS%%share/doc/samhain/MANUAL-1_7.html.tar
-%%PORTDOCS%%share/doc/samhain/HOWTO-client+server.html
-%%PORTDOCS%%share/doc/samhain/HOWTO-samhain+GnuPG.html
-%%PORTDOCS%%@dirrm share/doc/samhain
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL-1_8.ps
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL-1_8.html.tar
+%%PORTDOCS%%%%DOCSDIR%%/HOWTO-client+server.html
+%%PORTDOCS%%%%DOCSDIR%%/HOWTO-samhain+GnuPG.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%