[freetds] Remove patches and update to a version that no longer needs them (#14529)

* [freetds] Remove patches and update to a version that no longer needs them

Upstream seems to have version numbered releases but they aren't explicitly numbered well in GitHub, so I've intentionally changed the version-string to something unorderable for now.

* Also update to 1.2.11.

* Update ports/freetds/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

4 files changed, 5 insertions, 140 deletions

diff --git a/ports/freetds/fix-encoding-h-dependency.patch b/ports/freetds/fix-encoding-h-dependency.patch
deleted file mode 100644
index 7b2909fec..000000000
--- a/ports/freetds/fix-encoding-h-dependency.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt

-index 5d036a1..031b9a2 100644

---- a/src/odbc/CMakeLists.txt

-+++ b/src/odbc/CMakeLists.txt

-@@ -30,7 +30,7 @@ add_library(tdsodbc SHARED

- target_compile_definitions(tdsodbc PUBLIC DLL_EXPORT=1)

- # TODO libiconv, odbcinstlib and other dynamics

- target_link_libraries(tdsodbc tds replacements tdsutils ${libs} ${lib_NETWORK} ${lib_BASE})

--

-+add_dependencies(tdsodbc generate_encodings_h)

- if(MINGW OR CYGWIN)

- 	set_target_properties(tdsodbc PROPERTIES LINK_FLAGS "--static -Wl,--kill-at -Wl,--enable-stdcall-fixup")

- endif(MINGW OR CYGWIN)

-@@ -41,6 +41,7 @@ add_library(tdsodbc_static STATIC

- 	native.c sql2tds.c error.c odbc_checks.c sqlwchar.c sqlwparams.h

- 	odbc_export.h error_export.h odbc_data.c ${win_SRCS}

- )

-+add_dependencies(tdsodbc_static generate_encodings_h)

- if (NOT WIN32)

- 	set_target_properties(tdsodbc_static PROPERTIES POSITION_INDEPENDENT_CODE ON)

- endif()

-diff --git a/src/tds/CMakeLists.txt b/src/tds/CMakeLists.txt

-index d8be1a0..42b6a4d 100644

---- a/src/tds/CMakeLists.txt

-+++ b/src/tds/CMakeLists.txt

-@@ -29,6 +29,8 @@ if(PERL_FOUND AND NOT EXISTS "${CMAKE_SOURCE_DIR}/configure")

- 		WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})

- endif(PERL_FOUND AND NOT EXISTS "${CMAKE_SOURCE_DIR}/configure")

- 

-+add_custom_target(generate_encodings_h DEPENDS "${CMAKE_BINARY_DIR}/include/freetds/encodings.h")

-+

- if(WIN32)

- 	set(add_SRCS sspi.c)

- else(WIN32)

-@@ -44,9 +46,9 @@ add_library(tds STATIC

-         bulk.c packet.c stream.c random.c

-         sec_negotiate_gnutls.h sec_negotiate_openssl.h sec_negotiate.c gssapi.c

- 	tds_willconvert.h num_limits.h tds_types.h

--	"${CMAKE_BINARY_DIR}/include/freetds/encodings.h"

- 	${add_SRCS}

- )

-+add_dependencies(tds generate_encodings_h)

- if (NOT WIN32)

- 	set_target_properties(tds PROPERTIES POSITION_INDEPENDENT_CODE ON)

- endif()

diff --git a/ports/freetds/portfile.cmake b/ports/freetds/portfile.cmake
index b534c43f9..8cc487770 100644
--- a/ports/freetds/portfile.cmake
+++ b/ports/freetds/portfile.cmake
@@ -1,12 +1,11 @@
+vcpkg_fail_port_install(ON_TARGET "uwp" "linux" "osx")

+

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO freetds/freetds

-    REF fbf3bbbbc27283b35a5a6aec9992521e684c9abf # 1.2.5

+    REF 16f7a6280c7a19bfe5c60e5d61cc08e3f2dff991 # See https://github.com/microsoft/vcpkg/pull/14120#issuecomment-715896755

     HEAD_REF master

-    SHA512 e18dba16705db951ea52055476fac342c1bb62e90629ef82064ad9d3d4a7f2078e8f7674b1602bc21798240e005052dcbc67cdd0912b47163bd95956128c4677

-    PATCHES

-        skip-unit-tests.patch

-        fix-encoding-h-dependency.patch

+    SHA512 34ff10764156bac24444a74b636fafa56adc0097a62a3f3249d4bc09a0cdcaa88aa0c4f26761260c56dd47edf738ff68f647e045f32cac28e0be7f6760f7f90b

 )

 

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/freetds/skip-unit-tests.patch b/ports/freetds/skip-unit-tests.patch
deleted file mode 100644
index 0ec6d8ee4..000000000
--- a/ports/freetds/skip-unit-tests.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e3840ae..19a22bb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -64,9 +64,9 @@ math(EXPR BUILD_NUMBER "${BUILD_NUMBER}")
- 
- set(FREETDS_TOPDIR ${CMAKE_CURRENT_LIST_DIR})
- 
--enable_testing()
--set(CMAKE_CTEST_COMMAND ctest)
--add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
-+#enable_testing()
-+#set(CMAKE_CTEST_COMMAND ctest)
-+#add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
- 
- # TODO depends on configure
- add_definitions(-D_REENTRANT -D_THREAD_SAFE)
-@@ -464,7 +464,7 @@ add_subdirectory(src/dblib)
- add_subdirectory(src/odbc)
- add_subdirectory(src/apps)
- add_subdirectory(src/server)
--add_subdirectory(src/pool)
-+#add_subdirectory(src/pool)
- 
- configure_file(${CMAKE_BINARY_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/include/config.h)
- configure_file(${CMAKE_SOURCE_DIR}/include/tds_sysdep_public.h.in ${CMAKE_BINARY_DIR}/include/tds_sysdep_public.h)
-diff --git a/src/ctlib/CMakeLists.txt b/src/ctlib/CMakeLists.txt
-index e83b0b1..017d571 100644
---- a/src/ctlib/CMakeLists.txt
-+++ b/src/ctlib/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_subdirectory(unittests)
-+#add_subdirectory(unittests)
- 
- set(static_lib_name ct)
- if(WIN32)
-diff --git a/src/dblib/CMakeLists.txt b/src/dblib/CMakeLists.txt
-index aa8a179..b626000 100644
---- a/src/dblib/CMakeLists.txt
-+++ b/src/dblib/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_subdirectory(unittests)
-+#add_subdirectory(unittests)
- 
- if(WIN32)
- 	set(win_SRCS winmain.c dblib.def dbopen.c)
-diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt
-index 7fad8db..3d90456 100644
---- a/src/odbc/CMakeLists.txt
-+++ b/src/odbc/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_subdirectory(unittests)
-+#add_subdirectory(unittests)
- 
- # TODO checks
- add_definitions(-DUNIXODBC -DHAVE_SQLGETPRIVATEPROFILESTRING)
-diff --git a/src/replacements/CMakeLists.txt b/src/replacements/CMakeLists.txt
-index 37b47e3..ba17bed 100644
---- a/src/replacements/CMakeLists.txt
-+++ b/src/replacements/CMakeLists.txt
-@@ -35,7 +35,7 @@ if (NOT WIN32)
- 	set_target_properties(replacements PROPERTIES POSITION_INDEPENDENT_CODE ON)
- endif()
- 
--add_subdirectory(unittests)
-+#add_subdirectory(unittests)
- 
- 
- INSTALL(TARGETS replacements
-diff --git a/src/tds/CMakeLists.txt b/src/tds/CMakeLists.txt
-index fee56b3..e7a71f0 100644
---- a/src/tds/CMakeLists.txt
-+++ b/src/tds/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_subdirectory(unittests)
-+#add_subdirectory(unittests)
- 
- if(PERL_FOUND AND NOT EXISTS "${CMAKE_SOURCE_DIR}/configure")
- 	# get name of null device
-diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
-index 2a1935c..a46483e 100644
---- a/src/utils/CMakeLists.txt
-+++ b/src/utils/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_subdirectory(unittests)
-+#add_subdirectory(unittests)
- 
- if(WIN32)
- 	set(add_SRCS md5.c)
diff --git a/ports/freetds/vcpkg.json b/ports/freetds/vcpkg.json
index 0c01013ad..d24a72769 100644
--- a/ports/freetds/vcpkg.json
+++ b/ports/freetds/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "freetds",
-  "version-string": "1.2.5",
+  "version-string": "1.2.11",
   "description": "Implementation of the Tabular Data Stream protocol",
   "homepage": "https://www.freetds.org",
   "supports": "windows & !uwp",