gentoo auto-resync : 14:12:2024 - 02:02:07

3 files changed, 113 insertions, 0 deletions

diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index fd327639bc0a..4f24281af113 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,3 +1,5 @@
+AUX unixODBC-2.3.12-bug-936060.patch 1018 BLAKE2B 3efeb58341af9e004bbc9adc4652a64ff8149a0d89bb1e73925b5e282240c2976f87aaf22656c584443e307e2f97bd36d57acc127526f3d8285480445371904d SHA512 812d3cac8a2168e477ff231dbef3fbcda41caac87368811ae192dcd67483553b97d14a6028624509dc772b0ab6cbc59917390f43131fd7e90b40dc6a199dbb4d
 DIST unixODBC-2.3.12.tar.gz 1753915 BLAKE2B 9da9b0fb5ff962db8ec1483b700aca5d4adf88f3349b22010bd0b4b4ec1fe2e7a51d761527e3b9e49b08286a00e55aadc38c320a6db512ba52f491aecad7fd83 SHA512 ca9d8db943195679a44db1fc09391dc6662ab1721112c93d448f04011e98502462ffe14b8364eb03707d851db456eced20eb61a22370392ca88d917038d45b56
+EBUILD unixODBC-2.3.12-r1.ebuild 1968 BLAKE2B 608a66ab7a8518a832c8b53e53cf6b93678f77638844a6492fcb5d5760d8e26a0e6d5f8b0ceecb05c8d5ac60ec25009b22f675fe524668430e20f312a913ecfb SHA512 96cc2bba289b90b7adbf758777751a814e649a2b98a2e415f703019c7a6c50fb24f9ebfefe992b8575b71177c70828be082b56638997009083285b40865297b3
 EBUILD unixODBC-2.3.12.ebuild 1910 BLAKE2B d5c84937b47a9659e8a077c0188c2266f4fa5b61c74195db20093c55fe87a7c71fd55ce792d00c1eff9f56586e4d3562f79b33d99690a3517cfdbc4c48423e82 SHA512 3306788ded0d691280796f8881682ada3a7e5489bba5f170645f430da233cf12e17b39d25c3fb0e5c835814bcb481ad8b0c7edcb8d8454fdf7dcbb8d7f30280f
 MISC metadata.xml 479 BLAKE2B 298fd55d5c29508598a3e221f0d3b850b3f2e195885460c5a9cb9d4111d9246576d1ae0c8c586f6484931ea2b8b9a2e0127db5e4c01c456e66fb66436b62f2aa SHA512 a751b3121ce1298c50e4f66ce8c654d578be088fdf52490a4149d380053bef287736d27ef1b430fef789019cc1e0f53904cafc6c292d984a78da105a493be6a5
diff --git a/dev-db/unixODBC/files/unixODBC-2.3.12-bug-936060.patch b/dev-db/unixODBC/files/unixODBC-2.3.12-bug-936060.patch
new file mode 100644
index 000000000000..55131a34e851
--- /dev/null
+++ b/dev-db/unixODBC/files/unixODBC-2.3.12-bug-936060.patch
@@ -0,0 +1,33 @@
+This issue has been reported and fixed upstream, but not yet released. See links below.
+
+https://bugs.gentoo.org/936060
+https://github.com/lurcher/unixODBC/issues/158
+https://github.com/lurcher/unixODBC/commit/45f501e1be2db6b017cc242c79bfb9de32b332a1
+--- a/Drivers/Postgre7.1/info.c
++++ b/Drivers/Postgre7.1/info.c
+@@ -1779,14 +1779,14 @@
+ char index_name[MAX_INFO_STRING];
+ short fields_vector[8];
+ char isunique[10], isclustered[10];
+-SDWORD index_name_len, fields_vector_len;
++SQLLEN index_name_len, fields_vector_len;
+ TupleNode *row;
+ int i;
+ HSTMT hcol_stmt;
+ StatementClass *col_stmt, *indx_stmt;
+ char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING];
+ char **column_names = 0;
+-Int4 column_name_len;
++SQLLEN column_name_len;
+ int total_columns = 0;
+ char error = TRUE;
+ ConnInfo *ci;
+@@ -2136,7 +2136,7 @@
+ StatementClass *tbl_stmt;
+ char tables_query[STD_STATEMENT_LEN];
+ char attname[MAX_INFO_STRING];
+-SDWORD attname_len;
++SQLLEN attname_len;
+ char pktab[MAX_TABLE_LEN + 1];
+ Int2 result_cols;
+ 
diff --git a/dev-db/unixODBC/unixODBC-2.3.12-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.12-r1.ebuild
new file mode 100644
index 000000000000..87141847f80b
--- /dev/null
+++ b/dev-db/unixODBC/unixODBC-2.3.12-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Complete ODBC driver manager"
+HOMEPAGE="https://www.unixodbc.org/"
+SRC_URI="https://www.unixodbc.org/unixODBC-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+minimal odbcmanual static-libs unicode"
+
+RDEPEND="
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-libs/readline-6.2_p5-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bug-936060.patch
+)
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/unixODBC/unixodbc_conf.h /usr/include/unixodbc.h )
+
+src_prepare() {
+	default
+
+	# Only needed for config.h install patch
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Needs flex, bison
+	export LEX=flex
+	unset YACC
+
+	# --enable-driver-conf is --enable-driverc as per configure.in
+	local myeconfargs=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--sysconfdir="${EPREFIX}"/etc/${PN}
+		--disable-editline
+		--disable-static
+		--enable-iconv
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable !minimal drivers)
+		$(use_enable !minimal driverc)
+		$(use_with unicode iconv-char-enc UTF8)
+		$(use_with unicode iconv-ucode-enc UTF16LE)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use odbcmanual ; then
+		# We could simply run "make install-html" if we'd not had
+		# out-of-source builds here.
+		docinto html
+		dodoc -r doc/.
+		find "${ED}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
+	fi
+
+	use prefix && dodoc README*
+	find "${ED}" -type f -name '*.la' -delete || die
+}