Drop separate OpenSSL flavour for FreeTDS. Change main package to using

OpenSSL rather than GnuTLS. Permit packages to be distributed. Bump shared
library versions to make sure they get updated.

As researched by jasper@, the GPL has a special exception when something
depends on software provided with the base OS, so it *is* ok for us to
distribute this.

This is preferred over using GnuTLS because GnuTLS pulls in a pthread
dependency; pthread overrides libc functions, so it is necessary
that a program using this is itself linked with pthread, causing a
problem if you want to use the FreeTDS library to connect to servers
using encryption from programs which aren't themselves linked with
pthread (e.g. /usr/sbin/httpd with mod_php, or perl with DBD::Sybase).

ok jasper@ ajacoutot@
This commit is contained in:
sthen 2012-05-11 09:57:02 +00:00
parent 56c54d1b7f
commit 0dbcb43036
3 changed files with 15 additions and 26 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.54 2011/11/11 11:37:54 espie Exp $
# $OpenBSD: Makefile,v 1.55 2012/05/11 09:57:02 sthen Exp $
COMMENT= database drivers for Sybase/Microsoft SQL Server
DISTNAME= freetds-0.91
REVISION= 0
REVISION= 1
SHARED_LIBS += ct 4.0 # .4.0
SHARED_LIBS += sybdb 6.0 # .5.0
SHARED_LIBS += tdsodbc 0.0 # .0.0
SHARED_LIBS += ct 5.0 # .4.0
SHARED_LIBS += sybdb 7.0 # .5.0
SHARED_LIBS += tdsodbc 1.0 # .0.0
CATEGORIES= databases
@ -15,10 +15,16 @@ HOMEPAGE= http://www.freetds.org/
# also http://freetds.schemamania.org/ http://freetds.sourceforge.net/
# 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_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB += c iodbc iodbcinst ncurses pthread readline
WANTLIB += c crypto iodbc iodbcinst ncurses pthread readline ssl
MASTER_SITES= http://www.ibiblio.org/pub/Linux/ALPHA/freetds/stable/
@ -44,23 +50,9 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-static \
--with-iodbc="${LOCALBASE}" \
--with-libiconv-prefix="${LOCALBASE}" \
--with-openssl \
--with-tdsver=7.1
FLAVOR?=
FLAVORS= openssl
.if ${FLAVOR:Mopenssl}
CONFIGURE_ARGS+= --with-openssl
WANTLIB+= crypto ssl
PERMIT_PACKAGE_CDROM= incompatible license
PERMIT_PACKAGE_FTP= incompatible license
.else
LIB_DEPENDS+= security/gnutls
CONFIGURE_ARGS+= --with-gnutls
WANTLIB+= gmp gnutls hogweed nettle p11-kit tasn1 z
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
.endif
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
MAKE_ENV= RM=rm \

View File

@ -13,7 +13,3 @@ webservers to present data stored in SQL Server to the web, to port
SQL Server database code from NT to Unix, to import data into SQL
Server from a Unix source, and to provide database access on platforms
(such as realtime systems) that have no native drivers.
FLAVORS:
openssl use OpenSSL instead of GnuTLS for encrypted connections.
Avoids uthread problems but may not be redistributed; see README.

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.18 2011/09/08 17:13:51 sthen Exp $
@comment $OpenBSD: PLIST,v 1.19 2012/05/11 09:57:02 sthen Exp $
@pkgpath databases/freetds,-msdblib
@pkgpath databases/freetds,-openssl
@bin bin/bsqldb
@bin bin/bsqlodbc
@bin bin/datacopy