summaryrefslogtreecommitdiff
path: root/databases/freetds/files
diff options
context:
space:
mode:
Diffstat (limited to 'databases/freetds/files')
-rw-r--r--databases/freetds/files/patch-configure38
-rw-r--r--databases/freetds/files/patch-src_tds_tls.c4
2 files changed, 40 insertions, 2 deletions
diff --git a/databases/freetds/files/patch-configure b/databases/freetds/files/patch-configure
new file mode 100644
index 000000000000..987a1c57c9f8
--- /dev/null
+++ b/databases/freetds/files/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig 2023-12-04 09:01:11 UTC
++++ configure
+@@ -19020,20 +19020,7 @@ fi
+ printf "%s\n" "#define HAVE_SQL_H 1" >>confdefs.h
+
+ fi
+-ac_fn_c_check_header_compile "$LINENO" "odbcss.h" "ac_cv_header_odbcss_h" "#ifdef HAVE_WINDOWS_H
+-# include <windows.h>
+-#endif
+-#ifdef HAVE_SQL_H
+-# include <sql.h>
+-#endif
+
+-"
+-if test "x$ac_cv_header_odbcss_h" = xyes
+-then :
+- printf "%s\n" "#define HAVE_ODBCSS_H 1" >>confdefs.h
+-
+-fi
+-
+ if test "$ac_cv_header_odbcss_h" = "yes"; then
+ HAVE_ODBCSS_H_TRUE=
+ HAVE_ODBCSS_H_FALSE='#'
+@@ -21342,7 +21329,7 @@ elif test "x$with_iodbc" != "x" -a "x$with_iodbc" != "
+ with_iodbc="$PWD/$with_iodbc"
+ fi
+ CPPFLAGS="$CPPFLAGS -DIODBC"
+- ODBC_INC="$with_iodbc/include"
++ ODBC_INC="$with_iodbc/include/libiodbc"
+ test -r "$ODBC_INC/isql.h" || as_fn_error $? "isql.h not found" "$LINENO" 5
+ test -r "$ODBC_INC/isqlext.h" || as_fn_error $? "isqlext.h not found" "$LINENO" 5
+ ODBC_INC="-I$ODBC_INC"
+@@ -26046,5 +26033,3 @@ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+-
diff --git a/databases/freetds/files/patch-src_tds_tls.c b/databases/freetds/files/patch-src_tds_tls.c
index 7fb0c8912abb..e9b18a332258 100644
--- a/databases/freetds/files/patch-src_tds_tls.c
+++ b/databases/freetds/files/patch-src_tds_tls.c
@@ -1,4 +1,4 @@
---- src/tds/tls.c.orig 2022-05-31 06:46:53 UTC
+--- src/tds/tls.c.orig 2023-11-24 09:00:02 UTC
+++ src/tds/tls.c
@@ -53,6 +53,10 @@
#include <sys/socket.h>
@@ -20,7 +20,7 @@
static BIO_METHOD tds_method_login[1] = {
{
BIO_TYPE_MEM,
-@@ -664,7 +668,7 @@ tds_deinit_openssl_methods(void)
+@@ -665,7 +669,7 @@ tds_deinit_openssl_methods(void)
# endif
#endif