diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 37e83f67c0a0..0fc7da7d4da7 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,83 +1,83 @@ PORTNAME= freetds -PORTVERSION= 1.4.10 +PORTVERSION= 1.4.11 PORTEPOCH= 1 -PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= https://www.freetds.org/files/stable/ \ ftp://ftp.freetds.org/pub/freetds/stable/ MAINTAINER= bofh@FreeBSD.org COMMENT= Sybase/Microsoft TDS protocol library WWW= http://www.freetds.org/ LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:security/libgcrypt USES= cpe gettext gmake iconv libtool:keepla localbase:ldflags \ pkgconfig readline tar:bzip2 USE_LDCONFIG= yes -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --enable-msdblib \ --enable-sybase-compat \ --sysconfdir=${ETCDIR} \ --with-tdsver=${TDS_VER} INSTALL_TARGET= install-strip LIBS+= -lgcrypt -lpthread CONFLICTS= freetds-devel PORTDOCS= * OPTIONS_DEFINE= DOCS MARS OPTIONS_DEFAULT= MARS OPENSSL UNIXODBC OPTIONS_SINGLE= ODBC SSL OPTIONS_SINGLE_ODBC= IODBC UNIXODBC OPTIONS_SINGLE_SSL= GNUTLS OPENSSL MARS_DESC= Enable MARS code (Experimental) GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ON= --with-gnutls IODBC_LIB_DEPENDS= libiodbc.so:databases/libiodbc IODBC_CONFIGURE_ON= --with-iodbc=${LOCALBASE} IODBC_CPPFLAGS= -I${LOCALBASE}/include/libiodbc MARS_CONFIGURE_ON= --enable-mars OPENSSL_USES= ssl OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC UNIXODBC_CONFIGURE_ON= --with-unixodbc=${LOCALBASE} TDS_VER?= 7.4 .include .if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC} PLIST_SUB+= ODBC="" .else PLIST_SUB+= ODBC="@comment " .endif post-extract: @cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.sample @cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.sample @cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample post-patch: @${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \ s|/locales.conf|/locales.conf.sample|g ; \ s| common.h||g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|/pool.conf|/pool.conf.sample|g' \ ${WRKSRC}/src/pool/Makefile.in @${REINPLACE_CMD} -e 's|\($$with_iodbc/include\)|\1/libiodbc|g ; \ s| odbcss.h||g' \ ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample .include diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo index d9132f002ad1..aa107f8aebd1 100644 --- a/databases/freetds/distinfo +++ b/databases/freetds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701770938 -SHA256 (freetds-1.4.10.tar.bz2) = c7eaf226bdcb1cdc1b221696532ccd25f4e4e7754265a29777a3400084bde698 -SIZE (freetds-1.4.10.tar.bz2) = 2394706 +TIMESTAMP = 1711809183 +SHA256 (freetds-1.4.11.tar.bz2) = 567f7ce913f222191dda7e1c221d5e272a387152fef6cacbd97767fea68b613e +SIZE (freetds-1.4.11.tar.bz2) = 2394685 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 +-#endif +-#ifdef HAVE_SQL_H +-# include +-#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,31 +1,31 @@ ---- 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 #endif +#if defined(__FreeBSD__) || defined(__DragonFly__) +#include +#endif + #include #include #include @@ -600,7 +604,7 @@ tds_ssl_free(BIO *a) return 1; } -#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x1010000FL 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 -#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x1010000FL static tds_mutex *openssl_locks; static void