gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 205 deletions

diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 27c53a2d5e70..830b9073d73e 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,6 +1,3 @@
-AUX unixODBC-2.3.5-CVE-2018-7485.patch 5224 BLAKE2B a21d659f75f9ae11a6d78a4a74b0591786800e14f22d7fb4c7ef5005e0630b95453a319d9254bf3f5e423e74ae36c6a7bd097f3193869757b2bea34f8974e358 SHA512 a4d5dfafe75ea0e85feed76cf18474a89fcf6719ee58d0b56d57959526db2511df2df691bf9af2e1a34c716d2d90f6d274b48a11cfb7add74df799d1f1f67387
-DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
 DIST unixODBC-2.3.7.tar.gz 1669501 BLAKE2B 0e6b2130b72ccfed3a26877ff1c8af9adc7cc514002d3198d5249a12da5de03322178bf0847b92336b5a373893751bf3cb5aec4c251163a3c9f0ef98c90e5db8 SHA512 a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70
-EBUILD unixODBC-2.3.5-r1.ebuild 1797 BLAKE2B 2fe6813cbc5430bf3c76e917437ca7c60a21eeb172a594cba9b58c007dbabf2ae8266659d5dee6ed75db0b32a0e38926d0f8d29bfe21e346fdf598f68e242495 SHA512 124d96f591fbf86bfa8d6e7c3097ca164ebd026cc4535dabc80319e6238b53adf7ab284bb6e3eb71b20cc0639dee589a05ddc3f2f1a138c5f09a65f6053e77a9
-EBUILD unixODBC-2.3.7.ebuild 1756 BLAKE2B 607e1144f67df15513540fcdaf13f3e56c7d8c683bd31ac33339610b4987d03b1f6c41cac5f41e8a2c66227715d046e5e16b75b22626c4cd35d805b253957936 SHA512 043f0dce97a1078f023ffc9789d7c01f392421739fd1d16ecb62f469964dfeca93716a4c6328b63d8884c727a9c460fd79f393bb8f67af05f4020afbb0a701be
+EBUILD unixODBC-2.3.7.ebuild 1752 BLAKE2B e82a6a3037cdf7568aafa03e5d8c1792af8ea94213b7658eb23e5680ffeb79e5ba834ec7a928a535727625a736c3826203013fcd90f0e1a2db65193bab95311b SHA512 ca30504d325086e1d8093cac9f44163cb2c77a17a85e4e3d0365566d0646f457fd02f8836217f23d1dc7b3fe3e52c31d84c3f2d65e16da073c589bd6e6cd9072
 MISC metadata.xml 393 BLAKE2B aae8c823c6e3d1a3b21910c6aece373e66e62c6686b152f1f6c8fb980a4c58b19dce1144afb76219d4d4e451ee097afe0f031130e82cbf933e6ac1ba3d4f1cc5 SHA512 76f899e62d86b476cc9f97daffe5c67fba8fe217fb0d6c0b1b39f2de8e6a92350e6d0433f37f54f57875d3cbb3be7908eaa9a3b1717fc1da687a1789062c0f86
diff --git a/dev-db/unixODBC/files/unixODBC-2.3.5-CVE-2018-7485.patch b/dev-db/unixODBC/files/unixODBC-2.3.5-CVE-2018-7485.patch
deleted file mode 100644
index 2c4178cda48f..000000000000
--- a/dev-db/unixODBC/files/unixODBC-2.3.5-CVE-2018-7485.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 45ef78e037f578b15fc58938a3a3251655e71d6f Mon Sep 17 00:00:00 2001
-From: Nick Gorham <nick@lurcher.ink.org>
-Date: Mon, 8 Jan 2018 11:12:39 +0000
-Subject: [PATCH] New Pre Source
-
-diff --git a/DriverManager/SQLGetDiagRecW.c b/DriverManager/SQLGetDiagRecW.c
-index a6368d7..be89120 100644
---- a/DriverManager/SQLGetDiagRecW.c
-+++ b/DriverManager/SQLGetDiagRecW.c
-@@ -98,6 +98,8 @@
- 
- static char const rcsid[]= "$RCSfile: SQLGetDiagRecW.c,v $";
- 
-+extern int __is_env( EHEAD * head );        /* in SQLGetDiagRec.c */
-+
- static SQLRETURN extract_sql_error_rec_w( EHEAD *head,
-         SQLWCHAR *sqlstate,
-         SQLINTEGER rec_number,
-diff --git a/DriverManager/SQLSetDescField.c b/DriverManager/SQLSetDescField.c
-index 333d786..0e2f67c 100644
---- a/DriverManager/SQLSetDescField.c
-+++ b/DriverManager/SQLSetDescField.c
-@@ -306,7 +306,7 @@ SQLRETURN SQLSetDescField( SQLHDESC descriptor_handle,
-         return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
-     }
- 
--    if ( field_identifier == SQL_DESC_COUNT && (SQLINTEGER)value < 0 )
-+    if ( field_identifier == SQL_DESC_COUNT && (intptr_t)value < 0 )
-     {
-         __post_internal_error( &descriptor -> error,
-                 ERROR_07009, NULL,
-@@ -315,9 +315,9 @@ SQLRETURN SQLSetDescField( SQLHDESC descriptor_handle,
-         return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
-     }
-     
--    if ( field_identifier == SQL_DESC_PARAMETER_TYPE && value != SQL_PARAM_INPUT
--        && value != SQL_PARAM_OUTPUT && value != SQL_PARAM_INPUT_OUTPUT &&
--        value != SQL_PARAM_INPUT_OUTPUT_STREAM && value != SQL_PARAM_OUTPUT_STREAM )
-+    if ( field_identifier == SQL_DESC_PARAMETER_TYPE && (intptr_t)value != SQL_PARAM_INPUT
-+        && (intptr_t)value != SQL_PARAM_OUTPUT && (intptr_t)value != SQL_PARAM_INPUT_OUTPUT &&
-+        (intptr_t)value != SQL_PARAM_INPUT_OUTPUT_STREAM && (intptr_t)value != SQL_PARAM_OUTPUT_STREAM )
-     {
-         __post_internal_error( &descriptor -> error,
-                 ERROR_HY105, NULL,
-diff --git a/DriverManager/SQLSetDescFieldW.c b/DriverManager/SQLSetDescFieldW.c
-index 5e066ac..45125ff 100644
---- a/DriverManager/SQLSetDescFieldW.c
-+++ b/DriverManager/SQLSetDescFieldW.c
-@@ -288,7 +288,7 @@ SQLRETURN SQLSetDescFieldW( SQLHDESC descriptor_handle,
-         return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
-     }
- 
--    if ( field_identifier == SQL_DESC_COUNT && (SQLINTEGER)value < 0 )
-+    if ( field_identifier == SQL_DESC_COUNT && (intptr_t)value < 0 )
-     {
-         __post_internal_error( &descriptor -> error,
-                 ERROR_07009, NULL,
-@@ -297,9 +297,9 @@ SQLRETURN SQLSetDescFieldW( SQLHDESC descriptor_handle,
-         return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
-     }
- 
--    if ( field_identifier == SQL_DESC_PARAMETER_TYPE && value != SQL_PARAM_INPUT
--        && value != SQL_PARAM_OUTPUT && value != SQL_PARAM_INPUT_OUTPUT &&
--        value != SQL_PARAM_INPUT_OUTPUT_STREAM && value != SQL_PARAM_OUTPUT_STREAM )
-+    if ( field_identifier == SQL_DESC_PARAMETER_TYPE && (intptr_t)value != SQL_PARAM_INPUT
-+        && (intptr_t)value != SQL_PARAM_OUTPUT && (intptr_t)value != SQL_PARAM_INPUT_OUTPUT &&
-+        (intptr_t)value != SQL_PARAM_INPUT_OUTPUT_STREAM && (intptr_t)value != SQL_PARAM_OUTPUT_STREAM )
-     {
-         __post_internal_error( &descriptor -> error,
-                 ERROR_HY105, NULL,
-diff --git a/exe/iusql.c b/exe/iusql.c
-index aac5329..484a889 100644
---- a/exe/iusql.c
-+++ b/exe/iusql.c
-@@ -413,7 +413,6 @@ static int ExecuteSQL( SQLHDBC hDbc, char *szSQL, char cDelimiter, int bColumnNa
-             if ( bVerbose ) DumpODBCLog( hEnv, hDbc, hStmt );
-             fprintf( stderr, "[ISQL]ERROR: Could not SQLExecDirect\n" );
-             SQLFreeStmt( hStmt, SQL_DROP );
--            free(szSepLine);
-             return 0;
-         }
-     }
-diff --git a/odbcinst/SQLCreateDataSource.c b/odbcinst/SQLCreateDataSource.c
-index a9fa735..83a1e9e 100644
---- a/odbcinst/SQLCreateDataSource.c
-+++ b/odbcinst/SQLCreateDataSource.c
-@@ -26,7 +26,7 @@ char* _multi_string_alloc_and_copy( LPCWSTR in )
- 
-     if ( !in )
-     {
--        return in;
-+        return NULL;
-     }
- 
-     while ( in[ len ] != 0 || in[ len + 1 ] != 0 )
-@@ -55,7 +55,7 @@ char* _single_string_alloc_and_copy( LPCWSTR in )
- 
-     if ( !in )
-     {
--        return in;
-+        return NULL;
-     }
- 
-     while ( in[ len ] != 0 )
-@@ -83,7 +83,7 @@ SQLWCHAR* _multi_string_alloc_and_expand( LPCSTR in )
- 
-     if ( !in )
-     {
--        return in;
-+        return NULL;
-     }
-     
-     while ( in[ len ] != 0 || in[ len + 1 ] != 0 )
-@@ -112,7 +112,7 @@ SQLWCHAR* _single_string_alloc_and_expand( LPCSTR in )
- 
-     if ( !in )
-     {
--        return in;
-+        return NULL;
-     }
- 
-     while ( in[ len ] != 0 )
-diff --git a/odbcinst/SQLWriteFileDSN.c b/odbcinst/SQLWriteFileDSN.c
-index c2f987b..e225796 100644
---- a/odbcinst/SQLWriteFileDSN.c
-+++ b/odbcinst/SQLWriteFileDSN.c
-@@ -21,7 +21,7 @@ BOOL SQLWriteFileDSN(			LPCSTR	pszFileName,
- 
- 	if ( pszFileName[0] == '/' )
- 	{
--		strncpy( szFileName, sizeof(szFileName) - 5, pszFileName );
-+		strncpy( szFileName, pszFileName, sizeof(szFileName) - 5 );
- 	}
- 	else
- 	{	
diff --git a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
deleted file mode 100644
index 3686943d6ce1..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit libtool ltprune multilib-minimal
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND="
-	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.5-CVE-2018-7485.patch"
-)
-
-multilib_src_configure() {
-	# --enable-driver-conf is --enable-driverc as per configure.in
-	myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-		--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*
-	prune_libtool_files
-}
diff --git a/dev-db/unixODBC/unixODBC-2.3.7.ebuild b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
index 5a39d6440f66..9be7c7f26a22 100644
--- a/dev-db/unixODBC/unixODBC-2.3.7.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="