From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 24 Jun 2011 19:40:55 +0000 (+0200)
Subject: Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
X-Git-Tag: release-1.1pre1~7
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=79e9a4f743b7b59fed968575f6b36171cf4a0063;hp=-c

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
	NEWS
	README
	configure.in
	src/Makefile.am
---

79e9a4f743b7b59fed968575f6b36171cf4a0063
diff --combined NEWS
index 1a121551,20a98d8a..44366cda
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,10 +1,16 @@@
 +Version 1.1-cvs              Work in progress
 +
 + * Use libevent to handle I/O events and timeouts.
 +
 + * Use splay trees instead of AVL trees.
 +
-  * Fix ProcessPriority option under Windows.
+ Version 1.0.15               June 24 2011
+ 
+  * Improved logging to file.
+ 
+  * Reduced amount of process wakeups on platforms which support pselect().
+ 
+  * Fixed ProcessPriority option under Windows.
  
  Version 1.0.14               May  8 2011
  
diff --combined README.git
index 4f895c5f,92aa1137..77595d6c
--- a/README.git
+++ b/README.git
@@@ -8,12 -8,11 +8,12 @@@ to install the very latest versions of 
  - automake
  - autoconf
  - gettext
 +- libevent
  
  Then you have to let the autotools create all the autogenerated files, using
  this command:
  
- autoreconf -f -s -i
+ autoreconf -fsi
  
  If you change configure.in or any Makefile.am file, you will have to rerun
  autoreconf. After this, you can run configure and make as usual. To create a
@@@ -23,4 -22,4 +23,4 @@@ make dis
  
  To clean up your working copy so that no autogenerated files remain, run:
  
- git clean
+ git clean -f
diff --combined src/Makefile.am
index d9bf293f,ff011f8c..60709fb7
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,46 -1,36 +1,46 @@@
  ## Produce this file with automake to get Makefile.in
  
 -sbin_PROGRAMS = tincd
 +sbin_PROGRAMS = tincd tincctl
  
 -EXTRA_DIST = linux/device.c bsd/device.c solaris/device.c cygwin/device.c mingw/device.c mingw/common.h raw_socket/device.c uml_socket/device.c
 +EXTRA_DIST = linux bsd solaris cygwin mingw raw_socket uml_socket openssl gcrypt
  
 -tincd_SOURCES = conf.c connection.c edge.c event.c graph.c logger.c meta.c net.c net_packet.c net_setup.c	\
 -	net_socket.c netutl.c node.c process.c protocol.c protocol_auth.c protocol_edge.c protocol_misc.c	\
 -	protocol_key.c protocol_subnet.c route.c subnet.c tincd.c
 +tincd_SOURCES = \
 +	utils.c getopt.c getopt1.c list.c splay_tree.c dropin.c fake-getaddrinfo.c fake-getnameinfo.c \
 +	buffer.c cipher.c conf.c connection.c control.c crypto.c digest.c edge.c graph.c logger.c meta.c net.c net_packet.c net_setup.c \
 +	net_socket.c netutl.c node.c process.c protocol.c protocol_auth.c protocol_edge.c protocol_misc.c \
 +	protocol_key.c protocol_subnet.c route.c rsa.c subnet.c tincd.c
 +
 +tincctl_SOURCES = \
 +	utils.c getopt.c getopt1.c dropin.c \
 +	list.c tincctl.c rsagen.c
  
  if TUNEMU
  tincd_SOURCES += bsd/tunemu.c
  endif
  
 +if CURSES
 +tincctl_SOURCES += top.c
 +tincctl_LDADD = $(CURSES_LIBS)
 +endif
 +
  nodist_tincd_SOURCES = device.c
  
  DEFAULT_INCLUDES =
  
 -INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib
 +INCLUDES = @INCLUDES@ -I$(top_builddir)
  
 -noinst_HEADERS = conf.h connection.h device.h edge.h event.h graph.h logger.h meta.h net.h netutl.h node.h process.h	\
 -	protocol.h route.h subnet.h bsd/tunemu.h
 +noinst_HEADERS = \
 +	xalloc.h utils.h getopt.h list.h splay_tree.h dropin.h fake-getaddrinfo.h fake-getnameinfo.h fake-gai-errnos.h ipv6.h ipv4.h ethernet.h \
 +	buffer.h cipher.h conf.h connection.h control.h control_common.h crypto.h device.h digest.h edge.h graph.h logger.h meta.h net.h netutl.h node.h process.h \
 +	protocol.h route.h rsa.h rsagen.h subnet.h bsd/tunemu.h
  
 -LIBS = @LIBS@
 +LIBS = @LIBS@ @LIBGCRYPT_LIBS@
  
  if TUNEMU
  LIBS += -lpcap
  endif
  
- AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
 -tincd_LDADD = \
 -	$(top_builddir)/lib/libvpn.a
 -
 -AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
++AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
  
  dist-hook:
  	rm -f `find . -type l`