ports/68790: Update port: security/samhain 2.4.5 -> 4.0.3

[David Thiel]

>Number:         68790
>Category:       ports
>Synopsis:       Update port: security/samhain 2.4.5 -> 4.0.3
>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:   Wed Jul 07 23:30:20 GMT 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 the Osiris integrity checker to 4.0.3. Many changes from the
(now unsupported) 2.x.x series, including a more modular design, support
for monitoring user/group databases and kernel extensions, more flexible
configuration syntax, and improved logging. See ChangeLog for details.

>How-To-Repeat:
>Fix:

diff -ruN osiris.old/Makefile osiris/Makefile
--- osiris.old/Makefile	Fri Jun 25 18:44:18 2004
+++ osiris/Makefile	Wed Jul  7 16:09:15 2004
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	osiris
-PORTVERSION=	2.4.5
+PORTVERSION=	4.0.3
 CATEGORIES=	security
 MASTER_SITES=	http://osiris.shmoo.com/data/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-stable
 
 MAINTAINER=	lx at redundancy.redundancy.org
 COMMENT=	The Shmoo client/server host integrity checker
@@ -44,8 +43,8 @@
 do-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	@${MKDIR} ${PREFIX}/osiris/configs
-.for os in bsdos darwin freebsd irix linux openbsd sunos unix-generic \
-	windows2000 windowsnt windowsxp
+.for os in aix bsdos darwin freebsd irix linux openbsd sunos unix-generic \
+	windows2000 windowsnt windowsserver2003 windowsxp
 	${INSTALL_DATA} ${WRKSRC}/src/configs/default.${os} \
 		${PREFIX}/osiris/configs
 .endfor
diff -ruN osiris.old/distinfo osiris/distinfo
--- osiris.old/distinfo	Fri Jun 25 18:44:18 2004
+++ osiris/distinfo	Wed Jul  7 16:14:20 2004
@@ -1,2 +1,2 @@
-MD5 (osiris-2.4.5-stable.tar.gz) = 1c94472a7d3c31c11baa63067089f35e
-SIZE (osiris-2.4.5-stable.tar.gz) = 4640586
+MD5 (osiris-4.0.3.tar.gz) = a1b5acd2120c1d52cd5047c7fa7c6613
+SIZE (osiris-4.0.3.tar.gz) = 2049384
diff -ruN osiris.old/files/patch-osirisd-in osiris/files/patch-osirisd-in
--- osiris.old/files/patch-osirisd-in	Fri Jun 25 18:44:18 2004
+++ osiris/files/patch-osirisd-in	Wed Jul  7 15:42:57 2004
@@ -1,5 +1,5 @@
---- src/install/freebsd/osirisd.in.old	Tue Jan 27 18:23:16 2004
-+++ src/install/freebsd/osirisd.in	Tue Jan 27 18:24:07 2004
+--- src/install/freebsd/osirisd.in.old	Wed Jul  7 15:40:50 2004
++++ src/install/freebsd/osirisd.in	Wed Jul  7 15:41:50 2004
 @@ -1,11 +1,11 @@
  #!/bin/sh
  
@@ -9,8 +9,8 @@
  case "$1" in
  	start)
  		if [ -x ${OSIRISD} ]; then
--			${OSIRISD} -r @OSIRISDIR@ -l2 && echo -n ' osirisd'
-+			${OSIRISD} -r %%PREFIX%%/osiris -l2 && echo -n ' osirisd'
+-			${OSIRISD} -r @OSIRISDIR@ && echo -n ' osirisd'
++			${OSIRISD} -r %%PREFIX%%/osiris && echo -n ' osirisd'
  		fi
  		;;
  	stop)
diff -ruN osiris.old/files/patch-osirismd-in osiris/files/patch-osirismd-in
--- osiris.old/files/patch-osirismd-in	Fri Jun 25 18:44:18 2004
+++ osiris/files/patch-osirismd-in	Wed Jul  7 15:44:35 2004
@@ -1,5 +1,5 @@
---- src/install/freebsd/osirismd.in.old	Tue Jan 27 18:25:27 2004
-+++ src/install/freebsd/osirismd.in	Tue Jan 27 18:26:01 2004
+--- src/install/freebsd/osirismd.in.old	Wed Jul  7 15:43:07 2004
++++ src/install/freebsd/osirismd.in	Wed Jul  7 15:43:48 2004
 @@ -1,12 +1,12 @@
  #!/bin/sh
  
diff -ruN osiris.old/pkg-plist osiris/pkg-plist
--- osiris.old/pkg-plist	Fri Jun 25 18:44:18 2004
+++ osiris/pkg-plist	Wed Jul  7 15:36:57 2004
@@ -4,6 +4,7 @@
 %%OSIRISMD%%sbin/osirismd
 etc/rc.d/osirisd.sh.sample
 %%OSIRISMD%%etc/rc.d/osirismd.sh.sample
+osiris/configs/default.aix
 osiris/configs/default.bsdos
 osiris/configs/default.darwin
 osiris/configs/default.freebsd
@@ -14,6 +15,7 @@
 osiris/configs/default.unix-generic
 osiris/configs/default.windows2000
 osiris/configs/default.windowsnt
+osiris/configs/default.windowsserver2003
 osiris/configs/default.windowsxp
 @dirrm osiris/configs
 @dirrm osiris
>Release-Note:
>Audit-Trail:
>Unformatted: