Maintainer update of radmind from PR 32339.

New in 1.5.1:
  Added support for case insensitive file systems
  Add lsort to sort transcripts


ktcheck:
  Fixed -D usage
  Added -D to specify radmind path
  Added -C to remove unused command files and transcripts


fsdiff:
  Fixed bug that would calculate unnecessary checksums
  Fixed bug that required two runs to fix hardlinks for objects  other
then files.


lapply:
  Fixed bug that would exit if a socket or a door didn't exist


lcreate:
  -n correctly checks files.
  Fixed bug where -N wouldn't use correct size on applefiles


lfdiff:
  Better special handling.
  If precedent_transcript returns special, make lfdiff handle it.
  Check to make sure local file exists.
  Check return value of precedent_transcript.
  uses highest precedence transcript for path if no -T or -S given


twhich:
  Fixed error with new transcript code


daemon:
  Changed -L to specify syslog level
  Added -F to specify syslog facility


lcksum:
  removes temp files on error


libsnet:
  made timed reads non-blocking
  SSL_read bug fix, amohave contents.


docs:
  BUG 1352578: Added CN to special file path description
  Added lsort man page


build:
  Fixed most warnings on OS X 10.4
  Fixed bug with SASL builds

6 files changed, 56 insertions, 26 deletions

diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index 66c4b830f95..cafb7a5fef1 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:18 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/18 13:11:56 joerg Exp $
 #
 
-DISTNAME=	radmind-1.5.0
-PKGREVISION=	1
+DISTNAME=	radmind-1.5.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://rsug.itd.umich.edu/software/radmind/files/
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/radmind/PLIST b/sysutils/radmind/PLIST
index 5a1ef3a64cb..44bf65f564c 100644
--- a/sysutils/radmind/PLIST
+++ b/sysutils/radmind/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:34:06 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/01/18 13:11:56 joerg Exp $
 bin/fsdiff
 bin/ktcheck
 bin/lapply
@@ -6,6 +6,7 @@ bin/lcksum
 bin/lcreate
 bin/lfdiff
 bin/lmerge
+bin/lsort
 bin/ra.sh
 bin/twhich
 man/man1/fsdiff.1
@@ -15,6 +16,8 @@ man/man1/lcksum.1
 man/man1/lcreate.1
 man/man1/lfdiff.1
 man/man1/lmerge.1
+man/man1/lsort.1
+man/man1/rash.1
 man/man1/twhich.1
 man/man5/applefile.5
 man/man8/radmind.8
diff --git a/sysutils/radmind/distinfo b/sysutils/radmind/distinfo
index 88095aee732..37b69e6f18f 100644
--- a/sysutils/radmind/distinfo
+++ b/sysutils/radmind/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2006/01/13 19:16:06 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/01/18 13:11:56 joerg Exp $
 
-SHA1 (radmind-1.5.0.tgz) = ee685126ba38afa34649f1d15bc2dfaa5d0e6294
-RMD160 (radmind-1.5.0.tgz) = 7b685e357c45e40bb238c68482abe467d8073030
-Size (radmind-1.5.0.tgz) = 341574 bytes
-SHA1 (patch-aa) = 6df4a37c77f27b792a8bd82d9583df57fde5756f
-SHA1 (patch-ab) = 72d62009c8db10597c8507e696dc2dde6fe36239
-SHA1 (patch-ac) = 885cc0763156886bf65db3b01665763d50b87d55
+SHA1 (radmind-1.5.1.tgz) = 10d79eec04341796e039e1f93167bf19c32c6b6f
+RMD160 (radmind-1.5.1.tgz) = eb16c4852be5e9d942e732ce9f8b9bc2b1241827
+Size (radmind-1.5.1.tgz) = 353879 bytes
+SHA1 (patch-aa) = 3c0467baeda68d1013ab09288c71bfc75c8738b9
+SHA1 (patch-ab) = b9f766e9383bd289e980faa0fdbc281e33e42059
+SHA1 (patch-ac) = c1ea9930b9c2fee94a0b0d43e8aeec1925e454e7
 SHA1 (patch-ad) = 1e69e4ddf4d255b4673261eb6b16015ce8bb5dd3
 SHA1 (patch-ae) = 58b15301aa1df00e6e5bab9f21db8ddc99461f2a
diff --git a/sysutils/radmind/patches/patch-aa b/sysutils/radmind/patches/patch-aa
index aa350e7ac01..dadb353ff70 100644
--- a/sysutils/radmind/patches/patch-aa
+++ b/sysutils/radmind/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2005/02/17 15:31:34 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/18 13:11:56 joerg Exp $
 
---- Makefile.in.orig	2005-01-24 20:24:11.000000000 +0100
+--- Makefile.in.orig	2005-12-07 21:13:43.000000000 +0100
 +++ Makefile.in
-@@ -223,6 +223,7 @@ rash : FRC
- 	    -e 's@_RADMIND_DIR@${RADMINDDIR}@g' \
+@@ -236,6 +236,8 @@ rash : FRC
  	    -e 's@_RADMIND_MAIL_DOMAIN@${RADMIND_MAIL_DOMAIN}@g' \
+ 	    -e 's@_RADMIND_COMMANDFILE@${COMMANDFILE}@g' \
  	    -e 's@_RADMIND_VERSION@${VERSION}@g' \
 +	    -e 's@_PKG_SYSCONFDIR@${PKG_SYSCONFDIR}@g' \
++	    -e 's@_LOCALBASE@${LOCALBASE}@g' \
  	    ${srcdir}/ra.sh > tmp/ra.sh; 
  
  man : FRC
diff --git a/sysutils/radmind/patches/patch-ab b/sysutils/radmind/patches/patch-ab
index 69d61adcfb9..1263c8be93e 100644
--- a/sysutils/radmind/patches/patch-ab
+++ b/sysutils/radmind/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/02/17 15:31:34 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2006/01/18 13:11:56 joerg Exp $
 
---- ra.sh.orig	2005-02-10 19:17:57.000000000 +0100
+--- ra.sh.orig	2005-12-07 21:10:01.000000000 +0100
 +++ ra.sh
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@ KFILE="_RADMIND_COMMANDFILE"
  SERVER="_RADMIND_HOST"
  TLSLEVEL="_RADMIND_AUTHLEVEL"
  EDITOR=${EDITOR:-vi}
@@ -11,7 +11,16 @@ $NetBSD: patch-ab,v 1.2 2005/02/17 15:31:34 wiz Exp $
  FSDIFFROOT="."
  FLAG="_RADMIND_DIR/client/.RadmindRunning"
  CHECKEDOUT="_RADMIND_DIR/client/.CheckedOut"
-@@ -49,14 +49,6 @@ fi
+@@ -34,7 +34,7 @@ VERSION=_RADMIND_VERSION
+ PREAPPLY="_RADMIND_PREAPPLY"
+ POSTAPPLY="_RADMIND_POSTAPPLY"
+ 
+-PATH=/usr/local/bin:/usr/bin:/bin; export PATH
++PATH=_LOCALBASE/bin:/usr/bin:/bin; export PATH
+ RETRY=10
+ 
+ MKTEMP="_RADMIND_MKTEMP"
+@@ -50,14 +50,6 @@ fi
  LTMP="${TMPDIR}/lapply.out"
  FTMP="${TMPDIR}/fsdiff.out"
  
@@ -26,3 +35,21 @@ $NetBSD: patch-ab,v 1.2 2005/02/17 15:31:34 wiz Exp $
  Yn() {
      echo -n "$*" "[Yn] "
      read ans
+@@ -88,7 +80,7 @@ cleanup() {
+ 
+ dopreapply() {
+     if [ -d ${PREAPPLY} ]; then
+-	SCRIPTS=`find ${PREAPPLY} -perm +u+x \! -type d | sort`
++	SCRIPTS=`find ${PREAPPLY} -perm -u+x \! -type d | sort`
+ 	if [ ${SCRIPTS} ]; then
+ 	    for script in ${SCRIPTS}; do
+ 		${script} "$1"
+@@ -99,7 +91,7 @@ dopreapply() {
+ 
+ dopostapply() {
+     if [ -d ${POSTAPPLY} ]; then
+-	SCRIPTS=`find ${POSTAPPLY} -perm +u+x \! -type d | sort`
++	SCRIPTS=`find ${POSTAPPLY} -perm -u+x \! -type d | sort`
+ 	if [ ${SCRIPTS} ]; then
+ 	    for script in ${SCRIPTS}; do
+ 		${script} "$1"
diff --git a/sysutils/radmind/patches/patch-ac b/sysutils/radmind/patches/patch-ac
index 4df63cc8903..7f70c43dbfb 100644
--- a/sysutils/radmind/patches/patch-ac
+++ b/sysutils/radmind/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.3 2006/01/13 19:16:06 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2006/01/18 13:11:56 joerg Exp $
 
---- libsnet/snet.c.orig	2006-01-13 19:00:00.000000000 +0000
+--- libsnet/snet.c.orig	2005-12-05 18:26:57.000000000 +0100
 +++ libsnet/snet.c
-@@ -430,7 +430,6 @@ snet_readread( sn, buf, len, tv )
- #endif /* linux */
+@@ -630,7 +630,6 @@ snet_readread( sn, buf, len, tv )
      fd_set		fds;
      ssize_t		rc;
+     struct timeval	default_tv;
 -    extern int		errno;
+     int			oflags, dontblock = 0;
  
-     if ( tv ) {
- 	FD_ZERO( &fds );
-@@ -557,7 +556,6 @@ snet_getline( sn, tv )
+     if (( tv == NULL ) && ( sn->sn_flag & SNET_READ_TIMEOUT )) {
+@@ -806,7 +805,6 @@ snet_getline( sn, tv )
  {
      char		*eol, *line;
      ssize_t		rc;