On 2011/06/13 18:29, Abel Abraham Camarillo Ojeda wrote:
> On Mon, Jun 13, 2011 at 6:12 PM, Stuart Henderson <[email protected]>
> wrote:
> > On 2011-06-13, Abel Abraham Camarillo Ojeda <[email protected]> wrote:
> >> p5-DBD-Sybase regression tests fail with:
> >>
> >> /usr/bin/perl:/usr/local/lib/libgnutls.so.17.0: undefined symbol
> >> 'pthread_mutex_unlock'
> >> /usr/bin/perl:/usr/local/lib/libgnutls.so.17.0: undefined symbol
> >> 'pthread_mutex_destroy'
> >> /usr/bin/perl:/usr/local/lib/libgnutls.so.17.0: undefined symbol
> >> 'pthread_mutex_lock'
> >> /usr/bin/perl:/usr/local/lib/libgnutls.so.17.0: undefined symbol
> >> 'pthread_atfork'
> >> /usr/bin/perl:/usr/local/lib/libgnutls.so.17.0: undefined symbol
> >> 'pthread_mutex_init'
> >>
> >> I have a custom application that after this messages it outputs:
> >>
> >> lazy binding failed!
> >> Segmentation fault (core dumped)
> >>
> >> Which seems to come from ld.so.
> >
> > you could try running things with this set:-
> >
> > LD_PRELOAD=/usr/lib/libpthread.so
> >
>
> Ok, this works...
>
> Thanks.
Any chance you could test this freetds diff? It updates to the recent
release candidate and switches to OpenSSL. The shared library versions
are unchanged so you should just be able to update freetds without
touching DBD::Sybase.
There have been mixed reports about openssl with freetds so this
may not work.
Non-crypto works fine but I don't have a server that uses crypto
to test that, which is obviously why I haven't hit this problem
before (it looks like it only uses the gnutls functions if you
actually connect to a crypto-supporting server regardless of
setting 'encryption = required').
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/freetds/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile 15 Apr 2011 16:10:38 -0000 1.50
+++ Makefile 13 Jun 2011 23:44:23 -0000
@@ -2,11 +2,9 @@
COMMENT= database drivers for Sybase/Microsoft SQL Server
-V= 0.82
-PATCHVER= 20110223
+V= 0.91RC2
DISTNAME= freetds-$V
-PKGNAME= ${DISTNAME}.${PATCHVER}
-PATCHFILES= freetds-post82-${PATCHVER}.diff.gz:0
+PKGNAME= ${DISTNAME:L}
REVISION= 0
@@ -25,25 +23,19 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += c gmp gnutls hogweed iodbc iodbcinst ncurses nettle
-WANTLIB += pthread readline tasn1 z
+WANTLIB += c crypto iodbc iodbcinst ncurses
+WANTLIB += pthread readline ssl z
-MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/
-MASTER_SITES0= http://spacehopper.org/mirrors/
+#MASTER_SITES= http://www.ibiblio.org/pub/Linux/ALPHA/freetds/stable/
+MASTER_SITES=
http://www.ibiblio.org/pub/Linux/ALPHA/freetds/stable/release_candidates/
-AUTOCONF_VERSION=2.59
-AUTOMAKE_VERSION=1.9
+AUTOCONF_VERSION=2.65
+AUTOMAKE_VERSION=1.10 # should be 1.11.1
MODULES= devel/gettext
-# XXX uses libtool m4 macros
BUILD_DEPENDS= devel/doxygen>=1.7.2 \
- devel/libtool \
- ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-LIB_DEPENDS= databases/iodbc,-main \
- security/gnutls
-
-FLAVORS= msdblib
-FLAVOR?=
+ textproc/docbook-dsssl \
+ textproc/openjade
+LIB_DEPENDS= databases/iodbc,-main
# requires database server
REGRESS_IS_INTERACTIVE=Yes
@@ -54,35 +46,36 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-threadsafe \
--enable-static \
- --with-gnutls \
+ --with-openssl \
--with-iodbc="${LOCALBASE}" \
--with-libiconv-prefix="${LOCALBASE}" \
- --with-tdsver=8.0
+ --with-tdsver=7.1
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-.if $(FLAVOR:L:Mmsdblib)
-CONFIGURE_ARGS+=--enable-msdblib
-.endif
-
-MAKE_ENV= RM=rm
+MAKE_ENV= RM=rm \
+
DOCBOOK_DSL=${LOCALBASE}/share/sgml/docbook/dsssl/modular/html/docbook.dsl \
+
SGML_CATALOG_FILES=${LOCALBASE}/share/sgml/catalog:${LOCALBASE}/share/sgml/openjade/catalog
+FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/freetds
DOC= share/doc/freetds
SUBST_VARS= DOC V
+#fortheloveof$DEITY XXX did I fix this?
+post-extract:
+ cp ${LOCALBASE}/share/xml/docbook/catalog.xml \
+ ${WRKDIR}/catalog.xml
+ xmlcatalog --add nextCatalog \
+ --id ${LOCALBASE}/share/xsl/docbook/catalog.xml \
+ --noout ${WRKDIR}/catalog.xml ${WRKDIR}/catalog.xml
+
pre-configure:
- cd ${WRKSRC}/doc/doc; ln -s freetds-0.82 freetds-0.82.1
cd ${WRKSRC}; \
- AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- NOCONFIGURE=1 ./autogen.sh
+ AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+ NOCONFIGURE=1 ./autogen.sh
@${SUBST_CMD} ${WRKSRC}/src/odbc/connectparams.c
post-install:
- @mkdir ${PREFIX}/share/examples/freetds; \
- ${INSTALL_DATA} ${WRKSRC}/freetds.conf \
- ${PREFIX}/share/examples/freetds/freetds.conf-sample; \
- ${INSTALL_DATA} ${WRKSRC}/src/pool/pool.conf \
- ${PREFIX}/share/examples/freetds/pool.conf-sample; \
cd ${PREFIX}/lib && ln -s libtdsodbc.so.${LIBtdsodbc_VERSION} \
libtdsodbc.so; \
mv ${PREFIX}/share/doc/freetds-* ${PREFIX}/share/doc/freetds
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/freetds/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 24 Mar 2011 12:51:19 -0000 1.16
+++ distinfo 13 Jun 2011 23:44:23 -0000
@@ -1,10 +1,5 @@
-MD5 (freetds-0.82.tar.gz) = Pfay6D/UIOkPG+y9EWKZCg==
-MD5 (freetds-post82-20110223.diff.gz) = XtZDap+YN3l4PNp58+Hmaw==
-RMD160 (freetds-0.82.tar.gz) = 01lsUSAiMyzbO6s3WVAVnx6TCks=
-RMD160 (freetds-post82-20110223.diff.gz) = 9SpbRcj0JTGML92hIIjSYJj+mo4=
-SHA1 (freetds-0.82.tar.gz) = fioMnkHCQMLRx/acbyeOmlu4DC0=
-SHA1 (freetds-post82-20110223.diff.gz) = ++I7TkTRqTVNEtC5oHIBOrmoohs=
-SHA256 (freetds-0.82.tar.gz) = 4nMUg2FL2ZLIyxM7zDhDLeE8+iQ8wTJ/N0EttQyZsrY=
-SHA256 (freetds-post82-20110223.diff.gz) =
w+pGnustty8V8tFS0uEW23tozu8mXTeiZ231ZXN5dbw=
-SIZE (freetds-0.82.tar.gz) = 1596755
-SIZE (freetds-post82-20110223.diff.gz) = 61802
+MD5 (freetds-0.91RC2.tar.gz) = 5Cs521rH1fdFc8bLdLACwQ==
+RMD160 (freetds-0.91RC2.tar.gz) = XHltDhKLzxQvAdOWJfr5a6XqmzA=
+SHA1 (freetds-0.91RC2.tar.gz) = cwzMrx5jXcC7dRezhf5GTp/H4xw=
+SHA256 (freetds-0.91RC2.tar.gz) = Lk/f+5VGPXqsAw3wVfZ7UcLfuJoCo/QbJnNHWosMeEQ=
+SIZE (freetds-0.91RC2.tar.gz) = 2176833
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 12 Sep 2010 09:32:58 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.8 2010/09/12 09:32:58 sthen Exp $
---- Makefile.in.orig Wed May 7 23:59:24 2008
-+++ Makefile.in Wed Sep 8 09:44:27 2010
-@@ -687,13 +687,6 @@ uninstall-info: uninstall-info-recursive
-
-
- install-data-local:
-- $(mkinstalldirs) $(ETC)
-- if test ! -f $(ETC)/freetds.conf; then \
-- $(INSTALL_DATA) $(srcdir)/freetds.conf $(ETC)/freetds.conf; \
-- fi
-- if test ! -f $(ETC)/locales.conf; then \
-- $(INSTALL_DATA) $(srcdir)/locales.conf $(ETC)/locales.conf; \
-- fi
-
- clean-local:
- find . \( -name \*.test_output -o -name \*.bb -o -name \*.bbg -o -name
\*.da -o -name \*.gc\* \) -exec rm -f {} \;
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: patches/patch-doc_Makefile_in
diff -N patches/patch-doc_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_Makefile_in 13 Jun 2011 23:44:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/Makefile.in.orig Thu May 5 02:32:15 2011
++++ doc/Makefile.in Mon May 9 14:40:42 2011
+@@ -252,7 +252,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ TXT2MAN = $(srcdir)/txt2man
+-DOCDIR = doc/freetds-$(VERSION)
++DOCDIR = doc/freetds
+ PRODUCT = FreeTDS
+ TARGET_DOCDIR = $(DESTDIR)$(datadir)/$(DOCDIR)
+ IMAGES = images/important.gif \
Index: patches/patch-include_tds_h
===================================================================
RCS file: patches/patch-include_tds_h
diff -N patches/patch-include_tds_h
--- patches/patch-include_tds_h 24 Mar 2011 12:51:19 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-include_tds_h,v 1.2 2011/03/24 12:51:19 sthen Exp $
---- include/tds.h.orig Sat Mar 5 21:58:00 2011
-+++ include/tds.h Sat Mar 5 21:58:01 2011
-@@ -27,6 +27,9 @@
- #include <stdio.h>
- #include <time.h>
-
-+#if HAVE_NETINET_IN_H
-+#include <netinet/in.h>
-+#endif /* HAVE_NET_INET_IN_H */
- #if HAVE_ARPA_INET_H
- #include <arpa/inet.h>
- #endif /* HAVE_ARPA_INET_H */
Index: patches/patch-odbc_unittests_Makefile_in
===================================================================
RCS file: patches/patch-odbc_unittests_Makefile_in
diff -N patches/patch-odbc_unittests_Makefile_in
--- patches/patch-odbc_unittests_Makefile_in 12 Sep 2010 09:32:58 -0000
1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-odbc_unittests_Makefile_in,v 1.6 2010/09/12 09:32:58 sthen Exp
$
---- src/odbc/unittests/Makefile.in.orig Wed May 7 23:59:20 2008
-+++ src/odbc/unittests/Makefile.in Wed Sep 8 09:44:27 2010
-@@ -1006,7 +1006,7 @@ check-am: all-am
- check: check-am
- all-am: Makefile
- installdirs:
--install: install-am
-+install:
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
Index: patches/patch-src_ctlib_unittests_Makefile_in
===================================================================
RCS file: patches/patch-src_ctlib_unittests_Makefile_in
diff -N patches/patch-src_ctlib_unittests_Makefile_in
--- patches/patch-src_ctlib_unittests_Makefile_in 12 Sep 2010 09:32:58
-0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_ctlib_unittests_Makefile_in,v 1.6 2010/09/12 09:32:58
sthen Exp $
---- src/ctlib/unittests/Makefile.in.orig Wed May 7 23:59:18 2008
-+++ src/ctlib/unittests/Makefile.in Wed Sep 8 09:44:27 2010
-@@ -735,7 +735,7 @@ check-am: all-am
- check: check-am
- all-am: Makefile
- installdirs:
--install: install-am
-+install:
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
Index: patches/patch-src_dblib_unittests_Makefile_in
===================================================================
RCS file: patches/patch-src_dblib_unittests_Makefile_in
diff -N patches/patch-src_dblib_unittests_Makefile_in
--- patches/patch-src_dblib_unittests_Makefile_in 12 Sep 2010 09:32:58
-0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_dblib_unittests_Makefile_in,v 1.6 2010/09/12 09:32:58
sthen Exp $
---- src/dblib/unittests/Makefile.in.orig Wed May 7 23:59:19 2008
-+++ src/dblib/unittests/Makefile.in Wed Sep 8 09:44:27 2010
-@@ -784,7 +784,7 @@ check-am: all-am
- check: check-am
- all-am: Makefile
- installdirs:
--install: install-am
-+install:
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
Index: patches/patch-src_odbc_connectparams_c
===================================================================
RCS file: /cvs/ports/databases/freetds/patches/patch-src_odbc_connectparams_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_odbc_connectparams_c
--- patches/patch-src_odbc_connectparams_c 24 Mar 2011 12:51:20 -0000
1.3
+++ patches/patch-src_odbc_connectparams_c 13 Jun 2011 23:44:23 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_odbc_connectparams_c,v 1.3 2011/03/24 12:51:20 sthen Exp $
---- src/odbc/connectparams.c.orig Sat Mar 5 21:58:00 2011
-+++ src/odbc/connectparams.c Sat Mar 5 21:58:01 2011
-@@ -46,7 +46,7 @@ TDS_RCSID(var, "$Id: connectparams.c,v 1.72.2.1 2011/0
+--- src/odbc/connectparams.c.orig Tue Nov 9 15:46:42 2010
++++ src/odbc/connectparams.c Sun Apr 10 09:08:42 2011
+@@ -58,7 +58,7 @@ static const char *odbc_param_names[] = {
* by build scripts.
*/
#ifndef SYS_ODBC_INI
Index: patches/patch-src_pool_Makefile_in
===================================================================
RCS file: patches/patch-src_pool_Makefile_in
diff -N patches/patch-src_pool_Makefile_in
--- patches/patch-src_pool_Makefile_in 12 Sep 2010 09:32:58 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_pool_Makefile_in,v 1.5 2010/09/12 09:32:58 sthen Exp $
---- src/pool/Makefile.in.orig Wed May 7 23:59:21 2008
-+++ src/pool/Makefile.in Wed Sep 8 09:44:27 2010
-@@ -529,10 +529,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-
- install-data-local:
-- $(mkinstalldirs) $(ETC)
-- if test ! -f $(ETC)/pool.conf; then \
-- $(INSTALL_DATA) $(srcdir)/pool.conf $(ETC)/pool.conf; \
-- fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
Index: patches/patch-src_tds_unittests_Makefile_in
===================================================================
RCS file: patches/patch-src_tds_unittests_Makefile_in
diff -N patches/patch-src_tds_unittests_Makefile_in
--- patches/patch-src_tds_unittests_Makefile_in 12 Sep 2010 09:32:58 -0000
1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_tds_unittests_Makefile_in,v 1.6 2010/09/12 09:32:58 sthen
Exp $
---- src/tds/unittests/Makefile.in.orig Wed May 7 23:59:22 2008
-+++ src/tds/unittests/Makefile.in Wed Sep 8 09:44:27 2010
-@@ -198,7 +198,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBICONV = @LIBICONV@
- LIBOBJS = @LIBOBJS@
--LIBS = ../libtds.la ../../replacements/libreplacements.la @NETWORK_LIBS@
-+LIBS = ../libtds.la ../../replacements/libreplacements.la @NETWORK_LIBS@
${LIBICONV}
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
-@@ -623,7 +623,7 @@ check-am: all-am
- check: check-am
- all-am: Makefile
- installdirs:
--install: install-am
-+install:
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/freetds/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 4 Nov 2010 20:14:20 -0000 1.17
+++ pkg/PLIST 13 Jun 2011 23:44:23 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.17 2010/11/04 20:14:20 jasper Exp $
+@pkgpath databases/freetds,-msdblib
@bin bin/bsqldb
@bin bin/bsqlodbc
@bin bin/datacopy
@@ -12,6 +13,7 @@ include/bkpublic.h
include/cspublic.h
include/cstypes.h
include/ctpublic.h
+include/odbcss.h
include/sqldb.h
include/sqlfront.h
include/sybdb.h
@@ -183,13 +185,13 @@ ${DOC}/reference/a00128.html
${DOC}/reference/a00129.html
${DOC}/reference/a00130.html
${DOC}/reference/a00131.html
-${DOC}/reference/a00132_source.html
-${DOC}/reference/a00133_source.html
-${DOC}/reference/a00134_source.html
-${DOC}/reference/a00135_source.html
-${DOC}/reference/a00136_source.html
-${DOC}/reference/a00137_source.html
-${DOC}/reference/a00138_source.html
+${DOC}/reference/a00132.html
+${DOC}/reference/a00133.html
+${DOC}/reference/a00134.html
+${DOC}/reference/a00135.html
+${DOC}/reference/a00136.html
+${DOC}/reference/a00137.html
+${DOC}/reference/a00138.html
${DOC}/reference/a00139_source.html
${DOC}/reference/a00140_source.html
${DOC}/reference/a00141_source.html
@@ -201,70 +203,55 @@ ${DOC}/reference/a00146_source.html
${DOC}/reference/a00147_source.html
${DOC}/reference/a00148_source.html
${DOC}/reference/a00149_source.html
-${DOC}/reference/a00150.html
${DOC}/reference/a00150_source.html
${DOC}/reference/a00151_source.html
${DOC}/reference/a00152_source.html
-${DOC}/reference/a00153.html
${DOC}/reference/a00153_source.html
${DOC}/reference/a00154_source.html
${DOC}/reference/a00155_source.html
${DOC}/reference/a00156_source.html
${DOC}/reference/a00157_source.html
+${DOC}/reference/a00158.html
${DOC}/reference/a00158_source.html
${DOC}/reference/a00159_source.html
${DOC}/reference/a00160_source.html
+${DOC}/reference/a00161.html
${DOC}/reference/a00161_source.html
${DOC}/reference/a00162_source.html
${DOC}/reference/a00163_source.html
${DOC}/reference/a00164_source.html
${DOC}/reference/a00165_source.html
+${DOC}/reference/a00166_source.html
+${DOC}/reference/a00167_source.html
+${DOC}/reference/a00168_source.html
+${DOC}/reference/a00169_source.html
+${DOC}/reference/a00170_source.html
${DOC}/reference/a00171_source.html
-${DOC}/reference/a00174_source.html
-${DOC}/reference/a00176_source.html
-${DOC}/reference/a00178_source.html
+${DOC}/reference/a00172_source.html
+${DOC}/reference/a00173_source.html
${DOC}/reference/a00180_source.html
-${DOC}/reference/a00186.html
+${DOC}/reference/a00183_source.html
+${DOC}/reference/a00185_source.html
${DOC}/reference/a00187_source.html
-${DOC}/reference/a00188.html
-${DOC}/reference/a00207_source.html
-${DOC}/reference/a00232_source.html
-${DOC}/reference/a00233_source.html
+${DOC}/reference/a00189_source.html
+${DOC}/reference/a00195.html
+${DOC}/reference/a00196_source.html
+${DOC}/reference/a00197.html
+${DOC}/reference/a00200_source.html
+${DOC}/reference/a00214_source.html
+${DOC}/reference/a00219_source.html
${DOC}/reference/a00243_source.html
-${DOC}/reference/a00247_source.html
-${DOC}/reference/a00248_source.html
-${DOC}/reference/a00257_source.html
-${DOC}/reference/a00260.html
-${DOC}/reference/a00261.html
-${DOC}/reference/a00262.html
-${DOC}/reference/a00263.html
-${DOC}/reference/a00264.html
-${DOC}/reference/a00265.html
-${DOC}/reference/a00266.html
-${DOC}/reference/a00267.html
-${DOC}/reference/a00268.html
-${DOC}/reference/a00269.html
-${DOC}/reference/a00270.html
-${DOC}/reference/a00271.html
-${DOC}/reference/a00272.html
-${DOC}/reference/a00273.html
-${DOC}/reference/a00274.html
-${DOC}/reference/a00275.html
-${DOC}/reference/a00276.html
-${DOC}/reference/a00277.html
-${DOC}/reference/a00278.html
-${DOC}/reference/a00279.html
-${DOC}/reference/a00280.html
-${DOC}/reference/a00281.html
-${DOC}/reference/a00282.html
-${DOC}/reference/a00284.html
-${DOC}/reference/a00285.html
-${DOC}/reference/a00286.html
-${DOC}/reference/a00287.html
-${DOC}/reference/a00288.html
-${DOC}/reference/a00289.html
-${DOC}/reference/a00290.html
-${DOC}/reference/a00291.html
+${DOC}/reference/a00246_source.html
+${DOC}/reference/a00250_source.html
+${DOC}/reference/a00251_source.html
+${DOC}/reference/a00263_source.html
+${DOC}/reference/a00268_source.html
+${DOC}/reference/a00271_source.html
+${DOC}/reference/a00272_source.html
+${DOC}/reference/a00273_source.html
+${DOC}/reference/a00281_source.html
+${DOC}/reference/a00286_source.html
+${DOC}/reference/a00289_source.html
${DOC}/reference/a00292.html
${DOC}/reference/a00293.html
${DOC}/reference/a00294.html
@@ -288,7 +275,6 @@ ${DOC}/reference/a00311.html
${DOC}/reference/a00312.html
${DOC}/reference/a00313.html
${DOC}/reference/a00314.html
-${DOC}/reference/a00315.html
${DOC}/reference/a00316.html
${DOC}/reference/a00317.html
${DOC}/reference/a00318.html
@@ -355,6 +341,7 @@ ${DOC}/reference/a00378.html
${DOC}/reference/a00379.html
${DOC}/reference/a00380.html
${DOC}/reference/a00381.html
+${DOC}/reference/a00382.html
${DOC}/reference/a00383.html
${DOC}/reference/a00384.html
${DOC}/reference/a00385.html
@@ -380,7 +367,6 @@ ${DOC}/reference/a00404.html
${DOC}/reference/a00405.html
${DOC}/reference/a00406.html
${DOC}/reference/a00407.html
-${DOC}/reference/a00408.html
${DOC}/reference/a00409.html
${DOC}/reference/a00410.html
${DOC}/reference/a00411.html
@@ -388,6 +374,45 @@ ${DOC}/reference/a00412.html
${DOC}/reference/a00413.html
${DOC}/reference/a00414.html
${DOC}/reference/a00415.html
+${DOC}/reference/a00416.html
+${DOC}/reference/a00417.html
+${DOC}/reference/a00418.html
+${DOC}/reference/a00419.html
+${DOC}/reference/a00420.html
+${DOC}/reference/a00421.html
+${DOC}/reference/a00422.html
+${DOC}/reference/a00423.html
+${DOC}/reference/a00424.html
+${DOC}/reference/a00425.html
+${DOC}/reference/a00426.html
+${DOC}/reference/a00427.html
+${DOC}/reference/a00428.html
+${DOC}/reference/a00429.html
+${DOC}/reference/a00430.html
+${DOC}/reference/a00431.html
+${DOC}/reference/a00432.html
+${DOC}/reference/a00433.html
+${DOC}/reference/a00434.html
+${DOC}/reference/a00435.html
+${DOC}/reference/a00436.html
+${DOC}/reference/a00437.html
+${DOC}/reference/a00438.html
+${DOC}/reference/a00439.html
+${DOC}/reference/a00440.html
+${DOC}/reference/a00441.html
+${DOC}/reference/a00442.html
+${DOC}/reference/a00443.html
+${DOC}/reference/a00444.html
+${DOC}/reference/a00445.html
+${DOC}/reference/a00446.html
+${DOC}/reference/a00447.html
+${DOC}/reference/a00448.html
+${DOC}/reference/a00449.html
+${DOC}/reference/a00450.html
+${DOC}/reference/a00451.html
+${DOC}/reference/a00452.html
+${DOC}/reference/a00453.html
+${DOC}/reference/a00454.html
${DOC}/reference/all_5f.html
${DOC}/reference/all_62.html
${DOC}/reference/all_63.html
@@ -409,7 +434,6 @@ ${DOC}/reference/all_75.html
${DOC}/reference/all_77.html
${DOC}/reference/all_79.html
${DOC}/reference/annotated.html
-${DOC}/reference/bc_s.png
${DOC}/reference/classes.html
${DOC}/reference/classes_5f.html
${DOC}/reference/classes_62.html
@@ -423,9 +447,8 @@ ${DOC}/reference/classes_70.html
${DOC}/reference/classes_73.html
${DOC}/reference/classes_74.html
${DOC}/reference/close.png
-${DOC}/reference/closed.png
+${DOC}/reference/defines_62.html
${DOC}/reference/defines_64.html
-${DOC}/reference/defines_73.html
${DOC}/reference/defines_74.html
${DOC}/reference/doxygen.css
${DOC}/reference/doxygen.png
@@ -448,7 +471,6 @@ ${DOC}/reference/globals.html
${DOC}/reference/globals_0x62.html
${DOC}/reference/globals_0x64.html
${DOC}/reference/globals_0x72.html
-${DOC}/reference/globals_0x73.html
${DOC}/reference/globals_0x74.html
${DOC}/reference/globals_defs.html
${DOC}/reference/globals_enum.html
@@ -462,22 +484,15 @@ ${DOC}/reference/globals_type.html
${DOC}/reference/globals_vars.html
${DOC}/reference/index.html
${DOC}/reference/installdox
-${DOC}/reference/mag_sel.png
${DOC}/reference/modules.html
-${DOC}/reference/nav_f.png
-${DOC}/reference/nav_h.png
${DOC}/reference/nomatches.html
-${DOC}/reference/open.png
${DOC}/reference/pages.html
${DOC}/reference/search.css
${DOC}/reference/search.js
-${DOC}/reference/search_l.png
-${DOC}/reference/search_m.png
-${DOC}/reference/search_r.png
-${DOC}/reference/tab_a.png
-${DOC}/reference/tab_b.png
-${DOC}/reference/tab_h.png
-${DOC}/reference/tab_s.png
+${DOC}/reference/search.png
+${DOC}/reference/tab_b.gif
+${DOC}/reference/tab_l.gif
+${DOC}/reference/tab_r.gif
${DOC}/reference/tabs.css
${DOC}/reference/typedefs_64.html
${DOC}/reference/typedefs_74.html
@@ -504,6 +519,7 @@ ${DOC}/userguide/about.htm
${DOC}/userguide/aboutunicode.htm
${DOC}/userguide/acknowledgments.htm
${DOC}/userguide/advocacy.htm
+${DOC}/userguide/ambition.htm
${DOC}/userguide/apireference.htm
${DOC}/userguide/appendmode.htm
${DOC}/userguide/askingforhelp.htm
@@ -542,10 +558,17 @@ ${DOC}/userguide/interfacesformat.htm
${DOC}/userguide/interfaceslocation.htm
${DOC}/userguide/interfacespurpose.htm
${DOC}/userguide/iso8859.htm
+${DOC}/userguide/isolatecause.htm
+${DOC}/userguide/kerberos.htm
+${DOC}/userguide/light.taper.htm
+${DOC}/userguide/linker.conclusion.htm
+${DOC}/userguide/linker.how.htm
+${DOC}/userguide/linker.library.check.htm
${DOC}/userguide/locales.htm
${DOC}/userguide/localization.htm
${DOC}/userguide/logging.htm
${DOC}/userguide/mailinglist.htm
+${DOC}/userguide/name.lookup.htm
${DOC}/userguide/odbc.api.summary.htm
${DOC}/userguide/odbcconnattr.htm
${DOC}/userguide/odbcdiagnose.htm
@@ -561,6 +584,9 @@ ${DOC}/userguide/prepodbc.htm
${DOC}/userguide/programming.htm
${DOC}/userguide/projects.htm
${DOC}/userguide/python.htm
+${DOC}/userguide/qt.htm
+${DOC}/userguide/rtl.define.library.htm
+${DOC}/userguide/rtl.htm
${DOC}/userguide/samplecode.htm
${DOC}/userguide/seemtooslow.htm
${DOC}/userguide/serverthere.htm
@@ -574,12 +600,16 @@ ${DOC}/userguide/unicode.htm
${DOC}/userguide/unicodefreetds.htm
${DOC}/userguide/unicodegoodbad.htm
${DOC}/userguide/unicodeutf.htm
+${DOC}/userguide/uodbc.htm
+${DOC}/userguide/uothread.htm
${DOC}/userguide/usefreetds.htm
${DOC}/userguide/userguide.css
${DOC}/userguide/what.htm
share/examples/freetds/
-share/examples/freetds/freetds.conf-sample
-@sample ${SYSCONFDIR}/freetds.conf
-share/examples/freetds/pool.conf-sample
%%SHARED%%
+share/examples/freetds/freetds.conf
+@sample ${SYSCONFDIR}/freetds.conf
+share/examples/freetds/locales.conf
+share/examples/freetds/pool.conf
+@extra ${SYSCONFDIR}/locales.conf
@extra ${SYSCONFDIR}/pool.conf
