CVS commit: pkgsrc/devel/libevent

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Sep 22 02:58:50 UTC 2017

Modified Files:
        pkgsrc/devel/libevent: Makefile distinfo
        pkgsrc/devel/libevent/patches: patch-evutil__rand.c
Added Files:
        pkgsrc/devel/libevent/patches: patch-test_bench__cascade.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/libevent/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/libevent/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libevent/patches/patch-evutil__rand.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libevent/patches/patch-test_bench__cascade.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libevent/Makefile
diff -u pkgsrc/devel/libevent/Makefile:1.51 pkgsrc/devel/libevent/Makefile:1.52
--- pkgsrc/devel/libevent/Makefile:1.51 Wed Feb 15 17:34:37 2017
+++ pkgsrc/devel/libevent/Makefile      Fri Sep 22 02:58:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2017/02/15 17:34:37 adam Exp $
+# $NetBSD: Makefile,v 1.52 2017/09/22 02:58:50 maya Exp $
 
 .include "../../devel/libevent/Makefile.common"
 
@@ -18,6 +18,7 @@ TEST_TARGET=          verify
 
 LIBS.SunOS+=           -lnsl -lresolv
 CPPFLAGS.SunOS+=       -D__EXTENSIONS__
+CPPFLAGS.QNX+=         -D__EXT_POSIX2
 
 # XXX helps build, but needs more testing
 #CFLAGS.Interix+=      -Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32

Index: pkgsrc/devel/libevent/distinfo
diff -u pkgsrc/devel/libevent/distinfo:1.34 pkgsrc/devel/libevent/distinfo:1.35
--- pkgsrc/devel/libevent/distinfo:1.34 Wed Mar  8 13:37:55 2017
+++ pkgsrc/devel/libevent/distinfo      Fri Sep 22 02:58:50 2017
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.34 2017/03/08 13:37:55 jperkin Exp $
+$NetBSD: distinfo,v 1.35 2017/09/22 02:58:50 maya Exp $
 
 SHA1 (libevent-2.1.8-stable.tar.gz) = 2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec
 RMD160 (libevent-2.1.8-stable.tar.gz) = 6c7ce8cb51279f9b6b8d8897192db6a2da3d6797
 SHA512 (libevent-2.1.8-stable.tar.gz) = a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
 Size (libevent-2.1.8-stable.tar.gz) = 1026485 bytes
 SHA1 (patch-Makefile.in) = 09c7524eb8657e1f76232db97273806a8c900219
-SHA1 (patch-evutil__rand.c) = 92af79099f2344cbda7ce4d23e10835df583999b
+SHA1 (patch-evutil__rand.c) = 2b51e719d25181e03b5afb7df0bf443f1d62a8f1
+SHA1 (patch-test_bench__cascade.c) = 58bd32fe0cddc468fda57386283b5298b28ef93e

Index: pkgsrc/devel/libevent/patches/patch-evutil__rand.c
diff -u pkgsrc/devel/libevent/patches/patch-evutil__rand.c:1.3 pkgsrc/devel/libevent/patches/patch-evutil__rand.c:1.4
--- pkgsrc/devel/libevent/patches/patch-evutil__rand.c:1.3      Wed Mar  8 13:37:55 2017
+++ pkgsrc/devel/libevent/patches/patch-evutil__rand.c  Fri Sep 22 02:58:50 2017
@@ -1,11 +1,11 @@
-$NetBSD: patch-evutil__rand.c,v 1.3 2017/03/08 13:37:55 jperkin Exp $
+$NetBSD: patch-evutil__rand.c,v 1.4 2017/09/22 02:58:50 maya Exp $
 
 Native illumos arc4random(3C) imported the latest OpenBSD API which
 does not have arc4random_addrandom().
 
---- evutil_rand.c.orig 2013-11-01 18:18:57.000000000 +0000
+--- evutil_rand.c.orig 2016-10-04 19:55:31.000000000 +0000
 +++ evutil_rand.c
-@@ -195,7 +195,9 @@ evutil_secure_rng_get_bytes(void *buf, s
+@@ -195,8 +195,10 @@ evutil_secure_rng_get_bytes(void *buf, s
  void
  evutil_secure_rng_add_bytes(const char *buf, size_t n)
  {
@@ -15,3 +15,4 @@ does not have arc4random_addrandom().
 +#endif
  }
  
+ void

Added files:

Index: pkgsrc/devel/libevent/patches/patch-test_bench__cascade.c
diff -u /dev/null pkgsrc/devel/libevent/patches/patch-test_bench__cascade.c:1.1
--- /dev/null   Fri Sep 22 02:58:50 2017
+++ pkgsrc/devel/libevent/patches/patch-test_bench__cascade.c   Fri Sep 22 02:58:50 2017
@@ -0,0 +1,14 @@
+$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>
+