--- a/src/freetds-1-fastforward.patch	Sat Oct 23 01:20:59 2010 +0200
+++ b/src/freetds-1-fastforward.patch	Sat Oct 23 02:36:39 2010 +0200
@@ -157022,3 +157022,147 @@
  		readpassphrase.c \
  		strlcat.c \
  		strlcpy.c \
+
+commit 925b9420e278c930f8d67b8dd0fe7a16c7f87707
+Author: jklowden <jklowden>
+Date:   Wed Oct 13 17:49:17 2010 +0000
+
+    remove FROM_TARBALL, test for CVS instead, and check if  compiler is in the PATH
+
+diff --git a/ChangeLog b/ChangeLog
+index e3f5299..74ba100 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++Wed Oct 13 13:47:03 EDT 2010	JK Lowden <jklowden@freetds.org>
++	* Nmakefile 
++	- remove FROM_TARBALL, test for CVS instead, and check if 
++	- compiler is in the PATH
++
+ Tue Oct 12 11:29:23 EDT 2010	JK Lowden <jklowden@freetds.org>
+ 	* Nmakefile src/replacements/Makefile.am
+ 	- works with tarball if FROM_TARBALL defined 
+@@ -2954,4 +2959,4 @@ Wed Jan  9 19:54:43 EST 2008	JK Lowden <jklowden@freetds.org>
+ 	* ChangeLog-0.82 added because of release
+ 	
+ $FreeTDS$
+-$Id: ChangeLog,v 1.3144 2010/10/12 15:36:24 jklowden Exp $
++$Id: ChangeLog,v 1.3145 2010/10/13 17:49:17 jklowden Exp $
+diff --git a/Nmakefile b/Nmakefile
+index cd9e927..6ad02e9 100755
+--- a/Nmakefile
++++ b/Nmakefile
+@@ -1,4 +1,4 @@
+-# $Id: Nmakefile,v 1.6 2010/10/12 15:36:24 jklowden Exp $
++# $Id: Nmakefile,v 1.7 2010/10/13 17:49:17 jklowden Exp $
+ # Build FreeTDS and assorted utilities for Win32/Win64 without an IDE. 
+ # Makefiles, unlike Visual Studio project files, are stable over time.  
+ # Contributed to the public domain by James K. Lowden, February 2009
+@@ -8,10 +8,9 @@
+ # 2. PLATFORM = win32/x64
+ # These will determine what is built and where outputs are placed. 
+ #
+-# Example invocation:
++# Example invocations:
+ #	nmake.exe -f Nmakefile -nologo PLATFORM=win32 CONFIGURATION=debug
+-# If using with tarball distribution (not CVS):
+-#	nmake.exe -f Nmakefile PLATFORM=win32 CONFIGURATION=debug FROM_TARBALL=
++#	nmake.exe -f Nmakefile -nologo build-win32d
+ #	
+ 
+ MKDIR = MD
+@@ -149,7 +148,9 @@ db-lib: $(DBLIB_OUT)\db-lib.lib
+ 
+ apps: $(DBLIB_OUT)\db-lib.lib $(APPS_EXE)
+ tsql: $(APPS_OUT)\tsql.exe 
+-bsqldb: $(APPS_OUT)\bsqldb.exe 
++bsqldb: $(APPS_OUT)\bsqldb.exe
++help:
++	@echo targets: db-lib, apps, tsql, bsqldb
+ 
+ ##(APPS_OUT)\bsqldb.exe: $(APPS_DIR)\bsqldb.exe $(DBLIB_OUT)\db-lib.lib
+ # Don't know how to create this dependency without explicitly defining every output. 
+@@ -172,6 +173,15 @@ bsqldb: $(APPS_OUT)\bsqldb.exe
+ # x64 Cross:  Vcvarsall "x86_amd64"
+ #
+ 
++# Check that cl.exe is in the PATH.  Cf. "help FOR" to see how this works.  
++# See above comments regarding environment setup.  
++#
++COMPILER = cl.exe
++!IF 0 != [for /f %I in ("$(COMPILER)") DO @dir /b "%~dp$$PATH:I\$(COMPILER)" > NUL:]
++!MESSAGE cl.exe not in PATH
++!ERROR Perhaps run vcvarsall.bat to set up the command-line development environment?
++!ENDIF
++
+ all: build-win32d build-win32r build-win64d build-win64r
+ 
+ build-win32d: 
+@@ -203,7 +213,20 @@ $(DBLIB_OUT) $(REPLACEMENTS_OUT) $(TDS_OUT) $(APPS_OUT):
+ 	@if "" equ "$(CONFIGURATION)" 	CONFIGURATION not defined, see comments in Nmakefile >&2 && exit 1
+ 	$(MKDIR) $@
+ 
+-!IFNDEF FROM_TARBALL
++#
++# Some header files are generated with Perl for consistency.  
++# The Perl scripts are maintained in CVS, and someone developing 
++# with CVS needs Perl to build FreeTDS.  
++#
++# To avoid any dependency on Perl for everyone else, the 
++# distribution tarball contains the pre-generated files.  
++#
++# The preprocessing test below checks for the existence of a CVS 
++# directory, which wouldn't be present in a freshly unpacked tarball.  
++# If it finds one, it enables the code to generate the header files. 
++#
++
++!IF 0 == [dir /b /ad CVS]
+ #
+ # Generate distributed header files
+ #
+
+commit 89cafdeb3e5460ad8c0bb1179d0f90a152f862c1
+Author: freddy77 <freddy77>
+Date:   Fri Oct 22 20:14:53 2010 +0000
+
+    add missing define for msvc6
+
+diff --git a/ChangeLog b/ChangeLog
+index 74ba100..529899e 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Fri Oct 22 22:14:48 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
++	* win32/config.h: add missing define for msvc6
++
+ Wed Oct 13 13:47:03 EDT 2010	JK Lowden <jklowden@freetds.org>
+ 	* Nmakefile 
+ 	- remove FROM_TARBALL, test for CVS instead, and check if 
+@@ -2959,4 +2962,4 @@ Wed Jan  9 19:54:43 EST 2008	JK Lowden <jklowden@freetds.org>
+ 	* ChangeLog-0.82 added because of release
+ 	
+ $FreeTDS$
+-$Id: ChangeLog,v 1.3145 2010/10/13 17:49:17 jklowden Exp $
++$Id: ChangeLog,v 1.3146 2010/10/22 20:14:53 freddy77 Exp $
+diff --git a/win32/config.h b/win32/config.h
+index c158760..9e9cc4a 100644
+--- a/win32/config.h
++++ b/win32/config.h
+@@ -91,6 +91,12 @@
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #define HAVE_INTTYPES_H 1
+ 
++/* Define to 1 if you have the <limits.h> header file. */
++#define HAVE_LIMITS_H 1
++
++/* Define to 1 if you have the <locale.h> header file. */
++#define HAVE_LOCALE_H 1
++
+ /* Define to 1 if your system provides the malloc_options variable. */
+ /* #undef HAVE_MALLOC_OPTIONS */
+ 
+@@ -279,4 +285,3 @@
+ 
+ typedef SSIZE_T ssize_t;
+ 
+-#define HAVE_LOCALE_H 1