From 1bf8c63bb8841be50257491924269f9c37e50442 Mon Sep 17 00:00:00 2001
From: pooler <pooler@litecoinpool.org>
Date: Wed, 12 Jun 2013 15:00:13 +0200
Subject: [PATCH] Version 2.3

---
 NEWS         |  8 ++++++++
 README       | 12 +++++++-----
 configure.ac |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 2e058db..311683e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Version 2.3 - Jun 12, 2013
+
+- Add support for the Stratum mining protocol
+- Automatically switch to Stratum if the mining server supports
+  the X-Stratum extension, unless --no-stratum is used
+- Set CPU affinity on FreeBSD (lye)
+- Fix a bug in libcurl initialization (martinwguy)
+
 Version 2.2.3 - Aug 5, 2012
 
 - Add optimized ARM NEON code for scrypt and SHA-256d
diff --git a/README b/README
index fd95851..1b43ba2 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ Dependencies:
 
 Basic *nix build instructions:
 	./autogen.sh	# only needed if building from git repo
-	./nomacro.pl	# only needed if building on Mac OS X
+	./nomacro.pl	# only needed if building on Mac OS X or with Clang
 	./configure CFLAGS="-O3"
 	make
 
@@ -45,9 +45,10 @@ Architecture-specific notes:
 	x86-64:	The miner can take advantage of AVX and XOP instructions,
 		but only if both the CPU and the operating system support them.
 		    * Linux supports AVX starting from kernel version 2.6.30.
+		    * FreeBSD supports AVX starting with 9.1-RELEASE.
 		    * Mac OS X added AVX support in the 10.6.8 update.
 		    * Windows supports AVX starting from Windows 7 SP1 and
-		      Windows Server 2008 SP1.
+		      Windows Server 2008 R2 SP1.
 		The configure script outputs a warning if the assembler
 		cannot compile AVX or XOP instructions. In that case, the miner
 		can still be built, but unavailable optimizations are left off.
@@ -55,11 +56,12 @@ Architecture-specific notes:
 Usage instructions:  Run "minerd --help" to see options.
 
 Connecting through a proxy:  Use the --proxy option.
-To use a SOCKS proxy, add a socks4:// or socks5:// prefix to the proxy string.
+To use a SOCKS proxy, add a socks4:// or socks5:// prefix to the proxy host.
+Protocols socks4a and socks5h, allowing remote name resolving, are also
+available since libcurl 7.18.0.
 If no protocol is specified, the proxy is assumed to be a HTTP proxy.
 When the --proxy option is not used, the program honors the http_proxy
-environment variable.  In this case, however, libcurl 7.21.7 or newer is
-needed to handle protocol prefixes.
+and all_proxy environment variables.
 
 Also many issues and FAQs are covered in the forum thread
 dedicated to this program,
diff --git a/configure.ac b/configure.ac
index 9ed2fd5..9b87a11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([cpuminer], [2.2.3])
+AC_INIT([cpuminer], [2.3])
 
 AC_PREREQ([2.59c])
 AC_CANONICAL_SYSTEM