ports/65226: Update: security/samhain 1.8.4 -> 1.8.5

[David Thiel]

>Number:         65226
>Category:       ports
>Synopsis:       Update: security/samhain 1.8.4 -> 1.8.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 05 14:10:15 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     David Thiel
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD redundancy.redundancy.org 4.9-STABLE FreeBSD 4.9-STABLE #15: Wed Nov 19 21:41:32 PST 2003 lx at redundancy.redundancy.org:/usr/obj/usr/src/sys/REDUNDANCY i386


>Description:

Updating samhain to 1.8.5, Includes bugfixes for BSD login watching
and suid file quarantine. Also, remove the requirement of defining
LOG_SERVER when building as a client, since this can now be configured
locally after compile - though if you download your configs from the log
server, you'll of course still want to define it during build.

>How-To-Repeat:
>Fix:

diff -ruN samhain.old/Makefile samhain/Makefile
--- samhain.old/Makefile	Mon Apr  5 13:46:04 2004
+++ samhain/Makefile	Mon Apr  5 13:49:58 2004
@@ -38,7 +38,7 @@
 #
 
 PORTNAME=	samhain
-PORTVERSION=	1.8.4
+PORTVERSION=	1.8.5
 CATEGORIES=	security
 MASTER_SITES=	http://la-samhna.de/archive/ \
 		http://cold.darkambient.net/
@@ -69,7 +69,7 @@
 			--with-cflags=-I${LOCALBASE}/include/mysql \
 			--with-libs=-L${LOCALBASE}/lib/mysql --enable-xml-log
 .endif
-.if defined(WITH_POSTGRES)
+.if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-database=postgresql --enable-xml-log
 .endif
 .if defined(WITH_LIBWRAP)
@@ -78,7 +78,7 @@
 .if defined(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}
+		--with-config-file=REQ_FROM_SERVER
 PLIST_SUB+=	SAMHAIN="" SETPWD="" YULE="@comment "
 EXTRA_PATCHES+=	${FILESDIR}/fixsamhainrc.patch
 MAN5=	samhainrc.5
@@ -95,6 +95,9 @@
 MAN5=	samhainrc.5
 MAN8=	samhain.8
 .endif
+.if defined(LOG_SERVER)
+CONFIGURE_ARGS+=	--with-logserver=${ALT_LOG_SERVER}
+.endif
 .if defined(ALT_LOG_SERVER)
 CONFIGURE_ARGS+=	--with-altlogserver=${ALT_LOG_SERVER}
 .endif
@@ -114,14 +117,6 @@
 	@${ECHO_MSG} "Can't build client and server at once!"
 	@${ECHO_MSG}
 .error "Can't build client and server at once!"
-.endif
-
-.if defined(CLIENT) && !defined(LOG_SERVER)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Please define LOG_SERVER (and ALT_LOG_SERVER, if "
-	@${ECHO_MSG} "applicable), the machine(s) this client will log to."
-	@${ECHO_MSG}
-.error "Please define LOG_SERVER."
 .endif
 
 .if defined(WITH_KCHECK)
diff -ruN samhain.old/distinfo samhain/distinfo
--- samhain.old/distinfo	Mon Apr  5 13:46:04 2004
+++ samhain/distinfo	Mon Apr  5 13:47:17 2004
@@ -1,2 +1,2 @@
-MD5 (samhain_signed-1.8.4.tar.gz) = fc406318c8b800ecf5778e097c7f19bd
-SIZE (samhain_signed-1.8.4.tar.gz) = 912597
+MD5 (samhain_signed-1.8.5.tar.gz) = cfe370c146e69d90bd003197b63c5092
+SIZE (samhain_signed-1.8.4.tar.gz) = 912865

>Release-Note:
>Audit-Trail:
>Unformatted: