summaryrefslogtreecommitdiff
path: root/dev-db/unixODBC
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-09-09 12:30:03 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-09-09 12:30:03 +0100
commitd8a7472fc6314625f7d16e0427004eb448412908 (patch)
tree0dba2e223a5a5e200a4b84a4a5e3ff690e5059e7 /dev-db/unixODBC
parent8e49340ce0aaf205556648d8fa27dd30e8cf4435 (diff)
gentoo auto-resync : 09:09:2024 - 12:30:03
Diffstat (limited to 'dev-db/unixODBC')
-rw-r--r--dev-db/unixODBC/Manifest4
-rw-r--r--dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch33
-rw-r--r--dev-db/unixODBC/files/unixODBC-2.3.9-clang16.patch345
-rw-r--r--dev-db/unixODBC/unixODBC-2.3.11.ebuild79
4 files changed, 0 insertions, 461 deletions
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 8f7234e6c3f8..66f8da878333 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,7 +1,3 @@
-AUX unixODBC-2.3.11-config-no-install.patch 794 BLAKE2B 561f90c8f72938a525bc1f9870d62f800e147dc29681d60872804a001462c478977a6a644c253389adf3c412823c338cb97e34a0a59a0be19498fd3386c03d5c SHA512 cd00331a01313acb75fa762ff7d7dc61a01fa4a8a2225c8e0b0c28fc1e337954b48de38ec1aca3d459135faedae843f88799d406019a2056f98c9c9a93c173ee
-AUX unixODBC-2.3.9-clang16.patch 9332 BLAKE2B 8037f82286ae4a94698803530647ffb6d29c9b85da60320cbee27c60aa4bf6e004cba99abb5d5fc209be67a6fe016c6ed572fd179a75c5fe50b6403962fd11f7 SHA512 e1f92c192c6d441a4c3cf051fbb4929af403552c21a23adcf30657ad4bcbd4ca416322ea2e1bec6d1b1f0fb9883b243b1b84460746d56a8b28015f801af6b157
-DIST unixODBC-2.3.11.tar.gz 1752585 BLAKE2B fa1502d7b83c8c10ee9d54b23281096156a3e3ec893b81acf125cd95c1de0f4ae7657ab3b4c5214a5c6a0fc9209e53cd9acdf6f99e65840e0a05366182af5600 SHA512 dddc32f90a7962e6988e1130a8093c6fb8b9ff532cad270d572250324aecbc739f45f9d8021d217313910bab25b08e69009b4f87456575535e93be1f46f5f13d
DIST unixODBC-2.3.12.tar.gz 1753915 BLAKE2B 9da9b0fb5ff962db8ec1483b700aca5d4adf88f3349b22010bd0b4b4ec1fe2e7a51d761527e3b9e49b08286a00e55aadc38c320a6db512ba52f491aecad7fd83 SHA512 ca9d8db943195679a44db1fc09391dc6662ab1721112c93d448f04011e98502462ffe14b8364eb03707d851db456eced20eb61a22370392ca88d917038d45b56
-EBUILD unixODBC-2.3.11.ebuild 2014 BLAKE2B df9d7a1c6b0934dc02763883c2d5aa813e187bab0f84a296a45f1daab965e9176d4fa46afc2de12b6c6ecadbac44d84ab8c1c21cf3cbb7b1754657af6afe8165 SHA512 581973d3863f3e728e6c3ab7d02143ab9d77ee64b37570226ae760ab235354da75127357254b77a57490e504529e7f0f3d24d1b0ccb93e264dddb005f9aa1bbc
EBUILD unixODBC-2.3.12.ebuild 1916 BLAKE2B 1ace94cab0984c9b2f757a901c6338cb3384e3f9e514edcbbe24d19d142324192e0573077e626aaeb4e0997fcd4746a86f3dd68ae01e4cbcdaa24c2e1a30145c SHA512 2e58e1a36790a42165ad57e9f7528bb97847aea978497e4148f9570ad8dc48efaab0f3b49a89b0eb2f04e80727f3a78b049843fec2580a5bd1161d174fca4f76
MISC metadata.xml 479 BLAKE2B 298fd55d5c29508598a3e221f0d3b850b3f2e195885460c5a9cb9d4111d9246576d1ae0c8c586f6484931ea2b8b9a2e0127db5e4c01c456e66fb66436b62f2aa SHA512 a751b3121ce1298c50e4f66ce8c654d578be088fdf52490a4149d380053bef287736d27ef1b430fef789019cc1e0f53904cafc6c292d984a78da105a493be6a5
diff --git a/dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch b/dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch
deleted file mode 100644
index f7b276523f83..000000000000
--- a/dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/lurcher/unixODBC/commit/685df9e2b4fbbd191ab081a2020956aa78295fe0
-
-From 685df9e2b4fbbd191ab081a2020956aa78295fe0 Mon Sep 17 00:00:00 2001
-From: Hugh McMaster <hugh.mcmaster@outlook.com>
-Date: Fri, 13 May 2022 22:03:37 +1000
-Subject: [PATCH] Makefile.am: Do not install config.h
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--ACLOCAL_AMFLAGS=-I m4
-+ACLOCAL_AMFLAGS=-I m4
-
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = \
-@@ -21,7 +21,7 @@ SUBDIRS = \
- include \
- doc \
- man \
-- samples
-+ samples
-
- EXTRA_DIST = \
- README.OSX \
-@@ -47,7 +47,7 @@ EXTRA_DIST = \
-
- include_HEADERS = unixodbc.h
-
--pkginclude_HEADERS = unixodbc_conf.h config.h
-+pkginclude_HEADERS = unixodbc_conf.h
-
- install-data-hook:
- -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/ODBCDataSources
diff --git a/dev-db/unixODBC/files/unixODBC-2.3.9-clang16.patch b/dev-db/unixODBC/files/unixODBC-2.3.9-clang16.patch
deleted file mode 100644
index 0e594487e666..000000000000
--- a/dev-db/unixODBC/files/unixODBC-2.3.9-clang16.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-https://github.com/lurcher/unixODBC/pull/138
-
-From d4782b9eea043de2a08519af3f1c49f56d917022 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Wed, 12 Apr 2023 21:28:26 +0200
-Subject: [PATCH] Avoid implicit function declarations, for C99 compatibility
-
-Add additional prototypes and #include directives for system headers, so
-that builds will not fail with compilers which do not support implicit
-function declarations by default.
---- a/Drivers/Postgre7.1/bind.h
-+++ b/Drivers/Postgre7.1/bind.h
-@@ -44,4 +44,8 @@ struct ParameterInfoClass_ {
- BindInfoClass *create_empty_bindings(int num_columns);
- void extend_bindings(StatementClass *stmt, int num_columns);
-
-+RETCODE SQL_API PG_SQLBindCol(HSTMT hstmt, UWORD icol, SWORD fCType,
-+ PTR rgbValue, SQLLEN cbValueMax,
-+ SQLLEN *pcbValue);
-+
- #endif
---- a/Drivers/Postgre7.1/connection.c
-+++ b/Drivers/Postgre7.1/connection.c
-@@ -20,6 +20,7 @@
- #include "statement.h"
- #include "qresult.h"
- #include "lobj.h"
-+#include "misc.h"
- #include "dlg_specific.h"
- #include <stdio.h>
- #include <string.h>
---- a/Drivers/Postgre7.1/execute.c
-+++ b/Drivers/Postgre7.1/execute.c
-@@ -34,10 +34,10 @@
- #include "convert.h"
- #include "bind.h"
- #include "lobj.h"
-+#include "misc.h"
-
- extern GLOBAL_VALUES globals;
-
--RETCODE SQL_API PG_SQLExecute( HSTMT hstmt);
- SQLRETURN PG_SQLPrepare(SQLHSTMT hstmt,
- SQLCHAR *szSqlStr , SQLINTEGER cbSqlStr);
-
---- a/Drivers/Postgre7.1/misc.h
-+++ b/Drivers/Postgre7.1/misc.h
-@@ -106,4 +106,17 @@ int my_strlen(char *s, int len);
-
- int my_strcpy(char *dst, int dst_len, char *src, int src_len);
-
-+RETCODE SQL_API PG_SQLExecDirect(HSTMT hstmt, UCHAR FAR *szSqlStr,
-+ SDWORD cbSqlStr);
-+RETCODE SQL_API PG_SQLExecute(HSTMT hstmt);
-+RETCODE SQL_API PG_SQLGetData(HSTMT hstmt, UWORD icol, SWORD fCType,
-+ PTR rgbValue, SDWORD cbValueMax,
-+ SDWORD FAR *pcbValue);
-+RETCODE SQL_API PG_SQLFetch(HSTMT hstmt);
-+RETCODE SQL_API PG_SQLColumns(HSTMT hstmt, UCHAR FAR * szTableQualifier,
-+ SWORD cbTableQualifier,
-+ UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-+ UCHAR FAR * szTableName, SWORD cbTableName,
-+ UCHAR FAR * szColumnName, SWORD cbColumnName);
-+
- #endif
---- a/Drivers/Postgre7.1/parse.c
-+++ b/Drivers/Postgre7.1/parse.c
-@@ -29,6 +29,7 @@
- #include "connection.h"
- #include "qresult.h"
- #include "pgtypes.h"
-+#include "misc.h"
-
- #ifndef WIN32
- #ifndef HAVE_STRICMP
---- a/Drivers/Postgre7.1/results.c
-+++ b/Drivers/Postgre7.1/results.c
-@@ -29,6 +29,7 @@
- #include "qresult.h"
- #include "convert.h"
- #include "pgtypes.h"
-+#include "misc.h"
-
- #include <stdio.h>
-
---- a/Drivers/Postgre7.1/statement.c
-+++ b/Drivers/Postgre7.1/statement.c
-@@ -22,6 +22,7 @@
- #include "qresult.h"
- #include "convert.h"
- #include "environ.h"
-+#include "misc.h"
-
- #include <stdio.h>
- #include <string.h>
---- a/Drivers/Postgre7.1/statement.h
-+++ b/Drivers/Postgre7.1/statement.h
-@@ -220,5 +220,7 @@ void SC_free_params(StatementClass *self, char option);
- void SC_log_error(char *func, char *desc, StatementClass *self);
- unsigned long SC_get_bookmark(StatementClass *self);
-
-+RETCODE SQL_API PG_SQLAllocStmt(HDBC hdbc, HSTMT FAR *phstmt);
-+RETCODE SQL_API PG_SQLFreeStmt(HSTMT hstmt, UWORD fOption);
-
- #endif
---- a/Drivers/nn/SQLBindParameter.c
-+++ b/Drivers/nn/SQLBindParameter.c
-@@ -126,3 +126,26 @@ RETCODE SQL_API SQLBindParameter(
- }
-
-
-+RETCODE SQL_API SQLSetParam (
-+ HSTMT hstmt,
-+ UWORD ipar,
-+ SWORD fCType,
-+ SWORD fSqlType,
-+ UDWORD cbColDef,
-+ SWORD ibScale,
-+ PTR rgbValue,
-+ SDWORD FAR *pcbValue)
-+{
-+ return SQLBindParameter(hstmt,
-+ ipar,
-+ (SWORD)SQL_PARAM_INPUT_OUTPUT,
-+ fCType,
-+ fSqlType,
-+ cbColDef,
-+ ibScale,
-+ rgbValue,
-+ SQL_SETPARAM_VALUE_MAX,
-+ pcbValue );
-+}
-+
-+
---- a/Drivers/nn/SQLDriverConnect.c
-+++ b/Drivers/nn/SQLDriverConnect.c
-@@ -61,12 +61,7 @@ RETCODE SQL_API SQLDriverConnect(
- break;
- /* to next case */
- case SQL_DRIVER_PROMPT:
-- if ( nnodbc_conndialog( hwnd, buf, sizeof(buf)) )
-- {
-- sqlstat = en_IM008;
-- break;
-- }
-- server = buf;
-+ sqlstat = en_IM008;
- break;
-
- default:
---- a/Drivers/nn/SQLSetParam.c
-+++ b/Drivers/nn/SQLSetParam.c
-@@ -1,40 +1 @@
--/**
-- Copyright (C) 1995, 1996 by Ke Jin <kejin@visigenic.com>
-- Enhanced for unixODBC (1999) by Peter Harvey <pharvey@codebydesign.com>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--**/
--#include <config.h>
--#include "driver.h"
--
--RETCODE SQL_API SQLSetParam (
-- HSTMT hstmt,
-- UWORD ipar,
-- SWORD fCType,
-- SWORD fSqlType,
-- UDWORD cbColDef,
-- SWORD ibScale,
-- PTR rgbValue,
-- SDWORD FAR *pcbValue)
--{
-- return SQLBindParameter(hstmt,
-- ipar,
-- (SWORD)SQL_PARAM_INPUT_OUTPUT,
-- fCType,
-- fSqlType,
-- cbColDef,
-- ibScale,
-- rgbValue,
-- SQL_SETPARAM_VALUE_MAX,
-- pcbValue );
--}
--
--
-+/* Moved to SQLBindParameter.c. */
---- a/Drivers/nn/connect.c
-+++ b/Drivers/nn/connect.c
-@@ -129,6 +129,7 @@ readtoken(
-
- #if !defined(WINDOWS) && !defined(WIN32) && !defined(OS2)
- # include <pwd.h>
-+# include <unistd.h>
- # define UNIX_PWD
- #endif
-
---- a/Drivers/nn/driver.h
-+++ b/Drivers/nn/driver.h
-@@ -113,6 +113,11 @@ char* getkeyvalinstr(
- char* value,
- int size );
-
-+int sqlputdata (stmt_t* pstmt, int ipar, char* data);
-+int sqlexecute (stmt_t* pstmt);
-+
-+int upper_strneq (char* s1, char* s2, int n);
-+
- #endif
-
-
---- a/Drivers/nn/herr.h
-+++ b/Drivers/nn/herr.h
-@@ -113,6 +113,7 @@ enum {
- extern void* nnodbc_pusherr (void* stack, int code, char* msg);
- extern void nnodbc_poperr (void* stack);
- extern int nnodbc_errstkempty (void* stack);
-+extern void nnodbc_errstkunset (void* stack);
- extern int nnodbc_getsqlstatcode (void* stack);
- extern char* nnodbc_getsqlstatstr (void* stack);
- extern char* nnodbc_getsqlstatmsg (void* stack);
---- a/Drivers/nn/misc.c
-+++ b/Drivers/nn/misc.c
-@@ -15,6 +15,7 @@
-
- #include <config.h>
- #include <nnconfig.h>
-+#include "driver.h"
-
- int upper_strneq(
- char* s1,
---- a/Drivers/nn/nncol.c
-+++ b/Drivers/nn/nncol.c
-@@ -18,6 +18,7 @@
-
- #include <nncol.h>
- #include "nncol.ci"
-+#include "driver.h"
-
- int nnsql_getcolidxbyname( char* col_name )
- {
---- a/Drivers/nn/nndate.c
-+++ b/Drivers/nn/nndate.c
-@@ -16,6 +16,7 @@
- #include <nnconfig.h>
-
- #include <nndate.h>
-+#include "driver.h"
-
- static char* month_name[] =
- { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
---- a/Drivers/nn/nntp.c
-+++ b/Drivers/nn/nntp.c
-@@ -19,6 +19,7 @@
- #include <string.h>
- #include <errno.h>
- #include <nntp.h>
-+#include "driver.h"
-
- # include "nntp.ci"
-
-@@ -28,6 +29,8 @@
- # include <sys/socket.h>
- # include <netdb.h>
- # include <netinet/in.h>
-+# include <arpa/inet.h>
-+# include <unistd.h>
-
- #else
-
---- a/Drivers/nn/nntp.h
-+++ b/Drivers/nn/nntp.h
-@@ -78,6 +78,7 @@ extern int nntp_end_post ( void* hcndes );
-
- extern int nntp_cancel ( void* hcndes, char* group, char* sender,
- char* from, char* msgid);
-+extern int nntp_postok ( void* hcndes );
-
- extern int nntp_getaccmode( void* hcndes );
- extern void nntp_setaccmode( void* hcndes, int mode );
---- a/Drivers/nn/yyenv.h
-+++ b/Drivers/nn/yyenv.h
-@@ -37,4 +37,7 @@ typedef struct
- # define YYINITDEPTH (512)
- # endif
-
-+void nnsql_yyinit(yyenv_t* penv, yystmt_t* yystmt);
-+int nnsql_yyparse(yyenv_t* pyyenv);
-+
- #endif
---- a/Drivers/nn/yylex.c
-+++ b/Drivers/nn/yylex.c
-@@ -27,6 +27,8 @@
- #include <stdio.h>
- #include <ctype.h>
-
-+#include "driver.h"
-+
- static int getcmpopidxbyname(char* name)
- {
- int i, size;
---- a/Drivers/nn/yyparse.y
-+++ b/Drivers/nn/yyparse.y
-@@ -39,6 +39,9 @@ static char sccsid[]
- #else
- # define yylex() nnsql_yylex(&yylval, pyyenv)
- #endif
-+union YYSTYPE;
-+int nnsql_yylex(union YYSTYPE* pyylval, yyenv_t* penv);
-+
-
- #define yyparse(x) nnsql_yyparse (yyenv_t* pyyenv)
- #define yyerror(msg) nnsql_yyerror (pyyenv, msg)
---- a/Drivers/nn/yystmt.c
-+++ b/Drivers/nn/yystmt.c
-@@ -14,6 +14,9 @@
- **/
- #include <config.h>
- #include "driver.h"
-+#if !defined(WINDOWS) && !defined(WIN32) && !defined(OS2)
-+#include <unistd.h>
-+#endif
-
- static char sccsid[]
- = "@(#)NNSQL(NetNews SQL) v0.5, Copyright(c) 1995, 1996 by Ke Jin";
---- a/Drivers/nn/yystmt.h
-+++ b/Drivers/nn/yystmt.h
-@@ -151,4 +151,9 @@ typedef struct {
- long artnum_max;
- } yystmt_t;
-
-+void nnsql_getrange(void* hstmt, long* pmin, long* pmax);
-+int nnsql_strlike(char* str, char* pattern, char esc, int flag);
-+int nnsql_srchtree_evl(void* hstmt);
-+int nnsql_srchtree_tchk(void* hstmt);
-+
- #endif
-
diff --git a/dev-db/unixODBC/unixODBC-2.3.11.ebuild b/dev-db/unixODBC/unixODBC-2.3.11.ebuild
deleted file mode 100644
index 4f2306d56f48..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.11.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 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 ~ia64 ~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
-"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixODBC/unixodbc_conf.h /usr/include/unixodbc.h )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.9-clang16.patch
- "${FILESDIR}"/${P}-config-no-install.patch
-)
-
-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
-}