From add6abbeb743c6827d14a81f21de80d50c9109c3 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Sun, 26 Aug 2018 08:07:29 +0000 Subject: [PATCH] net-p2p/gtk-gnutella: Do not call arc4random_stir or arc4random_addrandom. PR: 230829, 230756 Approved by: portmgr (antoine) --- net-p2p/gtk-gnutella/Makefile | 1 + .../gtk-gnutella/files/patch-src_lib_arc4random.c | 14 ++++++++++++++ net-p2p/gtk-gnutella/files/patch-src_lib_random.c | 12 ++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 net-p2p/gtk-gnutella/files/patch-src_lib_arc4random.c create mode 100644 net-p2p/gtk-gnutella/files/patch-src_lib_random.c diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile index 8c497198caa3..91f37b655f1b 100644 --- a/net-p2p/gtk-gnutella/Makefile +++ b/net-p2p/gtk-gnutella/Makefile @@ -3,6 +3,7 @@ PORTNAME= gtk-gnutella PORTVERSION= 1.1.13 +PORTREVISION= 1 CATEGORIES= net-p2p ipv6 MASTER_SITES= SF diff --git a/net-p2p/gtk-gnutella/files/patch-src_lib_arc4random.c b/net-p2p/gtk-gnutella/files/patch-src_lib_arc4random.c new file mode 100644 index 000000000000..1219d7d70fdb --- /dev/null +++ b/net-p2p/gtk-gnutella/files/patch-src_lib_arc4random.c @@ -0,0 +1,14 @@ +--- 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 + } + + /*** diff --git a/net-p2p/gtk-gnutella/files/patch-src_lib_random.c b/net-p2p/gtk-gnutella/files/patch-src_lib_random.c new file mode 100644 index 000000000000..8a996aaee285 --- /dev/null +++ b/net-p2p/gtk-gnutella/files/patch-src_lib_random.c @@ -0,0 +1,12 @@ +--- src/lib/random.c.orig 2017-10-22 16:12:12 UTC ++++ src/lib/random.c +@@ -1058,7 +1058,9 @@ random_entropy(void *unused) + break; + case RANDOM_ARC4: + RANDOM_STATS_INC(arc4_distributed); ++#ifdef arc4random_addrandom + arc4random_addrandom(entropy, (int) ELEN); ++#endif + break; + case RANDOM_CMWC: + RANDOM_STATS_INC(cmwc_distributed);