rpms/unixODBC
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2.3.2 version

Browse Source 
- Removed extra man-pages and patch already shipped by upstream
This commit is contained in:
Jan Staněk 2013-10-10 15:07:23 +02:00
parent 00551ad28d
commit c9a9d058cd
8 changed files with 9 additions and 519 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/unixODBC-2.3.1.tar.gz
/unixODBC-2.3.2.tar.gz

125
coverity-fixes.patch
View File

@ -1,125 +0,0 @@
Fix assorted small errors detected by a Coverity scan, per bug #760877.
diff -Naur unixODBC-2.3.1.orig/DriverManager/SQLGetCursorName.c unixODBC-2.3.1/DriverManager/SQLGetCursorName.c
--- unixODBC-2.3.1.orig/DriverManager/SQLGetCursorName.c 2011-08-04 09:06:56.000000000 -0400
+++ unixODBC-2.3.1/DriverManager/SQLGetCursorName.c 2013-03-19 13:12:19.022156796 -0400
@@ -189,7 +189,7 @@
thread_protect( SQL_HANDLE_STMT, statement );
- if ( !buffer_length < 0 )
+ if ( buffer_length < 0 )
{
dm_log_write( __FILE__,
__LINE__,
diff -Naur unixODBC-2.3.1.orig/DriverManager/SQLGetCursorNameW.c unixODBC-2.3.1/DriverManager/SQLGetCursorNameW.c
--- unixODBC-2.3.1.orig/DriverManager/SQLGetCursorNameW.c 2011-08-04 09:07:01.000000000 -0400
+++ unixODBC-2.3.1/DriverManager/SQLGetCursorNameW.c 2013-03-19 13:12:19.023156773 -0400
@@ -172,7 +172,7 @@
thread_protect( SQL_HANDLE_STMT, statement );
- if ( !buffer_length < 0 )
+ if ( buffer_length < 0 )
{
dm_log_write( __FILE__,
__LINE__,
diff -Naur unixODBC-2.3.1.orig/DriverManager/__info.c unixODBC-2.3.1/DriverManager/__info.c
--- unixODBC-2.3.1.orig/DriverManager/__info.c 2011-11-15 06:43:15.000000000 -0500
+++ unixODBC-2.3.1/DriverManager/__info.c 2013-03-19 13:12:19.022156796 -0400
@@ -3997,7 +3997,7 @@
void setup_error_head( EHEAD *error_header, void *handle, int type )
{
- memset( error_header, 0, sizeof( error_header ));
+ memset( error_header, 0, sizeof( *error_header ));
error_header -> owning_handle = handle;
error_header -> handle_type = type;
diff -Naur unixODBC-2.3.1.orig/Drivers/Postgre7.1/info.c unixODBC-2.3.1/Drivers/Postgre7.1/info.c
--- unixODBC-2.3.1.orig/Drivers/Postgre7.1/info.c 2009-12-11 11:54:08.000000000 -0500
+++ unixODBC-2.3.1/Drivers/Postgre7.1/info.c 2013-03-19 13:12:19.025156733 -0400
@@ -1007,7 +1007,7 @@
strcpy(prefixes, globals.extra_systable_prefixes);
i = 0;
prefix[i] = strtok(prefixes, ";");
- while (prefix[i] && i<32) {
+ while (prefix[i] && i<sizeof(prefix)-1) {
prefix[++i] = strtok(NULL, ";");
}
@@ -1023,7 +1023,7 @@
free(tableType);
i = 0;
table_type[i] = strtok(table_types, ",");
- while (table_type[i] && i<32) {
+ while (table_type[i] && i<sizeof(table_type)-1) {
table_type[++i] = strtok(NULL, ",");
}
diff -Naur unixODBC-2.3.1.orig/Drivers/nn/convert.c unixODBC-2.3.1/Drivers/nn/convert.c
--- unixODBC-2.3.1.orig/Drivers/nn/convert.c 2009-12-11 11:54:09.000000000 -0500
+++ unixODBC-2.3.1/Drivers/nn/convert.c 2013-03-19 13:12:19.024156752 -0400
@@ -246,7 +246,7 @@
if( cidx == -1 )
return 0;
- for(i=0; i< sizeof(ctype_idx_tab); i++ )
+ for(i=0; i< sizeof(sqltype_idx_tab); i++ )
{
if( sqltype_idx_tab[i].sqltype == sqltype )
{
@@ -432,7 +432,7 @@
if( cidx == -1 )
return 0;
- for(i=0; i< sizeof(ctype_idx_tab); i++ )
+ for(i=0; i< sizeof(sqltype_idx_tab); i++ )
{
if( sqltype_idx_tab[i].sqltype == sqltype )
{
diff -Naur unixODBC-2.3.1.orig/cur/SQLBindCol.c unixODBC-2.3.1/cur/SQLBindCol.c
--- unixODBC-2.3.1.orig/cur/SQLBindCol.c 2011-08-04 09:11:51.000000000 -0400
+++ unixODBC-2.3.1/cur/SQLBindCol.c 2013-03-19 13:12:19.019156876 -0400
@@ -90,7 +90,7 @@
{
CLBCOL *next;
- if ( bcol -> local_buffer );
+ if ( bcol -> local_buffer )
{
free( bcol -> local_buffer );
}
diff -Naur unixODBC-2.3.1.orig/cur/SQLGetInfo.c unixODBC-2.3.1/cur/SQLGetInfo.c
--- unixODBC-2.3.1.orig/cur/SQLGetInfo.c 2011-08-04 09:13:48.000000000 -0400
+++ unixODBC-2.3.1/cur/SQLGetInfo.c 2013-03-19 13:12:19.020156848 -0400
@@ -140,6 +140,7 @@
value = SQL_PS_POSITIONED_DELETE |
SQL_PS_POSITIONED_UPDATE |
SQL_PS_SELECT_FOR_UPDATE;
+ break;
case SQL_ROW_UPDATES:
cval = "Y";
diff -Naur unixODBC-2.3.1.orig/exe/isql.c unixODBC-2.3.1/exe/isql.c
--- unixODBC-2.3.1.orig/exe/isql.c 2011-09-15 12:57:14.000000000 -0400
+++ unixODBC-2.3.1/exe/isql.c 2013-03-19 13:27:09.907545641 -0400
@@ -121,6 +121,7 @@
break;
case '3':
version3 = 1;
+ break;
case 'v':
bVerbose = 1;
break;
@@ -611,8 +612,7 @@
{
if ( bVerbose ) DumpODBCLog( hEnv, hDbc, hStmt );
fprintf( stderr, "[ISQL]ERROR: Could not SQLNumResultCols\n" );
- SQLFreeStmt( hStmt, SQL_DROP );
- free(szSepLine);
+ break;
}
if ( cols > 0 )

133
isql.1
View File

@ -1,133 +0,0 @@
\" vim:language en_US.UTF-8:
.TH isql 1 "Tue 25 Jun 2013" "version 2.3.1" "UnixODBC manual pages"
.SH NAME
isql - unixODBC command-line interactive SQL tool
.SH SYNOPSIS
\fBisql\fR \fIDSN\fR [\fIUSER\fR [\fIPASSWORD\fR]] [\fIoptions\fR]
.SH DESCRIPTION
.B isql
is a command line tool which allows the user to execute SQL in batch
or interactively. It has some interesting options such as an option to generate
output wrapped in an HTML table.
.SH ARGUMENTS
.IP \fBDSN\fR
The Data Source Name, which should be used to make connection to the database.
The data source is looked for in the /etc/odbc.ini and $HOME/.odbc.ini files in
that order, with the latter overwriting the former.
.IP \fBUSER\fR
Specifies the database user/role under which the connection should be made.
.IP \fBPASSWORD\fR
Password for the specified \fBUSER\fR.
.SH OPTIONS
.IP \fB-b\fR
Run isql in non-interactive batch mode. In this mode, the isql processes its
standard input, expecting one SQL command per line.
.IP \fB-d\fIDELIMITER\fR
Delimits columns with \fIdelimiter\fR.
.IP \fB-x\fIHEX\fR
Delimits columns with \fIHEX\fR, which is a hexadecimal code of the delimiting
character in the format 0xNN - i.e. 0x09 for the TAB character.
.IP \fB-w\fR
Format the result as HTML table.
.IP \fB-c\fR
Output the names of the columns on the first row. Has any effect only with the
\fB-d\fR or \fB-x\fR options.
.IP \fB-m\fINUM\fR
Limit the column display width to \fINUM\fR characters.
.IP \fB-l\fILOCALE\fR
Sets locale to \fILOCALE\fR.
.IP \fB-q\fR
Wrap the character fields in double quotes.
.IP \fB-3\fR
Use the ODBC 3 calls.
.IP \fB-n\fR
Use the newline processing.
.IP \fB-e\fR
Use the SQLExecDirect instead of Prepare.
.IP \fB-k\fR
Use SQLDriverConnect.
.IP \fB-v\fR
Turn on the verbose mode, where the errors are fully described. Useful for debugging.
.IP \fB--version\fR
Prints the program version and exits.
.SH COMMANDS
This section briefly describes some isql runtime commands.
.B help
.RS
List all tables in the database.
.RE
.B help \fItable\fR
.RS
List all columns in the \fItable\fR.
.RE
.B help help
.RS
List all help options.
.RE
.SH EXAMPLES
.nf
$ isql WebDB MyID MyPWD -w -b < My.sql
.fi
Connects to the WebDB as user MyID with password MyPWD, then execute the
commands in the My.sql file and returns the results wrapped in HTML table.
Each line in My.sql must contain exactly 1 SQL command, except for the last
line, which must be blank (unless the \fB-n\fR option is specified).
.SH FILES
.I /etc/odbc.ini
.RS
System-wide DSN definitions. See
.BR odbc.ini (5)
for details.
.RE
.I $HOME/.odbc.ini
.RS
User-specific DSN definitions. See
.BR odbc.ini (5)
for details.
.RE
.SH SEE ALSO
.BR odbcinst (1),
.BR odbc.ini (5)
.SH AUTHORS
The authors of unixODBC are Peter Harvey <\fIpharvey@codebydesign.com\fR> and
Nick Gorham <\fInick@easysoft.com\fR>. For the full list of contributors see the
AUTHORS file.
.SH COPYRIGHT
unixODBC is licensed under the GNU Lesser General Public License. For details
about the license, see the COPYING file.

25
odbc.ini.5
View File

@ -1,25 +0,0 @@
.TH odbc.ini 5 "Thu 27 Jun 2013" "version 2.3.1" "unixODBC manual pages"
.SH NAME
/etc/odbc.ini, $HOME/.odbc.ini - unixODBC data sources configuration
.SH DESCRIPTION
.B /etc/odbc.ini
is text configuration file for the system wide ODBC data sources (i. e. database
connections).
.B $HOME/.odbc.ini
contains the configuration for user-specific data sources.
.SH "SEE ALSO"
.BR odbcinst (1),
.BR isql (1),
.BR odbcinst.ini (5)
.SH AUTHORS
The authors of unixODBC are Peter Harvey <\fIpharvey@codebydesign.com\fR> and
Nick Gorham <\fInick@easysoft.com\fR>. For the full list of contributors see the
AUTHORS file.
.SH COPYRIGHT
unixODBC is licensed under the GNU Lesser General Public License. For details
about the license, see the COPYING file.

114
odbcinst.1
View File

@ -1,114 +0,0 @@
.TH odbcinst 1 "Wed 26 Jun 2013" "version 2.3.1" "unixODBC manual pages"
.SH NAME
odbcinst - An unixODBC tool for manipulating configuration files
.SH SYNOPSIS
.B odbcinst
.I ACTION OBJECT OPTIONS
.SH DESCRIPTION
.B odbcinst
is a command line tool which has been created for allowing people who
are developing the install scripts/RPMs for Drivers to be able to easily
create/remove entries in odbc.ini and odbcinst.ini. This command line tool is a
complement to the shared library of the same name (libodbcinst.so). This tool is
a part of the odbcinst component of unixODBC.
.SH OPTIONS
.SS ACTIONS
.IP -i
Install (add section to config file) new \fIOBJECT\fR.
.IP -u
Uninstall (remove section from config file) existing \fIOBJECT\fR.
.IP -q
Query the config files and print the options for specified \fIOBJECT\fR.
.IP -j
Prints current configuration of unixODBC, listing (among others) the paths to the
configuration files.
.IP -c
Calls SQLCreateDataSource
.IP -m
Calls SQLManageDataSources
.IP --version
Prints program version and exits.
.SS OBJECTS
.IP -d
The \fIACTION\fR affect drivers (and thus the odbcinst.ini configuration file).
.IP -s
The \fIACTION\fR affect data sources (and thus the user or system odbc.ini
configuration file).
.SS OPTIONS
.IP "-f \fIFILE\fR"
The \fIFILE\fR is template file, describing the configuration of installed
\fIOBJECT\fR (only valid for the -i \fIACTION\fR).
.IP -r
Same as the -f \fIOPTION\fR, only take the standard input as the template file.
.IP "-n \fINAME\fR"
Specifies the \fINAME\fR of the \fIOBJECT\fR.
.IP -v
Turn off verbose mode. This turns off all information, warning and error
messages.
.IP -l
The specified data source is system-wide. Has any effect only with the -s
\fIOBJECT\fR.
.IP -h
The specified data source is user-specific. Has any effect only with the -s
\fIOBJECT\fR.
.SH "RETURN VALUES"
This command returns zero on success and non-zero value on failure.
.SH FILES
.I /etc/odbinst.ini
.RS
Configuration file containing all the database drivers specifications. See
.BR odbcinst.ini (5)
for more details.
.RE
.I /etc/odbc.ini
.RS
System-wide data sources specifications. See
.BR odbc.ini (5)
for more details.
.RE
.I $HOME/.odbc.ini
.RS
User-specific data sources specifications. See
.BR odbc.ini (5)
for more details.
.RE
.SH "SEE ALSO"
.BR odbcinst.ini (5),
.BR odbc.ini (5)
.SH AUTHORS
The authors of unixODBC are Peter Harvey <\fIpharvey@codebydesign.com\fR> and
Nick Gorham <\fInick@easysoft.com\fR>. For the full list of contributors see the
AUTHORS file.
.SH COPYRIGHT
unixODBC is licensed under the GNU Lesser General Public License. For details
about the license, see the COPYING file.

106
odbcinst.ini.5
View File

@ -1,106 +0,0 @@
.TH odbcinst.ini 5 "Thu 27 Jun 2013" "version 2.3.1" "unixODBC manual pages"
.SH NAME
/etc/odbcinst.ini - An unixODBC drivers configuration
.SH DESCRIPTION
.B /etc/odbcinst.ini
is a text configuration file for unixODBC drivers. It can be edited by hand,
but the recommended way to update this file is to use the
.BR odbcinst (1)
utility.
.SH FILE FORMAT
The general .ini file format is:
.RS
.nf
.BI [ SectionName1 ]
.IB key1 " = " value1
.IB key2 " = " value2
.B ...
.BI [ SectionName2 ]
.IB key1 " = " value1
.IB key2 " = " value2
.B ...
.fi
.RE
Each ODBC driver has its own section and can be referred to by the name of its
section. Recognized configuration keys are:
.IP \fBDescription
A text string briefly describing the driver.
.IP \fBDriver
A filesystem path to the actual driver library.
.IP \fBSetup
A filesystem path to the driver setup library.
.IP \fBFileUsage
.BR odbcinst (1)
entry, if you edit the configuration file by hand, you have to supply it yourself.
.SS TEMPLATE FILES
The recommended way to manage the drivers is using the
.BR odbcinst (1)
utility. You can install the drivers by supplying it with template file, which
has the same format as this file.
.SH EXAMPLES
An example of the actual PostgreSQL driver:
.RS
.nf
[PostgreSQL]
Description = PostgreSQL driver for GNU/Linux
Driver = /usr/lib/psqlodbcw.so
Setup = /usr/lib/libodbcpsqlS.so
FileUsage = 1
.fi
.RE
By specifying the driver like that, you can then reference it in the
.BR odbc.ini (5)
as follows:
.RS
.nf
...
Driver = PostgreSQL
...
.fi
.RE
The recommended way to add that driver is by creating template file containg:
.RS
.nf
[PostgreSQL]
Description = PostgreSQL driver for GNU/Linux
Driver = /usr/lib/psqlodbcw.so
Setup = /usr/lib/libodbcpsqlS.so
.fi
.RE
and call the
.BR odbcinst (1):
.RS
.BI "# odbcinst -i -d -f " template.ini
.RE
.SH "SEE ALSO"
.BR odbcinst (1),
.BR odbc.ini (5)
.SH AUTHORS
The authors of unixODBC are Peter Harvey <\fIpharvey@codebydesign.com\fR> and
Nick Gorham <\fInick@easysoft.com\fR>. For the full list of contributors see the
AUTHORS file.
.SH COPYRIGHT
unixODBC is licensed under the GNU Lesser General Public License. For details
about the license, see the COPYING file.

2
sources
View File

@ -1 +1 @@
86788d4006620fa1f171c13d07fdcaab unixODBC-2.3.1.tar.gz
5e4528851eda5d3d4aed249b669bd05b unixODBC-2.3.2.tar.gz

22
unixODBC.spec
View File

@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux
Name: unixODBC
Version: 2.3.1
Release: 7%{?dist}
Version: 2.3.2
Release: 1%{?dist}
Group: System Environment/Libraries
URL: http://www.unixODBC.org/
# Programs are GPL, libraries are LGPL, except News Server library is GPL.
@ -11,16 +11,11 @@ Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
Source1: odbcinst.ini
Source4: conffile.h
Source5: README.fedora
Source6: isql.1
Source7: odbc.ini.5
Source8: odbcinst.1
Source9: odbcinst.ini.5
Patch1: depcomp.patch
Patch6: export-symbols.patch
Patch8: so-version-bump.patch
Patch9: keep-typedefs.patch
Patch10: coverity-fixes.patch
Conflicts: iodbc
@ -48,7 +43,6 @@ ODBC, you need to install this package.
%patch6 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
chmod 0644 Drivers/MiniSQL/*.c
chmod 0644 Drivers/nn/*.c
@ -129,13 +123,6 @@ do
mv -f devel-so-list.x devel-so-list
done
# install man pages that are not part of upstream yet
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5}
install -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/isql.1
install -m644 %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man5/odbc.ini.5
install -m644 %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man1/odbcinst.1
install -m644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man5/odbcinst.ini.5
%files -f base-so-list
%doc README COPYING AUTHORS ChangeLog NEWS doc
%doc README.fedora
@ -145,6 +132,7 @@ install -m644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man5/odbcinst.ini.5
%{_bindir}/dltest
%{_bindir}/iusql
%{_bindir}/odbc_config
%{_bindir}/slencheck
%{_mandir}/man*/*
%files devel -f devel-so-list
@ -154,6 +142,10 @@ install -m644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man5/odbcinst.ini.5
%postun -p /sbin/ldconfig
%changelog
* Thu Oct 10 2013 Jan Stanek <jstanek@redhat.com> 2.3.2-1
- Update to 2.3.2 version
- Removed extra man-pages and patch already shipped by upstream
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild