FreeBSD Bugzilla – Attachment 196464 Details for
Bug 230756
[exp-run] Remove arc4random_stir and arc4random_addrandom
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Combined patchset for ports tree
accumulative.patch (text/plain), 6.63 KB, created by
Xin LI
on 2018-08-23 06:12:00 UTC
(
hide
)
Description:
Combined patchset for ports tree
Filename:
MIME Type:
Creator:
Xin LI
Created:
2018-08-23 06:12:00 UTC
Size:
6.63 KB
patch
obsolete
>Index: textproc/htmldoc/Makefile >=================================================================== >--- textproc/htmldoc/Makefile (revision 477852) >+++ textproc/htmldoc/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= htmldoc > PORTVERSION= 1.8.28 >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= textproc > MASTER_SITES= https://github.com/michaelrsweet/htmldoc/releases/download/release-${PORTVERSION}/ > DISTNAME= ${PORTNAME}-${PORTVERSION}-source >Index: textproc/htmldoc/files/patch-htmldoc__http.c >=================================================================== >--- textproc/htmldoc/files/patch-htmldoc__http.c (revision 477852) >+++ textproc/htmldoc/files/patch-htmldoc__http.c (working copy) >@@ -5,7 +5,7 @@ > * it is the best we can do (on others, this seed isn't even used...) > */ > +#define CUPS_RAND() arc4random() >-+#define CUPS_SRAND(v) arc4random_stir() >++#define CUPS_SRAND(v) > > CUPS_SRAND(time(NULL)); > >Index: net/samba48/Makefile >=================================================================== >--- net/samba48/Makefile (revision 477853) >+++ net/samba48/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= ${SAMBA4_BASENAME}48 > PORTVERSION= ${SAMBA4_VERSION} >-PORTREVISION= 0 >+PORTREVISION= 1 > CATEGORIES?= net > MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc > DISTNAME= ${SAMBA4_DISTNAME} >Index: net/samba48/files/patch-source4__heimdal__lib__roken__rand.c >=================================================================== >--- net/samba48/files/patch-source4__heimdal__lib__roken__rand.c (nonexistent) >+++ net/samba48/files/patch-source4__heimdal__lib__roken__rand.c (working copy) >@@ -0,0 +1,10 @@ >+--- source4/heimdal/lib/roken/rand.c.orig 2018-01-14 12:41:58.000000000 -0800 >++++ source4/heimdal/lib/roken/rand.c 2018-08-22 22:11:26.937151714 -0700 >+@@ -37,7 +37,6 @@ >+ rk_random_init(void) >+ { >+ #if defined(HAVE_ARC4RANDOM) >+- arc4random_stir(); >+ #elif defined(HAVE_SRANDOMDEV) >+ srandomdev(); >+ #elif defined(HAVE_RANDOM) >Index: security/heimdal/Makefile >=================================================================== >--- security/heimdal/Makefile (revision 477855) >+++ security/heimdal/Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= heimdal > PORTVERSION= 7.5.0 >+PORTREVISION= 1 > CATEGORIES= security ipv6 > MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/ > >Index: security/heimdal/files/patch-lib_roken_rand.c >=================================================================== >--- security/heimdal/files/patch-lib_roken_rand.c (nonexistent) >+++ security/heimdal/files/patch-lib_roken_rand.c (working copy) >@@ -0,0 +1,10 @@ >+--- lib/roken/rand.c.orig 2016-12-20 14:23:06 UTC >++++ lib/roken/rand.c >+@@ -42,7 +42,6 @@ void ROKEN_LIB_FUNCTION >+ rk_random_init(void) >+ { >+ #if defined(HAVE_ARC4RANDOM) >+- arc4random_stir(); >+ #elif defined(HAVE_SRANDOMDEV) >+ srandomdev(); >+ #elif defined(HAVE_RANDOM) >Index: mail/exim/Makefile >=================================================================== >--- mail/exim/Makefile (revision 477847) >+++ mail/exim/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= exim > PORTVERSION?= ${EXIM_VERSION} >-PORTREVISION= 2 >+PORTREVISION= 3 > CATEGORIES= mail ipv6 > MASTER_SITES= EXIM:exim > MASTER_SITE_SUBDIR= /exim4/:exim \ >Index: mail/exim/files/patch-OS_os.h-FreeBSD >=================================================================== >--- mail/exim/files/patch-OS_os.h-FreeBSD (nonexistent) >+++ mail/exim/files/patch-OS_os.h-FreeBSD (working copy) >@@ -0,0 +1,17 @@ >+--- 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; >+ >Index: dns/samba-nsupdate/Makefile >=================================================================== >--- dns/samba-nsupdate/Makefile (revision 477847) >+++ dns/samba-nsupdate/Makefile (working copy) >@@ -2,7 +2,7 @@ > > PORTNAME= nsupdate > PORTVERSION= 9.8.6 >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= dns net ipv6 > MASTER_SITES= ISC/bind9/${ISCVERSION} > PKGNAMEPREFIX= samba- >Index: dns/samba-nsupdate/files/patch-lib_isc_random.c >=================================================================== >--- dns/samba-nsupdate/files/patch-lib_isc_random.c (nonexistent) >+++ dns/samba-nsupdate/files/patch-lib_isc_random.c (working copy) >@@ -0,0 +1,12 @@ >+--- 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 >+ } >+ >Index: net-p2p/gtk-gnutella/Makefile >=================================================================== >--- net-p2p/gtk-gnutella/Makefile (revision 477847) >+++ net-p2p/gtk-gnutella/Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= gtk-gnutella > PORTVERSION= 1.1.13 >+PORTREVISION= 1 > CATEGORIES= net-p2p ipv6 > MASTER_SITES= SF > >Index: net-p2p/gtk-gnutella/files/patch-src_lib_arc4random.c >=================================================================== >--- net-p2p/gtk-gnutella/files/patch-src_lib_arc4random.c (nonexistent) >+++ net-p2p/gtk-gnutella/files/patch-src_lib_arc4random.c (working copy) >@@ -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 >+ } >+ >+ /*** >Index: net/relayd/Makefile >=================================================================== >--- net/relayd/Makefile (revision 477852) >+++ net/relayd/Makefile (working copy) >@@ -2,7 +2,7 @@ > > PORTNAME= relayd > PORTVERSION= 5.5.20140810 >-PORTREVISION= 2 >+PORTREVISION= 3 > CATEGORIES= net > > MAINTAINER= mm@FreeBSD.org >Index: net/relayd/files/patch-relayd_relayd.c >=================================================================== >--- net/relayd/files/patch-relayd_relayd.c (nonexistent) >+++ net/relayd/files/patch-relayd_relayd.c (working copy) >@@ -0,0 +1,12 @@ >+--- 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 230756
:
196358
| 196464 |
196541
|
196542