Re-add libevent from git, remove all build files

.gitignore

@@ -27,63 +27,3 @@ autoscan.log
 *.diff.gz
 *~
 *.o
-libevent/.deps/
-libevent/.libs/
-libevent/buffer.lo
-libevent/bufferevent.lo
-libevent/bufferevent_filter.lo
-libevent/bufferevent_openssl.lo
-libevent/bufferevent_pair.lo
-libevent/bufferevent_ratelim.lo
-libevent/bufferevent_sock.lo
-libevent/epoll.lo
-libevent/evdns.lo
-libevent/event.lo
-libevent/event_tagging.lo
-libevent/evmap.lo
-libevent/evrpc.lo
-libevent/evthread.lo
-libevent/evthread_pthread.lo
-libevent/evutil.lo
-libevent/evutil_rand.lo
-libevent/http.lo
-libevent/include/event2/event-config.h
-libevent/libevent.la
-libevent/libevent.pc
-libevent/libevent_core.la
-libevent/libevent_extra.la
-libevent/libevent_openssl.la
-libevent/libevent_openssl.pc
-libevent/libevent_pthreads.la
-libevent/libevent_pthreads.pc
-libevent/listener.lo
-libevent/log.lo
-libevent/poll.lo
-libevent/sample/.libs/
-libevent/sample/dns-example
-libevent/sample/event-test
-libevent/sample/hello-world
-libevent/sample/http-server
-libevent/sample/le-proxy
-libevent/sample/signal-test
-libevent/sample/time-test
-libevent/select.lo
-libevent/signal.lo
-libevent/strlcpy.lo
-libevent/test/.deps/
-libevent/test/.libs/
-libevent/test/bench
-libevent/test/bench_cascade
-libevent/test/bench_http
-libevent/test/bench_httpclient
-libevent/test/regress
-libevent/test/rpcgen-attempted
-libevent/test/test-changelist
-libevent/test/test-eof
-libevent/test/test-init
-libevent/test/test-ratelim
-libevent/test/test-time
-libevent/test/test-weof
-libevent/configure
-libevent/devpoll.lo
-libevent/evport.lo

bootstrap

@@ -4,12 +4,26 @@ set -x
 
 rm -rf autom4te*.cache
 
+LIBTOOLIZE=libtoolize
+SYSNAME=`uname`
+if [ "x$SYSNAME" = "xDarwin" ] ; then
+  LIBTOOLIZE=glibtoolize
+fi
+
 # build it all.
 aclocal -I macros $ACLOCAL_FLAGS || exit 1
 autoheader || exit 1
-libtoolize --force --copy
+$LIBTOOLIZE --force --copy
 automake --include-deps --add-missing --foreign --copy || exit 1
 autoconf || exit 1
 
+# libevent
+cd libevent
+aclocal -I m4 && \
+	autoheader && \
+	$LIBTOOLIZE --force --copy && \
+	autoconf && \
+	automake --include-deps --add-missing --force-missing --copy || exit 1
+
 # Let's not fall off the end...
 exit 0

libevent/.gitignore

@@ -0,0 +1,95 @@
+### These files should get ignored no matter where they appear.
+
+# Editors leave these lying around
+\#*\#
+.#*
+*~
+*.swp
+
+# C stuff
+*.o
+
+# Windows stuff
+*.obj
+*.exe
+*.lib
+
+# Patch leaves these lying arround
+*.orig
+*.rej
+
+# gcov stuff
+*.gcno
+*.gcov
+*.gcda
+
+# Autotools stuff
+.deps
+Makefile
+Makefile.in
+
+# Libtool stuff
+.libs
+*.lo
+*.la
+
+# ctags stuff
+TAGS
+
+# Stuff made by our makefiles
+libevent.pc
+libevent_pthreads.pc
+libevent_openssl.pc
+
+## The initial / makes these files only get ignored in particular directories.
+/autom4te.cache
+
+# Libtool adds these, at least sometimes
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+
+/aclocal.m4
+/compile
+/doxygen
+/config.guess
+/config.log
+/config.status
+/config.sub
+/configure
+/depcomp
+/config.h
+/config.h.in
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+/stamp-h1
+
+/include/event2/event-config.h
+
+/sample/dns-example
+/sample/event-test
+/sample/hello-world
+/sample/http-server
+/sample/le-proxy
+/sample/signal-test
+/sample/time-test
+
+/test/bench
+/test/bench_cascade
+/test/bench_http
+/test/bench_httpclient
+/test/regress
+/test/regress.gen.c
+/test/regress.gen.h
+/test/rpcgen-attempted
+/test/test-eof
+/test/test-init
+/test/test-ratelim
+/test/test-time
+/test/test-weof
+/test/test-changelist
+

libevent/ChangeLog

@@ -1,3 +1,19 @@
+Changes in version 2.0.18-stable (22 Mar 2012)
+BUGFIXES (core):
+ o Make uses of open() close-on-exec safe by introducing an internal evutil_open_closeonexec. (d2b5f72 Ross Lagerwall, 03dce42)
+
+BUGFIXES (kqueue):
+ o Properly zero the kevent in kq_setup_kevent() (c2c7b39 Sebastian Hahn)
+
+BUILD FIXES:
+ o Added OPENSSL_LDFLAGS env variable which is appended to SSL checks. (9278196 Mark Ellzey)
+ o Changed OPENSSL_LDFLAGS to OPENSSL_LIBADD (2d67b63 Mark Ellzey)
+ o Don't do clang version detection when disabling some flags (083296b Sebastian Hahn)
+
+BUGFIXES (dns):
+ o Stop crashing in evdns when nameserver probes give a weird error (bec5068)
+
+
 Changes in version 2.0.17-stable (10 Feb 2012)
 
 BUGFIXES (core):

libevent/Makefile.am

@@ -38,7 +38,7 @@ RELEASE = -release 2.0
 #
 # Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES
 # UNLESS YOU REALLY REALLY HAVE TO.
-VERSION_INFO = 6:5:1
+VERSION_INFO = 6:6:1
 
 # History:          RELEASE    VERSION_INFO
 #  2.0.1-alpha --     2.0        1:0:0
@@ -58,6 +58,7 @@ VERSION_INFO = 6:5:1
 #  2.0.15-stable--    2.0        6:3:1 (Forgot to update :( )
 #  2.0.16-stable--    2.0        6:4:1 (No ABI change)
 #  2.0.17-stable--    2.0        6:5:1 (No ABI change)
+#  2.0.18-stable--    2.0        6:6:1 (No ABI change)
 #
 # For Libevent 2.1:
 #  2.1.1-alpha --     2.1        1:0:0