Use "/dev/urandom" for random data source if it exists.

Fixes:	pkg/11469 by Chris Jones <chris@cjones.org>
	pkg/12092 by Jesse Off <joff@nuewmonics.com>

3 files changed, 35 insertions, 3 deletions

diff --git a/security/cyrus-sasl/files/patch-sum b/security/cyrus-sasl/files/patch-sum
index 392fa393a3a..9cdf6acc4b0 100644
--- a/security/cyrus-sasl/files/patch-sum
+++ b/security/cyrus-sasl/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/12/10 09:43:37 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2001/01/31 22:47:53 jlam Exp $
 
-MD5 (patch-aa) = 58314d0341661a6a0a65f138a933b50d
+MD5 (patch-aa) = 7e4de4870d0c98d0c0c6b7f6953a6046
 MD5 (patch-ab) = e06e64a8beeccc8389f36ae6b1de045e
 MD5 (patch-ac) = a7e24938129451cf1badf0dee37ed070
 MD5 (patch-ad) = 53b8e850263ca1fab1115e66b061a869
@@ -8,3 +8,4 @@ MD5 (patch-ae) = 608e7a8a4e9ffa8701904f66b0770e5b
 MD5 (patch-af) = 0594f8bc52a4fb8e81db024404c3ebcc
 MD5 (patch-ag) = e7e127c693b44728fb974ce589a075eb
 MD5 (patch-ah) = e848e4172a104e48f34be29b8653457b
+MD5 (patch-ai) = ff76b11afdca005e653822764e39d3c8
diff --git a/security/cyrus-sasl/patches/patch-aa b/security/cyrus-sasl/patches/patch-aa
index 453c5143d37..b5935d3aec5 100644
--- a/security/cyrus-sasl/patches/patch-aa
+++ b/security/cyrus-sasl/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2000/12/10 09:43:37 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/01/31 22:47:53 jlam Exp $
 
 --- configure.in.orig	Thu Jul 20 22:35:01 2000
 +++ configure.in
@@ -32,3 +32,13 @@ $NetBSD: patch-aa,v 1.2 2000/12/10 09:43:37 jlam Exp $
  
    if test "$with_des" = no; then
      dnl if openssl is around, we might be able to use that for des
+@@ -694,6 +700,9 @@
+ 
+ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
+ AC_SUBST(LTLIBOBJS)
++
++dnl Check for /dev/urandom
++AC_CHECK_FILE(/dev/urandom, AC_DEFINE_UNQUOTED(SASL_DEV_RANDOM, "/dev/urandom"))
+ 
+ AC_CHECK_HEADERS(getopt.h unistd.h crypt.h pwd.h shadow.h paths.h)
+ AC_C_CONST
diff --git a/security/cyrus-sasl/patches/patch-ai b/security/cyrus-sasl/patches/patch-ai
new file mode 100644
index 00000000000..4cfc47f94fa
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ai
@@ -0,0 +1,21 @@
+$NetBSD: patch-ai,v 1.1 2001/01/31 22:47:53 jlam Exp $
+
+--- acconfig.h.orig	Wed Jul  5 12:59:25 2000
++++ acconfig.h
+@@ -123,10 +123,15 @@
+ /* define if your system has getpid() */
+ #undef HAVE_GETPID
+ 
++/* location of the random number generator */
++#undef SASL_DEV_RANDOM
++
+ @BOTTOM@
+ 
+ /* location of the random number generator */
+-#ifndef DEV_RANDOM
++#ifdef SASL_DEV_RANDOM
++#define DEV_RANDOM SASL_DEV_RANDOM
++#else
+ #define DEV_RANDOM "/dev/random"
+ #endif
+