Fix for bug 498374

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key C4A92BF5)

3 files changed, 78 insertions, 2 deletions

diff --git a/dev-db/freetds/ChangeLog b/dev-db/freetds/ChangeLog
index 9b04d2b00847..0c21dca0ecfa 100644
--- a/dev-db/freetds/ChangeLog
+++ b/dev-db/freetds/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/freetds
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/ChangeLog,v 1.65 2013/08/27 22:32:15 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/ChangeLog,v 1.66 2014/01/22 13:37:30 olemarkus Exp $
+
+*freetds-0.91-r1 (22 Jan 2014)
+
+  22 Jan 2014; Ole Markus With <olemarkus@gentoo.org>
+  +files/freetds-0.91-fix_field_aliases.patch, +freetds-0.91-r1.ebuild:
+  Fix for bug 498374
 
   27 Aug 2013; Alexis Ballier <aballier@gentoo.org> freetds-0.91.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-db/freetds/files/freetds-0.91-fix_field_aliases.patch b/dev-db/freetds/files/freetds-0.91-fix_field_aliases.patch
new file mode 100644
index 000000000000..c5699af5d1d9
--- /dev/null
+++ b/dev-db/freetds/files/freetds-0.91-fix_field_aliases.patch
@@ -0,0 +1,21 @@
+Gentoo bug: 498374
+
+diff -Nru freetds-0.91/src/odbc/odbc.c freetds-0.91/src/odbc/odbc.c
+--- freetds-0.91/src/odbc/odbc.c.orig	2010-03-22 09:42:16.000000000 -0500
++++ freetds-0.91/src/odbc/odbc.c	2010-05-06 16:00:00.000000000 -0500
+@@ -3012,12 +3012,9 @@
+ 
+ 		odbc_set_sql_type_info(col, drec, stmt->dbc->env->attr.odbc_version);
+ 
+-		if (!col->table_column_name) {
+-			if (!tds_dstr_copyn(&drec->sql_desc_name, col->column_name, col->column_namelen))
+-				return SQL_ERROR;
+-		} else {
+-			if (!tds_dstr_copy(&drec->sql_desc_name, col->table_column_name))
+-				return SQL_ERROR;
++		if (!tds_dstr_copyn(&drec->sql_desc_name, col->column_name, col->column_namelen))
++			return SQL_ERROR;
++		if (col->table_column_name) {
+ 			if (!tds_dstr_copy(&drec->sql_desc_base_column_name, col->table_column_name))
+ 				return SQL_ERROR;
+ 		}
diff --git a/dev-db/freetds/freetds-0.91-r1.ebuild b/dev-db/freetds/freetds-0.91-r1.ebuild
new file mode 100644
index 000000000000..c15cd9d7b370
--- /dev/null
+++ b/dev-db/freetds/freetds-0.91-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.91-r1.ebuild,v 1.1 2014/01/22 13:37:30 olemarkus Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Tabular Datastream Library"
+HOMEPAGE="http://www.freetds.org/"
+SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+IUSE="kerberos odbc iodbc mssql"
+RESTRICT="test"
+
+DEPEND="
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	odbc? ( dev-db/unixODBC )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	config_rpath_update
+	sed -ie 's:with_iodbc/include":with_iodbc/include/iodbc":' configure.ac || die
+	epatch ${FILESDIR}/freetds-0.91-fix_field_aliases.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--with-tdsver=7.0 $(use_enable mssql msdblib)"
+
+	if use iodbc ; then
+		myconf="${myconf} --enable-odbc --with-iodbc=${EPREFIX}/usr"
+	elif use odbc ; then
+		myconf="${myconf} --enable-odbc --with-unixodbc=${EPREFIX}/usr"
+	fi
+	if use kerberos ; then
+		myconf="${myconf} --enable-krb5"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="doc/${PF}" install
+}