From c02e2d7aeeba25cb53d8a81acad55318ce63a4c4 Mon Sep 17 00:00:00 2001
From: Yves Rutschle <git1@rutschle.net>
Date: Sat, 27 Jul 2013 16:25:04 +0200
Subject: [PATCH] v1.15 release

---
 ChangeLog | 5 ++++-
 Makefile  | 6 ++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 653beaa..85cf98e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-vNEXT:
+v1.15:	27JUL2013
 	Added --transparent option for transparent proxying.
 	See README for iptables magic and capability
 	management.
@@ -10,6 +10,9 @@ vNEXT:
 	Fixed bug in sslh-select: if socket dropped while
 	defered_data was present, sslh-select would crash.
 
+	Increased FD_SETSIZE for Cygwin, as the default 64
+	is too low for even moderate load.
+
 v1.14: 21DEC2012
 	Corrected OpenVPN probe to support pre-shared secret
 	mode (OpenVPN port-sharing code is... wrong). Thanks
diff --git a/Makefile b/Makefile
index c1fbf0f..8a2e61b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Configuration
 
-VERSION="1.14"
+VERSION="1.15"
 USELIBCONFIG=1	# Use libconfig? (necessary to use configuration files)
 USELIBWRAP=	# Use libwrap?
 COV_TEST= 	# Perform test coverage?
@@ -56,9 +56,7 @@ $(MAN): sslh.pod Makefile
 # Create release: export clean tree and tag current
 # configuration
 release:
-	svn export . /tmp/sslh-$(VERSION)
-	( cd /tmp; tar zcvf /tmp/sslh-$(VERSION).tar.gz sslh-$(VERSION) )
-	( cd .. ; svn copy trunk tags/sslh-$(VERSION) ; cd tags/sslh-$(VERSION) ; make clean )
+	git archive master --prefix="sslh-$(VERSION)/" | gzip > /tmp/sslh-$(VERSION).tar.gz
 
 # generic install: install binary and man page
 install: sslh $(MAN)