Native illumos arc4random(3C) imported the latest OpenBSD API which

does not have arc4random_addrandom().  Update other patches while here.

4 files changed, 27 insertions, 9 deletions

diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index 59f73b3053e..313b5dbda49 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.30 2015/02/04 08:04:34 spz Exp $
+$NetBSD: distinfo,v 1.31 2015/10/13 14:21:13 jperkin Exp $
 
 SHA1 (libevent-2.0.22-stable.tar.gz) = a586882bc93a208318c70fc7077ed8fca9862864
 RMD160 (libevent-2.0.22-stable.tar.gz) = 6a7e8e3ebcfd2227fa807a604b5c773c90c8b8cc
 Size (libevent-2.0.22-stable.tar.gz) = 854987 bytes
-SHA1 (patch-Makefile.am) = 2518403715eabaeef5e7edfccf3732607cba6309
-SHA1 (patch-Makefile.in) = 23b6f6ce916d5c04af9aa75ba40f007b4358aae0
+SHA1 (patch-Makefile.am) = 4bada3e2ddb6cff34edf92abbe22e5d9a64b8ee8
+SHA1 (patch-Makefile.in) = 8fcd6f893c3c967599fa4f528953e449e85ac8f0
+SHA1 (patch-evutil__rand.c) = e8e0bbccd27ccbb7a9cf077352a8c56a35e87b47
diff --git a/devel/libevent/patches/patch-Makefile.am b/devel/libevent/patches/patch-Makefile.am
index b9d905a896d..5827d5f2511 100644
--- a/devel/libevent/patches/patch-Makefile.am
+++ b/devel/libevent/patches/patch-Makefile.am
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.am,v 1.1 2013/05/10 01:22:27 riastradh Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2015/10/13 14:21:13 jperkin Exp $
 
 Don't install event_rpcgen.py.
 
---- Makefile.am.orig	2012-11-18 06:38:50.000000000 +0000
+--- Makefile.am.orig	2015-01-05 14:06:57.000000000 +0000
 +++ Makefile.am
-@@ -86,7 +86,7 @@ VERSION_INFO = 6:9:1
+@@ -87,7 +87,7 @@ VERSION_INFO = 6:10:1
  # series won't be binary-compatible.
  
  if INSTALL_LIBEVENT
diff --git a/devel/libevent/patches/patch-Makefile.in b/devel/libevent/patches/patch-Makefile.in
index 59d49749259..a68fddd88de 100644
--- a/devel/libevent/patches/patch-Makefile.in
+++ b/devel/libevent/patches/patch-Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.1 2013/05/10 01:22:27 riastradh Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2015/10/13 14:21:13 jperkin Exp $
 
 Don't install event_rpcgen.py.
 
---- Makefile.in.orig	2012-11-19 15:13:17.000000000 +0000
+--- Makefile.in.orig	2015-01-05 14:31:14.000000000 +0000
 +++ Makefile.in
 @@ -210,7 +210,7 @@ libevent_pthreads_la_LINK = $(LIBTOOL) -
  @INSTALL_LIBEVENT_FALSE@@PTHREADS_TRUE@am_libevent_pthreads_la_rpath =
@@ -13,7 +13,7 @@ Don't install event_rpcgen.py.
  SCRIPTS = $(dist_bin_SCRIPTS)
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -508,7 +508,7 @@ VERSION_INFO = 6:9:1
+@@ -511,7 +511,7 @@ VERSION_INFO = 6:9:1
  # nice and rare.  For the next couple of years, though, 'struct event'
  # is user-visible, and so we can pretty much guarantee that release
  # series won't be binary-compatible.
diff --git a/devel/libevent/patches/patch-evutil__rand.c b/devel/libevent/patches/patch-evutil__rand.c
new file mode 100644
index 00000000000..a28054da128
--- /dev/null
+++ b/devel/libevent/patches/patch-evutil__rand.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-evutil__rand.c,v 1.1 2015/10/13 14:21:13 jperkin Exp $
+
+Native illumos arc4random(3C) imported the latest OpenBSD API which
+does not have arc4random_addrandom().
+
+--- evutil_rand.c.orig	2013-11-01 18:18:57.000000000 +0000
++++ evutil_rand.c
+@@ -174,7 +174,9 @@ evutil_secure_rng_get_bytes(void *buf, s
+ void
+ evutil_secure_rng_add_bytes(const char *buf, size_t n)
+ {
++#if !(defined(_EVENT_HAVE_ARC4RANDOM) && defined(__sun))
+ 	arc4random_addrandom((unsigned char*)buf,
+ 	    n>(size_t)INT_MAX ? INT_MAX : (int)n);
++#endif
+ }
+