pool/unixODBC
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to 2.3.12:

Browse Source 
* Makefile.am: Do not install config.h #108
  * DriverManager/drivermanager.h: fix build without threads #112
  * DriverManager/_info.c: Get locale encoding on Windows. #115
  * Fixed Connection String #127
  * Allow diagnostics to be retrieved on SQL_NO_DATA #137
  * Avoid implicit function declarations, for C99 compatibility #138
  * Remove self-reference #140
  * isql.1: Add information about handling passwords containing semicolons #126
- Remove unixODBC-gccwarnings.patch, unixODBC-2.3.6-declarations.patch:
  Changes have been done in https://github.com/lurcher/unixODBC/pull/138

OBS-URL: https://build.opensuse.org/package/show/server:database/unixODBC?expand=0&rev=76
This commit is contained in:
Michael Vetter 2023-08-08 11:51:59 +00:00 committed by Git OBS Bridge
parent 4185cef1d8
commit f68a2c19d7
7 changed files with 30 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unixODBC-2.3.11.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c
size 1752585

BIN
unixODBC-2.3.12.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

33
unixODBC-2.3.6-declarations.patch
View File

@ -1,33 +0,0 @@
diff -urEbwB unixODBC-2.3.6/Drivers/nn/yyevl.c unixODBC-2.3.6.new/Drivers/nn/yyevl.c
--- unixODBC-2.3.6/Drivers/nn/yyevl.c 2014-01-06 10:37:01.000000000 +0100
+++ unixODBC-2.3.6.new/Drivers/nn/yyevl.c 2018-03-19 12:36:19.380485884 +0100
@@ -18,6 +18,7 @@
#include <yylex.h>
#include <nncol.h>
#include <nndate.h>
+#include <string.h>
typedef struct {
int type; /* can only be en_nt_qstr, en_nt_num and en_nt_null */
diff -urEbwB unixODBC-2.3.6/Drivers/nn/yyparse.y unixODBC-2.3.6.new/Drivers/nn/yyparse.y
--- unixODBC-2.3.6/Drivers/nn/yyparse.y 2018-02-26 15:43:58.000000000 +0100
+++ unixODBC-2.3.6.new/Drivers/nn/yyparse.y 2018-03-19 12:36:56.752790303 +0100
@@ -25,6 +25,7 @@
#include <yylex.h>
#include <yyerr.h>
#include <nndate.h>
+#include <stdio.h>
# ifdef YYLSP_NEEDED
# undef YYLSP_NEEDED
diff -urEbwB unixODBC-2.3.6/Drivers/nn/yystmt.c unixODBC-2.3.6.new/Drivers/nn/yystmt.c
--- unixODBC-2.3.6/Drivers/nn/yystmt.c 2014-01-06 10:37:01.000000000 +0100
+++ unixODBC-2.3.6.new/Drivers/nn/yystmt.c 2018-03-19 12:37:25.593024943 +0100
@@ -14,6 +14,7 @@
**/
#include <config.h>
#include "driver.h"
+#include "string.h"
static char sccsid[]
= "@(#)NNSQL(NetNews SQL) v0.5, Copyright(c) 1995, 1996 by Ke Jin";

74
unixODBC-gccwarnings.patch
View File

@ -1,74 +0,0 @@
Index: Drivers/nn/nndate.c
===================================================================
--- Drivers/nn/nndate.c.orig
+++ Drivers/nn/nndate.c
@@ -16,6 +16,7 @@
#include <nnconfig.h>
#include <nndate.h>
+#include "misc.h"
static char* month_name[] =
{ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
Index: Drivers/nn/misc.h
===================================================================
--- /dev/null
+++ Drivers/nn/misc.h
@@ -0,0 +1,7 @@
+#ifndef _MISC_H
+# define _MISC_H
+
+extern int upper_strneq(char *s1, char *s2, int n);
+
+
+#endif
Index: Drivers/nn/connect.c
===================================================================
--- Drivers/nn/connect.c.orig
+++ Drivers/nn/connect.c
@@ -13,7 +13,10 @@
GNU General Public License for more details.
**/
#include <config.h>
+#include <unistd.h>
+#include <sys/types.h>
#include "driver.h"
+#include "misc.h"
void* nnodbc_getenverrstack(void* henv)
{
Index: Drivers/nn/nntp.c
===================================================================
--- Drivers/nn/nntp.c.orig
+++ Drivers/nn/nntp.c
@@ -19,6 +19,10 @@
#include <string.h>
#include <errno.h>
#include <nntp.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
# include "nntp.ci"
@@ -36,6 +37,7 @@
#endif
#include <nntp.h>
+#include "misc.h"
typedef struct {
long article_num;
Index: Drivers/nn/nncol.c
===================================================================
--- Drivers/nn/nncol.c.orig
+++ Drivers/nn/nncol.c
@@ -18,6 +18,7 @@
#include <nncol.h>
#include "nncol.ci"
+#include "misc.h"
int nnsql_getcolidxbyname( char* col_name )
{

15
unixODBC.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Aug 8 11:29:18 UTC 2023 - Michael Vetter <mvetter@suse.com>
- Update to 2.3.12:
* Makefile.am: Do not install config.h #108
* DriverManager/drivermanager.h: fix build without threads #112
* DriverManager/_info.c: Get locale encoding on Windows. #115
* Fixed Connection String #127
* Allow diagnostics to be retrieved on SQL_NO_DATA #137
* Avoid implicit function declarations, for C99 compatibility #138
* Remove self-reference #140
* isql.1: Add information about handling passwords containing semicolons #126
- Remove unixODBC-gccwarnings.patch, unixODBC-2.3.6-declarations.patch:
Changes have been done in https://github.com/lurcher/unixODBC/pull/138
-------------------------------------------------------------------
Wed Jul 12 10:17:40 UTC 2023 - Dan Čermák <dcermak@suse.com>

12
unixODBC.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package unixODBC
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: unixODBC
Version: 2.3.11
Version: 2.3.12
Release: 0
Summary: ODBC driver manager with some drivers included
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -27,9 +27,7 @@ Source0: ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-%{version}.tar.gz
Source1: baselibs.conf
Source2: unixODBC-rpmlintrc
Patch0: unixODBC-paths.patch
Patch1: unixODBC-gccwarnings.patch
Patch2: unixODBC-2.3.6-declarations.patch
Patch3: unixODC-etc-location.patch
Patch1: unixODC-etc-location.patch
BuildRequires: automake
BuildRequires: bison
BuildRequires: gcc-c++
@ -67,9 +65,7 @@ Includes for ODBC development (based on unixODBC).
%prep
%setup -q
%patch0
%patch1
%patch2 -p1
%patch3 -p1
%patch1 -p1
chmod -x NEWS README doc/*.html doc/*.gif Drivers/README

16
unixODC-etc-location.patch
View File

@ -1,9 +1,9 @@
Index: unixODBC-2.3.11/man/odbc.ini.5
Index: unixODBC-2.3.12/man/odbc.ini.5
===================================================================
--- unixODBC-2.3.11.orig/man/odbc.ini.5
+++ unixODBC-2.3.11/man/odbc.ini.5
--- unixODBC-2.3.12.orig/man/odbc.ini.5
+++ unixODBC-2.3.12/man/odbc.ini.5
@@ -1,10 +1,10 @@
.TH odbc.ini 5 "Sun 10 Jan 2021" "version 2.3.11" "unixODBC manual pages"
.TH odbc.ini 5 "Sun 10 Jan 2021" "version 2.3.12" "unixODBC manual pages"
.SH NAME
-/etc/odbc.ini, $HOME/.odbc.ini - unixODBC data source configuration files
@ -15,12 +15,12 @@ Index: unixODBC-2.3.11/man/odbc.ini.5
is a system-wide configuration file for ODBC Data Source Names (DSNs).
.B $HOME/.odbc.ini
Index: unixODBC-2.3.11/man/odbcinst.ini.5
Index: unixODBC-2.3.12/man/odbcinst.ini.5
===================================================================
--- unixODBC-2.3.11.orig/man/odbcinst.ini.5
+++ unixODBC-2.3.11/man/odbcinst.ini.5
--- unixODBC-2.3.12.orig/man/odbcinst.ini.5
+++ unixODBC-2.3.12/man/odbcinst.ini.5
@@ -1,10 +1,10 @@
.TH odbcinst.ini 5 "Tue 12 Jan 2021" "version 2.3.11" "unixODBC manual pages"
.TH odbcinst.ini 5 "Tue 12 Jan 2021" "version 2.3.12" "unixODBC manual pages"
.SH NAME
-/etc/odbcinst.ini - unixODBC driver configuration file