Update libevent to 1.4.13.

This is the core library only, the DNS parts are removed and it does not
include the other extra bits (HTTP, DNS, and RPC), a separate port for
these will appear in due course.

Thanks to jsg, sthen, alek, gilles, jacekm, bernd and any others I've
forgotten for testing/comments.

Note that /usr/include/evdns.h should be removed after updating.

ok deraadt

1 files changed, 70 insertions, 37 deletions

diff --git a/lib/libevent/Makefile b/lib/libevent/Makefile
index 457d36b9610..c3de4ef7aac 100644
--- a/lib/libevent/Makefile
+++ b/lib/libevent/Makefile
@@ -1,61 +1,94 @@
-#	$OpenBSD: Makefile,v 1.28 2008/05/02 09:18:26 jmc Exp $
+#	$OpenBSD: Makefile,v 1.29 2010/04/21 20:02:40 nicm Exp $
 
 LIB=	event
 WANTLINT=
-SRCS=	buffer.c evbuffer.c evdns.c event.c event_tagging.c kqueue.c \
+SRCS=	buffer.c evbuffer.c event.c event_tagging.c evutil.c kqueue.c \
 	log.c poll.c select.c signal.c
-HDRS=	event.h evdns.h
-MAN=	evdns.3 event.3
-MLINKS=	event.3 event_init.3 event.3 event_dispatch.3 event.3 event_loop.3 \
-	event.3 event_loopexit.3 event.3 event_set.3 \
-	event.3 event_base_dispatch.3 event.3 event_base_loop.3 \
-	event.3 event_base_loopexit.3 event.3 event_base_set.3 \
-	event.3 event_base_free.3 event.3 event_add.3 event.3 event_del.3 \
-	event.3 event_once.3 event.3 event_base_once.3 \
-	event.3 event_pending.3 event.3 event_initialized.3 \
-	event.3 event_priority_init.3 event.3 event_priority_set.3 \
-	event.3 evtimer_set.3 event.3 evtimer_add.3 \
-	event.3 evtimer_del.3 event.3 evtimer_pending.3 \
-	event.3 evtimer_initialized.3 event.3 signal_set.3 \
-	event.3 signal_add.3 event.3 signal_del.3 event.3 signal_pending.3 \
-	event.3 signal_initialized.3 event.3 bufferevent_new.3 \
-	event.3 bufferevent_free.3 event.3 bufferevent_write.3 \
-	event.3 bufferevent_write_buffer.3 event.3 bufferevent_read.3 \
-	event.3 bufferevent_enable.3 event.3 bufferevent_disable.3 \
-	event.3 bufferevent_settimeout.3 event.3 bufferevent_base_set.3 \
-	event.3 evbuffer_new.3 event.3 evbuffer_free.3 event.3 evbuffer_add.3 \
-	event.3 evbuffer_add_buffer.3 event.3 evbuffer_add_printf.3 \
-	event.3 evbuffer_add_vprintf.3 event.3 evbuffer_drain.3 \
-	event.3 evbuffer_write.3 event.3 evbuffer_read.3 \
-	event.3 evbuffer_find.3 event.3 evbuffer_readline.3 \
-	evdns.3 evdns_init.3 evdns.3 evdns_shutdown.3 \
-	evdns.3 evdns_err_to_string.3 evdns.3 evdns_nameserver_add.3 \
-	evdns.3 evdns_count_nameservers.3 \
-	evdns.3 evdns_clear_nameservers_and_suspend.3 \
-	evdns.3 evdns_resume.3 evdns.3 evdns_nameserver_ip_add.3 \
-	evdns.3 evdns_resolve_ipv4.3 evdns.3 evdns_resolve_reverse.3 \
-	evdns.3 evdns_resolv_conf_parse.3 evdns.3 evdns_search_clear.3 \
-	evdns.3 evdns_search_add.3 evdns.3 evdns_search_ndots_set.3 \
-	evdns.3 evdns_set_log_fn.3
+HDRS=	event.h event-config.h evutil.h
+MAN=	event.3
+MLINKS=	event.3 bufferevent_base_set.3 \
+	event.3 bufferevent_disable.3 \
+	event.3 bufferevent_enable.3 \
+	event.3 bufferevent_free.3 \
+	event.3 bufferevent_new.3 \
+	event.3 bufferevent_read.3 \
+	event.3 bufferevent_settimeout.3 \
+	event.3 bufferevent_write.3 \
+	event.3 bufferevent_write_buffer.3 \
+	event.3 evbuffer_add.3 \
+	event.3 evbuffer_add_buffer.3 \
+	event.3 evbuffer_add_printf.3 \
+	event.3 evbuffer_add_vprintf.3 \
+	event.3 evbuffer_drain.3 \
+	event.3 evbuffer_find.3 \
+	event.3 evbuffer_free.3 \
+	event.3 evbuffer_new.3 \
+	event.3 evbuffer_read.3 \
+	event.3 evbuffer_readline.3 \
+	event.3 evbuffer_write.3 \
+	event.3 event_add.3 \
+	event.3 event_base_dispatch.3 \
+	event.3 event_base_free.3 \
+	event.3 event_base_loop.3 \
+	event.3 event_base_loopbreak.3 \
+	event.3 event_base_loopexit.3 \
+	event.3 event_base_once.3 \
+	event.3 event_base_set.3 \
+	event.3 event_del.3 \
+	event.3 event_dispatch.3 \
+	event.3 event_init.3 \
+	event.3 event_initialized.3 \
+	event.3 event_loop.3 \
+	event.3 event_loopbreak.3 \
+	event.3 event_loopexit.3 \
+	event.3 event_once.3 \
+	event.3 event_pending.3 \
+	event.3 event_priority_init.3 \
+	event.3 event_priority_set.3 \
+	event.3 event_set.3 \
+	event.3 evtimer_add.3 \
+	event.3 evtimer_del.3 \
+	event.3 evtimer_initialized.3 \
+	event.3 evtimer_pending.3 \
+	event.3 evtimer_set.3 \
+	event.3 signal_add.3 \
+	event.3 signal_del.3 \
+	event.3 signal_initialized.3 \
+	event.3 signal_pending.3 \
+	event.3 signal_set.3
 
 CFLAGS+= -I${.CURDIR} -DNDEBUG \
-	-DDNS_USE_ARC4RANDOM_FOR_ID \
 	-DHAVE_CLOCK_GETTIME \
 	-DHAVE_CLOCK_MONOTONIC \
 	-DHAVE_FCNTL_H \
+	-DHAVE_FD_MASK \
 	-DHAVE_GETADDRINFO \
+	-DHAVE_GETEGID \
+	-DHAVE_GETEUID \
 	-DHAVE_GETNAMEINFO \
+	-DHAVE_INTTYPES_H \
+	-DHAVE_ISSETUGID \
 	-DHAVE_POLL \
 	-DHAVE_SELECT \
 	-DHAVE_SETFD \
+	-DHAVE_SIGACTION \
 	-DHAVE_STDARG_H \
 	-DHAVE_STDINT_H \
+	-DHAVE_STDLIB_H \
+	-DHAVE_STRLCPY \
 	-DHAVE_STRSEP \
 	-DHAVE_STRTOK_R \
+	-DHAVE_STRTOLL \
 	-DHAVE_STRUCT_IN6_ADDR \
 	-DHAVE_SYS_IOCTL_H \
+	-DHAVE_SYS_PARAM_H \
+	-DHAVE_SYS_QUEUE_H \
+	-DHAVE_SYS_SELECT_H \
+	-DHAVE_SYS_SOCKET_H \
+	-DHAVE_SYS_STAT_H \
 	-DHAVE_SYS_TIME_H \
-	-DHAVE_UNISTD_H \
+	-DHAVE_SYS_TYPES_H \
+	-DHAVE_TAILQFOREACH \
 	-DHAVE_UNISTD_H \
 	-DHAVE_VASPRINTF \
 	-DHAVE_WORKING_KQUEUE