From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 23 20:40:27 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 86E0B16A404 for ; Tue, 23 Jan 2007 20:40:27 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 2034913C442 for ; Tue, 23 Jan 2007 20:40:27 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l0NKeQax003392 for ; Tue, 23 Jan 2007 20:40:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l0NKeQ9J003388; Tue, 23 Jan 2007 20:40:26 GMT (envelope-from gnats) Date: Tue, 23 Jan 2007 20:40:26 GMT Message-Id: <200701232040.l0NKeQ9J003388@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Lapo Luchini Cc: Subject: Re: ports/107874: port databases/freetds: fix for MSSQL 7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Lapo Luchini List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2007 20:40:27 -0000 The following reply was made to PR ports/107874; it has been noted by GNATS. From: Lapo Luchini To: bug-followup@FreeBSD.org Cc: Alex Kiesel Subject: Re: ports/107874: port databases/freetds: fix for MSSQL 7 Date: Tue, 23 Jan 2007 21:11:51 +0100 BTW: upgrade to 0.64 *seems* to be working with no effort (at least for me, on 6.2-STABLE). diff -ruN freetds-orig/Makefile freetds/Makefile --- freetds-orig/Makefile Thu May 4 23:39:57 2006 +++ freetds/Makefile Tue Jan 23 20:20:17 2007 @@ -5,8 +5,7 @@ # $FreeBSD: ports/databases/freetds/Makefile,v 1.45 2006/05/04 21:39:57 edwin Exp $ PORTNAME= freetds -PORTVERSION= 0.63 -PORTREVISION= 1 +PORTVERSION= 0.64 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/freetds/stable diff -ruN freetds-orig/distinfo freetds/distinfo --- freetds-orig/distinfo Sun Jan 22 09:23:17 2006 +++ freetds/distinfo Tue Jan 23 20:21:24 2007 @@ -1,3 +1,3 @@ -MD5 (freetds-0.63.tar.gz) = a0a5038cfb708180308b381f848baf75 -SHA256 (freetds-0.63.tar.gz) = 8661ad1d58263220551745d4ef529250a412440e64e373612f569c709b09dcd2 -SIZE (freetds-0.63.tar.gz) = 1321466 +MD5 (freetds-0.64.tar.gz) = ecfee5d6c96932172a1f29fb215c9d23 +SHA256 (freetds-0.64.tar.gz) = 27eeef4049590f459189f859fa73dae27604ea0bf4f197e304f9934c39312c3b +SIZE (freetds-0.64.tar.gz) = 1414954 diff -ruN freetds-orig/files/patch-src_tds_iconv.c freetds/files/patch-src_tds_iconv.c --- freetds-orig/files/patch-src_tds_iconv.c Thu Jan 1 01:00:00 1970 +++ freetds/files/patch-src_tds_iconv.c Tue Jan 23 20:21:50 2007 @@ -0,0 +1,23 @@ +--- src/tds/iconv.c.orig Fri Feb 24 22:14:28 2006 ++++ src/tds/iconv.c Tue Jan 23 20:21:43 2007 +@@ -970,13 +970,18 @@ + #if HAVE_ICONV_ALWAYS + TDSICONV *char_conv = tds->char_convs[client2server_chardata]; + +- const char *canonic_charset = tds_canonical_charset_name(charset); ++ int canonic_charset_num = tds_canonical_charset(charset); ++ const char *canonic_charset; ++ ++ if (tds->major_version >= 7 && canonic_charset_num == TDS_CHARSET_ISO_8859_1) ++ canonic_charset_num = TDS_CHARSET_CP1252; + + /* ignore request to change to unknown charset */ +- if (!canonic_charset) { ++ if (canonic_charset_num < 0) { + tdsdump_log(TDS_DBG_FUNC, "tds_srv_charset_changed: what is charset \"%s\"?\n", charset); + return; + } ++ canonic_charset = canonic_charsets[canonic_charset_num].name; + + if (strcmp(canonic_charset, char_conv->server_charset.name) == 0) + return;