Hi, here are patches to fix build after yesterday's arc4random_(addrandom|stir) removal.
ok? Index: devel/libevent2/Makefile =================================================================== RCS file: /cvs/ports/devel/libevent2/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- devel/libevent2/Makefile 21 Mar 2013 08:45:15 -0000 1.8 +++ devel/libevent2/Makefile 22 Oct 2013 04:05:42 -0000 @@ -5,6 +5,7 @@ COMMENT= event notification library V= 2.0.21 DISTNAME= libevent-$V-stable PKGNAME= libevent-$V +REVISION= 0 CATEGORIES= devel HOMEPAGE= http://monkey.org/~provos/libevent/ Index: devel/libevent2/patches/patch-evutil_rand_c =================================================================== RCS file: devel/libevent2/patches/patch-evutil_rand_c diff -N devel/libevent2/patches/patch-evutil_rand_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/libevent2/patches/patch-evutil_rand_c 22 Oct 2013 04:00:48 -0000 @@ -0,0 +1,45 @@ +$OpenBSD$ +OpenBSD doesn't provide arc4random_addrandom anymore. +Provide a stub anyway. +--- evutil_rand.c.orig Tue Oct 22 05:56:49 2013 ++++ evutil_rand.c Tue Oct 22 06:00:18 2013 +@@ -95,6 +95,13 @@ ev_arc4random_buf(void *buf, size_t n) + #endif + } + ++void ++evutil_secure_rng_add_bytes(const char *buf, size_t n) ++{ ++ (void)buf; ++ (void)n; ++} ++ + #else /* !_EVENT_HAVE_ARC4RANDOM { */ + + #ifdef _EVENT_ssize_t +@@ -142,18 +149,19 @@ ev_arc4random_buf(void *buf, size_t n) + arc4random_buf(buf, n); + } + +-#endif /* } !_EVENT_HAVE_ARC4RANDOM */ + + void +-evutil_secure_rng_get_bytes(void *buf, size_t n) ++evutil_secure_rng_add_bytes(const char *buf, size_t n) + { +- ev_arc4random_buf(buf, n); ++ arc4random_addrandom((unsigned char*)buf, ++ n>(size_t)INT_MAX ? INT_MAX : (int)n); + } + ++#endif /* } !_EVENT_HAVE_ARC4RANDOM */ ++ + void +-evutil_secure_rng_add_bytes(const char *buf, size_t n) ++evutil_secure_rng_get_bytes(void *buf, size_t n) + { +- arc4random_addrandom((unsigned char*)buf, +- n>(size_t)INT_MAX ? INT_MAX : (int)n); ++ ev_arc4random_buf(buf, n); + } + Index: mail/exim/Makefile =================================================================== RCS file: /cvs/ports/mail/exim/Makefile,v retrieving revision 1.94 diff -u -p -r1.94 Makefile --- mail/exim/Makefile 24 Aug 2013 09:22:25 -0000 1.94 +++ mail/exim/Makefile 22 Oct 2013 08:28:55 -0000 @@ -4,6 +4,7 @@ CATEGORIES = mail COMMENT-main = flexible mail transfer agent COMMENT-eximon = X11 monitor tool for Exim MTA VERSION = 4.80.1 +REVISION = 0 DISTNAME = exim-${VERSION} PKGNAME-main = exim-${VERSION} FULLPKGNAME-eximon = exim-eximon-${VERSION} Index: mail/exim/patches/patch-OS_os_h-FreeBSD =================================================================== RCS file: mail/exim/patches/patch-OS_os_h-FreeBSD diff -N mail/exim/patches/patch-OS_os_h-FreeBSD --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/exim/patches/patch-OS_os_h-FreeBSD 22 Oct 2013 03:28:13 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +OpenBSD doesn't provide arc4random_stir anymore. +--- OS/os.h-FreeBSD.orig Tue Oct 22 05:27:08 2013 ++++ OS/os.h-FreeBSD Tue Oct 22 05:27:23 2013 +@@ -7,6 +7,7 @@ + #define SIOCGIFCONF_GIVES_ADDR + #define HAVE_SRANDOMDEV + #define HAVE_ARC4RANDOM ++#define HAVE_ARC4RANDOM_STIR + + typedef struct flock flock_t; + Index: mail/exim/patches/patch-OS_os_h-NetBSD =================================================================== RCS file: mail/exim/patches/patch-OS_os_h-NetBSD diff -N mail/exim/patches/patch-OS_os_h-NetBSD --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/exim/patches/patch-OS_os_h-NetBSD 22 Oct 2013 03:28:08 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +OpenBSD doesn't provide arc4random_stir anymore. +--- OS/os.h-NetBSD.orig Tue Oct 22 05:26:54 2013 ++++ OS/os.h-NetBSD Tue Oct 22 05:27:02 2013 +@@ -6,6 +6,7 @@ + #define HAVE_SYS_MOUNT_H + #define SIOCGIFCONF_GIVES_ADDR + #define HAVE_ARC4RANDOM ++#define HAVE_ARC4RANDOM_STIR + + typedef struct flock flock_t; + Index: mail/exim/patches/patch-src_expand_c =================================================================== RCS file: mail/exim/patches/patch-src_expand_c diff -N mail/exim/patches/patch-src_expand_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/exim/patches/patch-src_expand_c 22 Oct 2013 03:49:07 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +OpenBSD doesn't provide arc4random_stir anymore. +--- src/expand.c.orig Tue Oct 22 05:06:13 2013 ++++ src/expand.c Tue Oct 22 05:49:02 2013 +@@ -820,7 +820,7 @@ vaguely_random_number(int max) + if (pid != 0) + { + +-#ifdef HAVE_ARC4RANDOM ++#if defined(HAVE_ARC4RANDOM) && defined(HAVE_ARC4RANDOM_STIR) + /* cryptographically strong randomness, common on *BSD platforms, not + so much elsewhere. Alas. */ + arc4random_stir(); Index: print/cups/Makefile =================================================================== RCS file: /cvs/ports/print/cups/Makefile,v retrieving revision 1.164 diff -u -p -r1.164 Makefile --- print/cups/Makefile 25 Sep 2013 08:39:25 -0000 1.164 +++ print/cups/Makefile 22 Oct 2013 04:45:18 -0000 @@ -4,6 +4,7 @@ COMMENT-main= Common Unix Printing Syst COMMENT-libs= CUPS libraries and headers VERSION= 1.6.4 +REVISION= 0 DISTNAME= cups-${VERSION}-source EXTRACT_SUFX= .tar.bz2 Index: print/cups/patches/patch-config-scripts_cups-common_m4 =================================================================== RCS file: /cvs/ports/print/cups/patches/patch-config-scripts_cups-common_m4,v retrieving revision 1.10 diff -u -p -r1.10 patch-config-scripts_cups-common_m4 --- print/cups/patches/patch-config-scripts_cups-common_m4 19 Mar 2013 08:49:14 -0000 1.10 +++ print/cups/patches/patch-config-scripts_cups-common_m4 22 Oct 2013 08:33:55 -0000 @@ -1,9 +1,10 @@ $OpenBSD: patch-config-scripts_cups-common_m4,v 1.10 2013/03/19 08:49:14 ajacoutot Exp $ -Our <sys/ucred.h> does not provide xucred. +- Our <sys/ucred.h> does not provide xucred. +- check for add4random_stir, since OpenBSD doesn't provide it anymore. ---- config-scripts/cups-common.m4.orig Mon Mar 18 18:23:09 2013 -+++ config-scripts/cups-common.m4 Tue Mar 19 08:15:45 2013 +--- config-scripts/cups-common.m4.orig Tue Sep 24 18:25:31 2013 ++++ config-scripts/cups-common.m4 Tue Oct 22 06:40:54 2013 @@ -137,7 +137,6 @@ AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H)) AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H)) AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H)) @@ -12,3 +13,12 @@ Our <sys/ucred.h> does not provide xucre AC_CHECK_HEADER(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H)) dnl Checks for iconv.h and iconv_open +@@ -175,7 +174,7 @@ else + fi + + dnl Check for random number functions... +-AC_CHECK_FUNCS(random lrand48 arc4random) ++AC_CHECK_FUNCS(random lrand48 arc4random arc4random_stir) + + dnl Check for geteuid function. + AC_CHECK_FUNCS(geteuid) Index: print/cups/patches/patch-config_h_in =================================================================== RCS file: print/cups/patches/patch-config_h_in diff -N print/cups/patches/patch-config_h_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/cups/patches/patch-config_h_in 22 Oct 2013 08:35:21 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +Use arc4random_stir only if present +--- config.h.in.orig Tue Oct 22 06:38:36 2013 ++++ config.h.in Tue Oct 22 06:43:28 2013 +@@ -648,7 +648,11 @@ + + #ifdef HAVE_ARC4RANDOM + # define CUPS_RAND() arc4random() +-# define CUPS_SRAND(v) arc4random_stir() ++# ifdef HAVE_ARC4RANDOM_STIR ++# define CUPS_SRAND(v) arc4random_stir() ++# else ++# define CUPS_SRAND(v) ((void)(v)) ++# endif + #elif defined(HAVE_RANDOM) + # define CUPS_RAND() random() + # define CUPS_SRAND(v) srandom(v)
