update to FreeTDS 0.95.95, and switch back to using GnuTLS as the

SSL/TLS library (as we used to do by default) - fixes a segfault
that now occurs when making a TLS connection to a database from
a program that is also using poppler-glib. (specifically I see
an insane value for c->num in MD5_Final/HASH_FINAL resulting in
a write past the end of an array when doing "use DBI; use Poppler;
$dbh = DBI->connect('dbi:Sybase:server=server'" in perl).

We used to do this (with an optional openssl flavour) but switched
away previously because gnutls started needing pthread and we wanted
to avoid the need to preload libpthread.so for various programs
(especially DBD::Sybase), but that is no longer a problem.

ok ajacoutot@

databases/freetds/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.80 2016/03/27 15:09:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.81 2016/06/29 09:17:41 sthen Exp $
 
 COMMENT=	database drivers for Sybase/Microsoft SQL Server
 
-DISTNAME=	freetds-0.95.89
+DISTNAME=	freetds-0.95.95
+# 1.00 releases have problems with at least sqsh, libdbi-drivers, p5-sybperl
 
 SHARED_LIBS +=  ct                   6.0      # 4.0
 SHARED_LIBS +=  sybdb                8.0      # 6.0
@@ -11,18 +12,14 @@ SHARED_LIBS +=  tdsodbc              2.0      # unknown
 CATEGORIES=	databases
 
 HOMEPAGE=	http://www.freetds.org/
-# also http://freetds.schemamania.org/ http://freetds.sourceforge.net/
 
 MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/stable/
 
 # LGPLv2+ (most things) GPLv2+ (fisql, tdspool) FDL (docs)
-# No specific exception for OpenSSL, however the GPL has a special
-# exception for "anything that is normally distributed...with the major
-# components...of the operating system on which the executable runs,
-# unless that component itself accompanies the executable."
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c crypto iodbc iodbcinst ncurses pthread readline ssl
+WANTLIB += c ffi gmp gnutls hogweed idn intl iodbc iodbcinst ncurses
+WANTLIB += nettle p11-kit pthread readline tasn1 z
 
 MODULES=	converters/libiconv
 
@@ -35,19 +32,18 @@ BUILD_DEPENDS+=	devel/gettext \
 		${MODGNU_AUTOMAKE_DEPENDS}
 ### end of AUTOHELL
 
-LIB_DEPENDS=	databases/iodbc,-main
+LIB_DEPENDS=	databases/iodbc,-main \
+		security/gnutls
 
 # requires database server
 TEST_IS_INTERACTIVE=Yes
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	ac_cv_prog_DOXYGEN=
-# --disable-threadsafe required by databases/ruby-tiny_tds
-CONFIGURE_ARGS=	--disable-threadsafe \
-		--enable-static \
+CONFIGURE_ARGS=	--enable-static \
 		--with-iodbc="${LOCALBASE}" \
 		--with-libiconv-prefix="${LOCALBASE}" \
-		--with-openssl \
+		--with-gnutls \
 		--with-tdsver=7.3
 
 # picks up com_err.h from e2fsprogs for gssapi support

databases/freetds/distinfo

@@ -1,2 +1,2 @@
-SHA256 (freetds-0.95.89.tar.gz) = mrj2IoZroqNY+gvTL/CbvQW7j5Lh9LrS2aSCP8fV6PE=
-SIZE (freetds-0.95.89.tar.gz) = 4547309
+SHA256 (freetds-0.95.95.tar.gz) = vnyQ/HcfMEEe/2rjoNLlWWHyOpUKTZPETUxIgAbmTHA=
+SIZE (freetds-0.95.95.tar.gz) = 4551966

databases/freetds/patches/patch-m4_iconv_m4

@@ -1,11 +0,0 @@
-$OpenBSD: patch-m4_iconv_m4,v 1.1 2010/11/05 10:25:24 sthen Exp $
---- m4/iconv.m4.orig	Fri Nov  5 10:19:02 2010
-+++ m4/iconv.m4	Fri Nov  5 10:21:23 2010
-@@ -71,6 +71,7 @@ AC_DEFUN([AM_ICONV_LINK],
-     LIBICONV=
-     LTLIBICONV=
-   fi
-+  LIBICONV=${LTLIBICONV}
-   AC_SUBST(LIBICONV)
-   AC_SUBST(LTLIBICONV)
- ])