Attachment #196464 for bug #230756

Lines 3-9 Link Here

(-)textproc/htmldoc/Makefile (-1 / +1 lines)
3	PORTNAME= htmldoc	3	PORTNAME= htmldoc
4	PORTVERSION= 1.8.28	4	PORTVERSION= 1.8.28
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= textproc	6	CATEGORIES= textproc
7	MASTER_SITES= https://github.com/michaelrsweet/htmldoc/releases/download/release-${PORTVERSION}/	7	MASTER_SITES= https://github.com/michaelrsweet/htmldoc/releases/download/release-${PORTVERSION}/
8	DISTNAME= ${PORTNAME}-${PORTVERSION}-source	8	DISTNAME= ${PORTNAME}-${PORTVERSION}-source

Lines 5-11 Link Here

(-)textproc/htmldoc/files/patch-htmldoc__http.c (-1 / +1 lines)
5	* it is the best we can do (on others, this seed isn't even used...)	5	* it is the best we can do (on others, this seed isn't even used...)
6	*/	6	*/
7	+#define CUPS_RAND() arc4random()	7	+#define CUPS_RAND() arc4random()
8	+#define CUPS_SRAND(v) arc4random_stir()	8	+#define CUPS_SRAND(v)
9		9
10	CUPS_SRAND(time(NULL));	10	CUPS_SRAND(time(NULL));
11		11

Lines 3-9 Link Here

(-)net/samba48/Makefile (-1 / +1 lines)
3	PORTNAME= ${SAMBA4_BASENAME}48	3	PORTNAME= ${SAMBA4_BASENAME}48
4	PORTVERSION= ${SAMBA4_VERSION}	4	PORTVERSION= ${SAMBA4_VERSION}
5	PORTREVISION= 0	5	PORTREVISION= 1
6	CATEGORIES?= net	6	CATEGORIES?= net
7	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc	7	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
8	DISTNAME= ${SAMBA4_DISTNAME}	8	DISTNAME= ${SAMBA4_DISTNAME}

Line 0 Link Here

(-)net/samba48/files/patch-source4__heimdal__lib__roken__rand.c (+10 lines)
	1	--- source4/heimdal/lib/roken/rand.c.orig 2018-01-14 12:41:58.000000000 -0800
	2	+++ source4/heimdal/lib/roken/rand.c 2018-08-22 22:11:26.937151714 -0700
	3	@@ -37,7 +37,6 @@
	4	rk_random_init(void)
	5	{
	6	#if defined(HAVE_ARC4RANDOM)
	7	- arc4random_stir();
	8	#elif defined(HAVE_SRANDOMDEV)
	9	srandomdev();
	10	#elif defined(HAVE_RANDOM)

Lines 3-8 Link Here

(-)security/heimdal/Makefile (+1 lines)
3	PORTNAME= heimdal	3	PORTNAME= heimdal
4	PORTVERSION= 7.5.0	4	PORTVERSION= 7.5.0
		5	PORTREVISION= 1
5	CATEGORIES= security ipv6	6	CATEGORIES= security ipv6
6	MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/	7	MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/

Line 0 Link Here

(-)security/heimdal/files/patch-lib_roken_rand.c (+10 lines)
	1	--- lib/roken/rand.c.orig 2016-12-20 14:23:06 UTC
	2	+++ lib/roken/rand.c
	3	@@ -42,7 +42,6 @@ void ROKEN_LIB_FUNCTION
	4	rk_random_init(void)
	5	{
	6	#if defined(HAVE_ARC4RANDOM)
	7	- arc4random_stir();
	8	#elif defined(HAVE_SRANDOMDEV)
	9	srandomdev();
	10	#elif defined(HAVE_RANDOM)

Lines 3-9 Link Here

(-)mail/exim/Makefile (-1 / +1 lines)
3	PORTNAME= exim	3	PORTNAME= exim
4	PORTVERSION?= ${EXIM_VERSION}	4	PORTVERSION?= ${EXIM_VERSION}
5	PORTREVISION= 2	5	PORTREVISION= 3
6	CATEGORIES= mail ipv6	6	CATEGORIES= mail ipv6
7	MASTER_SITES= EXIM:exim	7	MASTER_SITES= EXIM:exim
8	MASTER_SITE_SUBDIR= /exim4/:exim \	8	MASTER_SITE_SUBDIR= /exim4/:exim \




--- OS/os.h-FreeBSD.orig	2018-04-14 23:18:10 UTC
+++ OS/os.h-FreeBSD
@@ -12,6 +12,14 @@
 #define SIOCGIFCONF_GIVES_ADDR
 #define HAVE_SRANDOMDEV
 #define HAVE_ARC4RANDOM
+/* Applications should not call arc4random_stir() explicitly after
+   FreeBSD r227520 (approximately 1000002).
+   Set NOT_HAVE_ARC4RANDOM_STIR if the version released is past
+   that point. */
+#include <sys/param.h>
+#if __FreeBSD_version >= 1000002
+# define NOT_HAVE_ARC4RANDOM_STIR
+#endif

 typedef struct flock flock_t;


Lines 2-8 Link Here

(-)dns/samba-nsupdate/Makefile (-1 / +1 lines)
2	PORTNAME= nsupdate	2	PORTNAME= nsupdate
3	PORTVERSION= 9.8.6	3	PORTVERSION= 9.8.6
4	PORTREVISION= 1	4	PORTREVISION= 2
5	CATEGORIES= dns net ipv6	5	CATEGORIES= dns net ipv6
6	MASTER_SITES= ISC/bind9/${ISCVERSION}	6	MASTER_SITES= ISC/bind9/${ISCVERSION}
7	PKGNAMEPREFIX= samba-	7	PKGNAMEPREFIX= samba-




--- lib/isc/random.c.orig	2013-09-05 05:19:53 UTC
+++ lib/isc/random.c
@@ -68,7 +68,9 @@ isc_random_seed(isc_uint32_t seed)
 #ifndef HAVE_ARC4RANDOM
 	srand(seed);
 #else
+#ifdef arc4random_addrandom
 	arc4random_addrandom((u_char *) &seed, sizeof(isc_uint32_t));
+#endif
 #endif
 }


Lines 3-8 Link Here

(-)net-p2p/gtk-gnutella/Makefile (+1 lines)
3	PORTNAME= gtk-gnutella	3	PORTNAME= gtk-gnutella
4	PORTVERSION= 1.1.13	4	PORTVERSION= 1.1.13
		5	PORTREVISION= 1
5	CATEGORIES= net-p2p ipv6	6	CATEGORIES= net-p2p ipv6
6	MASTER_SITES= SF	7	MASTER_SITES= SF




--- src/lib/arc4random.c.orig	2017-10-22 16:12:09 UTC
+++ src/lib/arc4random.c
@@ -298,9 +298,11 @@ arc4random64(void)
 void G_COLD
 arc4random_stir_once(void)
 {
+#ifdef arc4random_stir
 	static once_flag_t done;

 	once_flag_run(&done, arc4random_stir);
+#endif
 }

 /***

Lines 2-8 Link Here

(-)net/relayd/Makefile (-1 / +1 lines)
2	PORTNAME= relayd	2	PORTNAME= relayd
3	PORTVERSION= 5.5.20140810	3	PORTVERSION= 5.5.20140810
4	PORTREVISION= 2	4	PORTREVISION= 3
5	CATEGORIES= net	5	CATEGORIES= net
6	MAINTAINER= mm@FreeBSD.org	6	MAINTAINER= mm@FreeBSD.org




--- relayd/relayd.c.orig	2014-08-10 20:08:47 UTC
+++ relayd/relayd.c
@@ -241,8 +241,7 @@ main(int argc, char *argv[])
 		log_info("startup");

 #ifdef __FreeBSD__
-#if __FreeBSD_version > 800040
-	arc4random_stir();
+#if __FreeBSD_version > 1000002
 	arc4random_buf(rnd, sizeof(rnd));
 	RAND_seed(rnd, sizeof(rnd));
 #else

Return to bug 230756

Line 0 Link Here

(-)mail/exim/files/patch-OS_os.h-FreeBSD (+17 lines)
	1	--- OS/os.h-FreeBSD.orig 2018-04-14 23:18:10 UTC
	2	+++ OS/os.h-FreeBSD
	3	@@ -12,6 +12,14 @@
	4	#define SIOCGIFCONF_GIVES_ADDR
	5	#define HAVE_SRANDOMDEV
	6	#define HAVE_ARC4RANDOM
	7	+/* Applications should not call arc4random_stir() explicitly after
	8	+ FreeBSD r227520 (approximately 1000002).
	9	+ Set NOT_HAVE_ARC4RANDOM_STIR if the version released is past
	10	+ that point. */
	11	+#include <sys/param.h>
	12	+#if __FreeBSD_version >= 1000002
	13	+# define NOT_HAVE_ARC4RANDOM_STIR
	14	+#endif
	15
	16	typedef struct flock flock_t;
	17

Line 0 Link Here

(-)dns/samba-nsupdate/files/patch-lib_isc_random.c (+12 lines)
	1	--- lib/isc/random.c.orig 2013-09-05 05:19:53 UTC
	2	+++ lib/isc/random.c
	3	@@ -68,7 +68,9 @@ isc_random_seed(isc_uint32_t seed)
	4	#ifndef HAVE_ARC4RANDOM
	5	srand(seed);
	6	#else
	7	+#ifdef arc4random_addrandom
	8	arc4random_addrandom((u_char *) &seed, sizeof(isc_uint32_t));
	9	+#endif
	10	#endif
	11	}
	12

Line 0 Link Here

(-)net-p2p/gtk-gnutella/files/patch-src_lib_arc4random.c (+14 lines)
	1	--- src/lib/arc4random.c.orig 2017-10-22 16:12:09 UTC
	2	+++ src/lib/arc4random.c
	3	@@ -298,9 +298,11 @@ arc4random64(void)
	4	void G_COLD
	5	arc4random_stir_once(void)
	6	{
	7	+#ifdef arc4random_stir
	8	static once_flag_t done;
	9
	10	once_flag_run(&done, arc4random_stir);
	11	+#endif
	12	}
	13
	14	/***

Line 0 Link Here

(-)net/relayd/files/patch-relayd_relayd.c (+12 lines)
	1	--- relayd/relayd.c.orig 2014-08-10 20:08:47 UTC
	2	+++ relayd/relayd.c
	3	@@ -241,8 +241,7 @@ main(int argc, char *argv[])
	4	log_info("startup");
	5
	6	#ifdef __FreeBSD__
	7	-#if __FreeBSD_version > 800040
	8	- arc4random_stir();
	9	+#if __FreeBSD_version > 1000002
	10	arc4random_buf(rnd, sizeof(rnd));
	11	RAND_seed(rnd, sizeof(rnd));
	12	#else