From ac8d5905c67699d1829b5b219302adacaa31a965 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 17 Feb 2005 15:31:34 +0000
Subject: Update to 1.5.0, provided by the maintainer Hauke Fath in PR 29420:
 New in 1.5.0:         * Major networking/speed improvements         * fsdiff
 path argument can be used to limit scan - Thanks Wout Mertens         *
 ktcheck -n bug fix for included command files         * twhich displays
 transcript name for '-' lines         * Added checkin and checkout to ra.sh  
       * Added -V to ra.sh         * ra.sh create gives useful default
 transcript name

---
 sysutils/radmind/Makefile         |  4 ++--
 sysutils/radmind/distinfo         | 11 +++++------
 sysutils/radmind/patches/patch-aa | 12 ++++++------
 sysutils/radmind/patches/patch-ab | 10 +++++-----
 sysutils/radmind/patches/patch-ac | 23 -----------------------
 5 files changed, 18 insertions(+), 42 deletions(-)
 delete mode 100644 sysutils/radmind/patches/patch-ac

(limited to 'sysutils/radmind')

diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index 177bd811650..cbd4a2d280e 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/01/19 12:54:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/02/17 15:31:34 wiz Exp $
 #
 
-DISTNAME=	radmind-1.4.0
+DISTNAME=	radmind-1.5.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://rsug.itd.umich.edu/software/radmind/files/
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/radmind/distinfo b/sysutils/radmind/distinfo
index 4203f892059..438d6a47953 100644
--- a/sysutils/radmind/distinfo
+++ b/sysutils/radmind/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/01/26 14:11:34 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/02/17 15:31:34 wiz Exp $
 
-SHA1 (radmind-1.4.0.tgz) = 68fcb7cf9dba6449cb501f216d510bf4f5badff1
-Size (radmind-1.4.0.tgz) = 342647 bytes
-SHA1 (patch-aa) = a6a8de2f5f91dbdbd7b46ec795fa5e4bf60c97c9
-SHA1 (patch-ab) = b973563ae1899f2f3acf8a682d3d6a51cd0db889
-SHA1 (patch-ac) = c12925c0eba55ed1406a6bb5243d99f3a2a52ea2
+SHA1 (radmind-1.5.0.tgz) = ee685126ba38afa34649f1d15bc2dfaa5d0e6294
+Size (radmind-1.5.0.tgz) = 341574 bytes
+SHA1 (patch-aa) = 6df4a37c77f27b792a8bd82d9583df57fde5756f
+SHA1 (patch-ab) = 72d62009c8db10597c8507e696dc2dde6fe36239
diff --git a/sysutils/radmind/patches/patch-aa b/sysutils/radmind/patches/patch-aa
index 8d9781e5bb4..aa350e7ac01 100644
--- a/sysutils/radmind/patches/patch-aa
+++ b/sysutils/radmind/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1 2005/01/19 12:54:13 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/17 15:31:34 wiz Exp $
 
---- Makefile.in.orig	2005-01-06 22:37:37.000000000 +0100
+--- Makefile.in.orig	2005-01-24 20:24:11.000000000 +0100
 +++ Makefile.in
-@@ -219,6 +219,7 @@ rash : FRC
- 	    -e 's@_RADMIND_PREAPPLY@${PREAPPLYDIR}@g' \
- 	    -e 's@_RADMIND_POSTAPPLY@${POSTAPPLYDIR}@g' \
- 	    -e 's@_RADMIND_MKTEMP@${MKTEMP}@g' \
+@@ -223,6 +223,7 @@ rash : FRC
+ 	    -e 's@_RADMIND_DIR@${RADMINDDIR}@g' \
+ 	    -e 's@_RADMIND_MAIL_DOMAIN@${RADMIND_MAIL_DOMAIN}@g' \
+ 	    -e 's@_RADMIND_VERSION@${VERSION}@g' \
 +	    -e 's@_PKG_SYSCONFDIR@${PKG_SYSCONFDIR}@g' \
  	    ${srcdir}/ra.sh > tmp/ra.sh; 
  
diff --git a/sysutils/radmind/patches/patch-ab b/sysutils/radmind/patches/patch-ab
index 9ad246de43c..69d61adcfb9 100644
--- a/sysutils/radmind/patches/patch-ab
+++ b/sysutils/radmind/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2005/01/19 12:54:13 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/02/17 15:31:34 wiz Exp $
 
---- ra.sh.orig	2004-12-21 17:48:00.000000000 +0100
+--- ra.sh.orig	2005-02-10 19:17:57.000000000 +0100
 +++ ra.sh
 @@ -23,7 +23,7 @@
  SERVER="_RADMIND_HOST"
@@ -9,9 +9,9 @@ $NetBSD: patch-ab,v 1.1 2005/01/19 12:54:13 wiz Exp $
 -DEFAULTS="/etc/defaults/radmind"
 +DEFAULTS="_PKG_SYSCONFDIR/radmind.defaults"
  FSDIFFROOT="."
- FLAG="/var/radmind/client/.RadmindRunning"
- 
-@@ -46,14 +46,6 @@ fi
+ FLAG="_RADMIND_DIR/client/.RadmindRunning"
+ CHECKEDOUT="_RADMIND_DIR/client/.CheckedOut"
+@@ -49,14 +49,6 @@ fi
  LTMP="${TMPDIR}/lapply.out"
  FTMP="${TMPDIR}/fsdiff.out"
  
diff --git a/sysutils/radmind/patches/patch-ac b/sysutils/radmind/patches/patch-ac
deleted file mode 100644
index 08551ea58ff..00000000000
--- a/sysutils/radmind/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/01/26 14:11:34 wiz Exp $
-
---- tls.c.orig	2005-01-26 15:07:39.000000000 +0100
-+++ tls.c
-@@ -194,7 +194,8 @@ tls_client_start( SNET *sn, char *host, 
-     char            *line;
-     int             ntype;
-     struct in_addr  addr;
--
-+    int alt_ext;
-+    
-     if ( inet_aton( host, &addr )) {
- 	ntype = IS_IP4;
-     } else {
-@@ -239,7 +240,7 @@ tls_client_start( SNET *sn, char *host, 
-     /* This code gratiously borrowed from openldap-2.2.17,
-      * it allows the use of aliases in the certificate.
-      */
--    int alt_ext = X509_get_ext_by_NID( peer, NID_subject_alt_name, -1);
-+    alt_ext = X509_get_ext_by_NID( peer, NID_subject_alt_name, -1);
- 
-     if ( alt_ext >= 0 ) {
- 	X509_EXTENSION			*ex;
-- 
cgit v1.2.3