security fix. lightly tested here; "make test" looks similar to before and i've tried it with a few programs. anyone else want to give it a spin?
Index: Makefile =================================================================== RCS file: /cvs/ports/devel/libevent2/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile 11 Nov 2013 21:54:57 -0000 1.10 +++ Makefile 6 Jan 2015 00:05:32 -0000 @@ -2,22 +2,21 @@ COMMENT= event notification library -V= 2.0.21 +V= 2.0.22 DISTNAME= libevent-$V-stable PKGNAME= libevent-$V -REVISION= 1 CATEGORIES= devel HOMEPAGE= http://monkey.org/~provos/libevent/ -SHARED_LIBS+= event_core 1.0 # 6.5 -SHARED_LIBS+= event_extra 0.1 # 6.5 -SHARED_LIBS+= event_openssl 0.0 # 6.5 -SHARED_LIBS+= event_pthreads 0.0 # 6.5 +SHARED_LIBS+= event_core 1.1 # 6.9 +SHARED_LIBS+= event_extra 0.1 # 6.9 +SHARED_LIBS+= event_openssl 0.0 # 6.9 +SHARED_LIBS+= event_pthreads 0.0 # 6.9 # BSD PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= https://github.com/downloads/libevent/libevent/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=levent/} WANTLIB= crypto pthread ssl Index: distinfo =================================================================== RCS file: /cvs/ports/devel/libevent2/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 11 Dec 2012 11:59:31 -0000 1.6 +++ distinfo 6 Jan 2015 00:05:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (libevent-2.0.21-stable.tar.gz) = IqUwqKW6HLnAgMugMyBrF9rNIUN3YhVcbTDuZGn1dPU= -SIZE (libevent-2.0.21-stable.tar.gz) = 850772 +SHA256 (libevent-2.0.22-stable.tar.gz) = ccLEnwra2s/b5jMqNyw4z5yLeJW7c9q+qlPNzB1OH6M= +SIZE (libevent-2.0.22-stable.tar.gz) = 854987 Index: patches/patch-evutil_rand_c =================================================================== RCS file: /cvs/ports/devel/libevent2/patches/patch-evutil_rand_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-evutil_rand_c --- patches/patch-evutil_rand_c 11 Nov 2013 21:54:57 -0000 1.2 +++ patches/patch-evutil_rand_c 6 Jan 2015 00:05:32 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-evutil_rand_c,v 1.2 2013/11/11 21:54:57 landry Exp $ OpenBSD does not need nor provide arc4random_addrandom anymore. And evutil_secure_rng_add_bytes is a bad API anyway. ---- evutil_rand.c.orig Thu Aug 2 17:36:53 2012 -+++ evutil_rand.c Mon Nov 11 22:41:15 2013 -@@ -150,10 +150,3 @@ evutil_secure_rng_get_bytes(void *buf, size_t n) +--- evutil_rand.c.orig Mon Jan 5 15:17:40 2015 ++++ evutil_rand.c Mon Jan 5 23:01:59 2015 +@@ -171,10 +171,3 @@ evutil_secure_rng_get_bytes(void *buf, size_t n) ev_arc4random_buf(buf, n); } Index: patches/patch-include_event2_util_h =================================================================== RCS file: /cvs/ports/devel/libevent2/patches/patch-include_event2_util_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-include_event2_util_h --- patches/patch-include_event2_util_h 11 Nov 2013 21:54:57 -0000 1.1 +++ patches/patch-include_event2_util_h 6 Jan 2015 00:05:32 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-include_event2_util_h,v 1.1 2013/11/11 21:54:57 landry Exp $ ---- include/event2/util.h.orig Mon Nov 11 22:39:31 2013 -+++ include/event2/util.h Mon Nov 11 22:40:21 2013 -@@ -672,22 +672,6 @@ void evutil_secure_rng_get_bytes(void *buf, size_t n); +--- include/event2/util.h.orig Mon Jan 5 15:17:40 2015 ++++ include/event2/util.h Mon Jan 5 23:01:59 2015 +@@ -690,22 +690,6 @@ int evutil_secure_rng_init(void); */ - int evutil_secure_rng_init(void); + int evutil_secure_rng_set_urandom_device_file(char *fname); -/** Seed the random number generator with extra random bytes. - Index: patches/patch-test_Makefile_in =================================================================== RCS file: patches/patch-test_Makefile_in diff -N patches/patch-test_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-test_Makefile_in 6 Jan 2015 00:05:32 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +gmake-ism + +--- test/Makefile.in.orig Tue Jan 6 00:01:53 2015 ++++ test/Makefile.in Tue Jan 6 00:02:01 2015 +@@ -1068,7 +1068,7 @@ uninstall-am: + + + test-script.sh: test.sh +- cp $< $@ ++ cp test.sh $@ + + regress.gen.c regress.gen.h: rpcgen-attempted + Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- pkg/PFRAG.shared 23 Sep 2011 08:50:12 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,5 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/09/23 08:50:12 naddy Exp $ -@lib lib/libevent_core.so.${LIBevent_core_VERSION} -@lib lib/libevent_extra.so.${LIBevent_extra_VERSION} -@lib lib/libevent_openssl.so.${LIBevent_openssl_VERSION} -@lib lib/libevent_pthreads.so.${LIBevent_pthreads_VERSION} Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/libevent2/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 23 Sep 2011 08:50:12 -0000 1.1.1.1 +++ pkg/PLIST 6 Jan 2015 00:05:32 -0000 @@ -1,5 +1,4 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2011/09/23 08:50:12 naddy Exp $ -%%SHARED%% bin/event_rpcgen.py include/event2/ include/event2/buffer.h @@ -29,13 +28,16 @@ include/event2/thread.h include/event2/util.h lib/libevent_core.a lib/libevent_core.la +@lib lib/libevent_core.so.${LIBevent_core_VERSION} lib/libevent_extra.a lib/libevent_extra.la +@lib lib/libevent_extra.so.${LIBevent_extra_VERSION} lib/libevent_openssl.a lib/libevent_openssl.la +@lib lib/libevent_openssl.so.${LIBevent_openssl_VERSION} lib/libevent_pthreads.a lib/libevent_pthreads.la -lib/pkgconfig/ +@lib lib/libevent_pthreads.so.${LIBevent_pthreads_VERSION} lib/pkgconfig/libevent.pc lib/pkgconfig/libevent_openssl.pc lib/pkgconfig/libevent_pthreads.pc
