Changes 2.0.14:

* Several SSL bufferevent fixes
* A Solaris sendfile bugfix
* A few other IOCP and rate-limiting bufferevent fixes
* Memory leak fixes
* Coverity fixes
* Portability and build fixes
* and more...

3 files changed, 35 insertions, 38 deletions

diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 7de325290db..4521aff9b82 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -1,32 +1,29 @@
-# $NetBSD: Makefile,v 1.38 2011/09/14 16:33:45 hans Exp $
-#
+# $NetBSD: Makefile,v 1.39 2011/10/03 11:48:11 adam Exp $
 
-DISTNAME=	libevent-2.0.10-stable
+DISTNAME=	libevent-2.0.14-stable
 PKGNAME=	${DISTNAME:S/-stable//}
-PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://monkey.org/~provos/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=levent/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://monkey.org/~provos/libevent/
+HOMEPAGE=	http://libevent.org/
 COMMENT=	Asynchronous event notification library
 LICENSE=	modified-bsd
 
-CONFLICTS+=	libev<3.9nb1
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-TEST_TARGET=	verify
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-LIBS.SunOS+=	-lnsl -lresolv
-CPPFLAGS.SunOS+=	-D__EXTENSIONS__
+CONFLICTS+=	libev<3.9nb1
 
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	libevent_openssl.pc.in
 PKGCONFIG_OVERRIDE+=	libevent_pthreads.pc.in
 PKGCONFIG_OVERRIDE+=	libevent.pc.in
-
 REPLACE_PYTHON=		event_rpcgen.py
+TEST_TARGET=		verify
+
+LIBS.SunOS+=	-lnsl -lresolv
+CPPFLAGS.SunOS+=	-D__EXTENSIONS__
 
 # XXX helps build, but needs more testing
 #CFLAGS.Interix+=	-Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32
diff --git a/devel/libevent/builtin.mk b/devel/libevent/builtin.mk
index 5350d5fa32b..e5a85607692 100644
--- a/devel/libevent/builtin.mk
+++ b/devel/libevent/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2009/11/13 17:31:07 drochner Exp $
+# $NetBSD: builtin.mk,v 1.11 2011/10/03 11:48:11 adam Exp $
 
 BUILTIN_PKG:=	libevent
 
@@ -27,19 +27,19 @@ MAKEVARS+=	IS_BUILTIN.libevent
 .if !defined(BUILTIN_PKG.libevent) && \
     !empty(IS_BUILTIN.libevent:M[yY][eE][sS]) && \
     empty(H_LIBEVENT:M__nonexistent__)
-.if empty(H_LIBEVENTCONFIG:M__nonexistent__)
+.  if empty(H_LIBEVENTCONFIG:M__nonexistent__)
 _BLTN_EVENT_1_4_11!= \
 	${GREP} -c 1.4.11-stable ${H_LIBEVENTCONFIG} || ${TRUE}
 _BLTN_EVENT_1_4_12!= \
 	${GREP} -c 1.4.12-stable ${H_LIBEVENTCONFIG} || ${TRUE}
-. if ${_BLTN_EVENT_1_4_12} == "1"
+.    if ${_BLTN_EVENT_1_4_12} == "1"
 BUILTIN_VERSION.libevent=	1.4.12
-. elif ${_BLTN_EVENT_1_4_11} == "1"
-BUILTIN_VERSION.libevent=       1.4.11
-. else
+.    elif ${_BLTN_EVENT_1_4_11} == "1"
+BUILTIN_VERSION.libevent=	1.4.11
+.    else
 BUILTIN_VERSION.libevent=	1.4.4
-. endif
-.else
+.    endif
+.  else
 # libevent>=1.3: bufferevent_base_set added
 _BLTN_EVENT_13!=	\
 	${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE}
@@ -72,30 +72,30 @@ _BLTN_EVENT_07b!=	\
 _BLTN_EVENT_06!=	\
 	${GREP} -c evtimer_ ${H_LIBEVENT} || ${TRUE}
 
-.  if ${_BLTN_EVENT_13} == "1"
+.    if ${_BLTN_EVENT_13} == "1"
 BUILTIN_VERSION.libevent=	1.3
-.  elif ${_BLTN_EVENT_12} == "1"
+.    elif ${_BLTN_EVENT_12} == "1"
 BUILTIN_VERSION.libevent=	1.2
-.  elif ${_BLTN_EVENT_11b} == "1"
+.    elif ${_BLTN_EVENT_11b} == "1"
 BUILTIN_VERSION.libevent=	1.1b
-.  elif ${_BLTN_EVENT_10d} == "1"
+.    elif ${_BLTN_EVENT_10d} == "1"
 BUILTIN_VERSION.libevent=	1.0d
-.  elif ${_BLTN_EVENT_10c} == "1"
+.    elif ${_BLTN_EVENT_10c} == "1"
 BUILTIN_VERSION.libevent=	1.0c
-.  elif ${_BLTN_EVENT_10} == "1"
+.    elif ${_BLTN_EVENT_10} == "1"
 BUILTIN_VERSION.libevent=	1.0
-.  elif ${_BLTN_EVENT_09} == "1"
+.    elif ${_BLTN_EVENT_09} == "1"
 BUILTIN_VERSION.libevent=	0.9
-.  elif ${_BLTN_EVENT_08} == "1"
+.    elif ${_BLTN_EVENT_08} == "1"
 BUILTIN_VERSION.libevent=	0.8
-.  elif ${_BLTN_EVENT_07b} == "1"
+.    elif ${_BLTN_EVENT_07b} == "1"
 BUILTIN_VERSION.libevent=	0.7b
-.  elif ${_BLTN_EVENT_06} == "1"
+.    elif ${_BLTN_EVENT_06} == "1"
 BUILTIN_VERSION.libevent=	0.6
-.  else
+.    else
 BUILTIN_VERSION.libevent=	0.5
+.    endif
 .  endif
-.endif
 BUILTIN_PKG.libevent=	libevent-${BUILTIN_VERSION.libevent}
 .endif
 MAKEVARS+=	BUILTIN_PKG.libevent
diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index b8439364538..5a8fe405a4b 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.25 2011/02/11 21:13:47 tnn Exp $
+$NetBSD: distinfo,v 1.26 2011/10/03 11:48:11 adam Exp $
 
-SHA1 (libevent-2.0.10-stable.tar.gz) = 21e26de201d55f47f9b340b014bd3b7a7d8b1f69
-RMD160 (libevent-2.0.10-stable.tar.gz) = 4a81ceda5fec37070b096c2a85f0e5ea22991a11
-Size (libevent-2.0.10-stable.tar.gz) = 793010 bytes
+SHA1 (libevent-2.0.14-stable.tar.gz) = b52b466f5a418744faf5f12b0fe3877cb7fb0b6e
+RMD160 (libevent-2.0.14-stable.tar.gz) = fc6379bb14c3aa48e7535f6f3cc461d29ad18839
+Size (libevent-2.0.14-stable.tar.gz) = 833520 bytes