cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to upstream's code for arc4random_addrandom removal, suggested by

Browse Source 
Pablo Méndez Hernández
This commit is contained in:
sthen 2013-10-23 13:14:07 +00:00
parent 31a110625f
commit fc1cab1dc1
3 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/dnscrypt-proxy/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2013/10/23 12:42:20 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2013/10/23 13:14:07 sthen Exp $
COMMENT-main= secure communications between a DNS client and resolver
COMMENT-plugins= example plugins for dnscrypt-proxy
V= 1.3.3
REVISION= 0
DISTNAME= dnscrypt-proxy-${V}
CATEGORIES= net
@ -53,6 +54,15 @@ DOCS= README-PLUGINS.markdown \
README.markdown \
TECHNOTES
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.14
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
post-patch:
cd ${WRKSRC}/src/libevent-modified; \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} sh ./autogen.sh
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dnscrypt-proxy
cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/dnscrypt-proxy

19
net/dnscrypt-proxy/patches/patch-src_libevent-modified_configure_ac Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_libevent-modified_configure_ac,v 1.1 2013/10/23 13:14:07 sthen Exp $
From cab22b04c04c0b710acff69c8c2e9bbb0d94bde7 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 22 Oct 2013 13:05:32 -0700
Subject: [PATCH] Check for arc4random_addrandom() presence - Needed for
OpenBSD-current.
--- src/libevent-modified/configure.ac.orig Wed Oct 23 14:00:22 2013
+++ src/libevent-modified/configure.ac Wed Oct 23 14:00:37 2013
@@ -291,7 +291,7 @@ AC_HEADER_TIME
dnl Checks for library functions.
AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep])
-AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
+AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf arc4random_addrandom issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
AC_CHECK_FUNCS([umask])
AC_CACHE_CHECK(

54
net/dnscrypt-proxy/patches/patch-src_libevent-modified_evutil_rand_c
View File

@ -1,45 +1,23 @@
$OpenBSD: patch-src_libevent-modified_evutil_rand_c,v 1.1 2013/10/23 12:42:20 sthen Exp $
$OpenBSD: patch-src_libevent-modified_evutil_rand_c,v 1.2 2013/10/23 13:14:07 sthen Exp $
OpenBSD has not needed arc4random_addrandom since 2003, and no longer
provides it.
From cab22b04c04c0b710acff69c8c2e9bbb0d94bde7 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 22 Oct 2013 13:05:32 -0700
Subject: [PATCH] Check for arc4random_addrandom() presence - Needed for
OpenBSD-current.
--- src/libevent-modified/evutil_rand.c.orig Tue Aug 13 03:32:00 2013
+++ src/libevent-modified/evutil_rand.c Wed Oct 23 13:10:29 2013
@@ -97,6 +97,11 @@ ev_arc4random_buf(void *buf, size_t n)
#endif
}
+void
+evutil_secure_rng_add_bytes(const char *buf, size_t n)
+{
+}
+
#else /* !_EVENT_HAVE_ARC4RANDOM { */
#ifdef _EVENT_ssize_t
@@ -144,18 +149,18 @@ ev_arc4random_buf(void *buf, size_t n)
arc4random_buf(buf, n);
}
-#endif /* } !_EVENT_HAVE_ARC4RANDOM */
+++ src/libevent-modified/evutil_rand.c Wed Oct 23 14:01:05 2013
@@ -155,7 +155,12 @@ evutil_secure_rng_get_bytes(void *buf, size_t n)
void
-evutil_secure_rng_get_bytes(void *buf, size_t n)
+evutil_secure_rng_add_bytes(const char *buf, size_t n)
evutil_secure_rng_add_bytes(const char *buf, size_t n)
{
- ev_arc4random_buf(buf, n);
+ arc4_addrandom((unsigned char*)buf,
+ n>(size_t)INT_MAX ? INT_MAX : (int)n);
+#ifdef HAVE_ARC4RANDOM_ADDRANDOM
arc4random_addrandom((unsigned char*)buf,
n>(size_t)INT_MAX ? INT_MAX : (int)n);
+#else
+ (void) buf;
+ (void) n;
+#endif
}
+#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);
}
-