Fri Sep 22 02:58:50 2017 UTC ()
libevent: remove redundant include, define __EXT_POSIX2 on QNX.

Should help QNX build the package, but still missing a fallback definition
for SA_RESTART.

Reported by Jan Danielsson on pkgsrc-users.


(maya)
diff -r1.51 -r1.52 pkgsrc/devel/libevent/Makefile
diff -r1.34 -r1.35 pkgsrc/devel/libevent/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/libevent/patches/patch-evutil__rand.c
diff -r0 -r1.1 pkgsrc/devel/libevent/patches/patch-test_bench__cascade.c
cvs diff -r1.51 -r1.52 pkgsrc/devel/libevent/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libevent/Makefile 2017/02/15 17:34:37 1.51
+++ pkgsrc/devel/libevent/Makefile 2017/09/22 02:58:50 1.52
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.51 2017/02/15 17:34:37 adam Exp $ 1# $NetBSD: Makefile,v 1.52 2017/09/22 02:58:50 maya Exp $
2 2
3.include "../../devel/libevent/Makefile.common" 3.include "../../devel/libevent/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/-stable//} 5PKGNAME= ${DISTNAME:S/-stable//}
6COMMENT= Asynchronous event notification library 6COMMENT= Asynchronous event notification library
7 7
8CONFLICTS+= libev<3.9nb1 8CONFLICTS+= libev<3.9nb1
9 9
10USE_LIBTOOL= yes 10USE_LIBTOOL= yes
11GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
12PKGCONFIG_OVERRIDE+= libevent_core.pc.in 12PKGCONFIG_OVERRIDE+= libevent_core.pc.in
13PKGCONFIG_OVERRIDE+= libevent_extra.pc.in 13PKGCONFIG_OVERRIDE+= libevent_extra.pc.in
14PKGCONFIG_OVERRIDE+= libevent_openssl.pc.in 14PKGCONFIG_OVERRIDE+= libevent_openssl.pc.in
15PKGCONFIG_OVERRIDE+= libevent_pthreads.pc.in 15PKGCONFIG_OVERRIDE+= libevent_pthreads.pc.in
16PKGCONFIG_OVERRIDE+= libevent.pc.in 16PKGCONFIG_OVERRIDE+= libevent.pc.in
17TEST_TARGET= verify 17TEST_TARGET= verify
18 18
19LIBS.SunOS+= -lnsl -lresolv 19LIBS.SunOS+= -lnsl -lresolv
20CPPFLAGS.SunOS+= -D__EXTENSIONS__ 20CPPFLAGS.SunOS+= -D__EXTENSIONS__
 21CPPFLAGS.QNX+= -D__EXT_POSIX2
21 22
22# XXX helps build, but needs more testing 23# XXX helps build, but needs more testing
23#CFLAGS.Interix+= -Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32 24#CFLAGS.Interix+= -Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32
24 25
25.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
26 27
27# Explicitly disable epoll on illumos, provided for Linux compat only. 28# Explicitly disable epoll on illumos, provided for Linux compat only.
28CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_ctl=no 29CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_ctl=no
29 30
30.if !empty(MACHINE_PLATFORM:MHPUX-11.11-*) 31.if !empty(MACHINE_PLATFORM:MHPUX-11.11-*)
31CONFIGURE_ENV+= ac_cv_func_strtoll=yes 32CONFIGURE_ENV+= ac_cv_func_strtoll=yes
32CPPFLAGS+= -Dstrtoll=__strtoll 33CPPFLAGS+= -Dstrtoll=__strtoll
33.endif 34.endif
cvs diff -r1.34 -r1.35 pkgsrc/devel/libevent/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libevent/distinfo 2017/03/08 13:37:55 1.34
+++ pkgsrc/devel/libevent/distinfo 2017/09/22 02:58:50 1.35
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.34 2017/03/08 13:37:55 jperkin Exp $ 1$NetBSD: distinfo,v 1.35 2017/09/22 02:58:50 maya Exp $
2 2
3SHA1 (libevent-2.1.8-stable.tar.gz) = 2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec 3SHA1 (libevent-2.1.8-stable.tar.gz) = 2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec
4RMD160 (libevent-2.1.8-stable.tar.gz) = 6c7ce8cb51279f9b6b8d8897192db6a2da3d6797 4RMD160 (libevent-2.1.8-stable.tar.gz) = 6c7ce8cb51279f9b6b8d8897192db6a2da3d6797
5SHA512 (libevent-2.1.8-stable.tar.gz) = a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17 5SHA512 (libevent-2.1.8-stable.tar.gz) = a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
6Size (libevent-2.1.8-stable.tar.gz) = 1026485 bytes 6Size (libevent-2.1.8-stable.tar.gz) = 1026485 bytes
7SHA1 (patch-Makefile.in) = 09c7524eb8657e1f76232db97273806a8c900219 7SHA1 (patch-Makefile.in) = 09c7524eb8657e1f76232db97273806a8c900219
8SHA1 (patch-evutil__rand.c) = 92af79099f2344cbda7ce4d23e10835df583999b 8SHA1 (patch-evutil__rand.c) = 2b51e719d25181e03b5afb7df0bf443f1d62a8f1
 9SHA1 (patch-test_bench__cascade.c) = 58bd32fe0cddc468fda57386283b5298b28ef93e
cvs diff -r1.3 -r1.4 pkgsrc/devel/libevent/patches/Attic/patch-evutil__rand.c (expand / switch to unified diff)

--- pkgsrc/devel/libevent/patches/Attic/patch-evutil__rand.c 2017/03/08 13:37:55 1.3
+++ pkgsrc/devel/libevent/patches/Attic/patch-evutil__rand.c 2017/09/22 02:58:50 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: patch-evutil__rand.c,v 1.3 2017/03/08 13:37:55 jperkin Exp $ 1$NetBSD: patch-evutil__rand.c,v 1.4 2017/09/22 02:58:50 maya Exp $
2 2
3Native illumos arc4random(3C) imported the latest OpenBSD API which 3Native illumos arc4random(3C) imported the latest OpenBSD API which
4does not have arc4random_addrandom(). 4does not have arc4random_addrandom().
5 5
6--- evutil_rand.c.orig 2013-11-01 18:18:57.000000000 +0000 6--- evutil_rand.c.orig 2016-10-04 19:55:31.000000000 +0000
7+++ evutil_rand.c 7+++ evutil_rand.c
8@@ -195,7 +195,9 @@ evutil_secure_rng_get_bytes(void *buf, s 8@@ -195,8 +195,10 @@ evutil_secure_rng_get_bytes(void *buf, s
9 void 9 void
10 evutil_secure_rng_add_bytes(const char *buf, size_t n) 10 evutil_secure_rng_add_bytes(const char *buf, size_t n)
11 { 11 {
12+#if !(defined(EVENT__HAVE_ARC4RANDOM) && defined(__sun)) 12+#if !(defined(EVENT__HAVE_ARC4RANDOM) && defined(__sun))
13 arc4random_addrandom((unsigned char*)buf, 13 arc4random_addrandom((unsigned char*)buf,
14 n>(size_t)INT_MAX ? INT_MAX : (int)n); 14 n>(size_t)INT_MAX ? INT_MAX : (int)n);
15+#endif 15+#endif
16 } 16 }
17  17
 18 void
File Added: pkgsrc/devel/libevent/patches/Attic/patch-test_bench__cascade.c
$NetBSD: patch-test_bench__cascade.c,v 1.1 2017/09/22 02:58:50 maya Exp $

Remove redundant include (absent in QNX 6.5)

--- test/bench_cascade.c.orig	2016-10-04 19:55:31.000000000 +0000
+++ test/bench_cascade.c
@@ -48,7 +48,6 @@
 #include <unistd.h>
 #endif
 #include <errno.h>
-#include <getopt.h>
 #include <event.h>
 #include <evutil.h>