openkylin
/
unixodbc
mirror of https://gitee.com/openkylin/unixodbc.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed debian/source/format to native

This commit is contained in:
openKylinBot 2022-05-14 03:13:34 +08:00
parent e689be33a8
commit e2b34a33ce
10 changed files with 1 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
debian/patches/apple-altivec-defined.patch vendored
View File

@ -1,25 +0,0 @@
From: Steve Langasek <vorlon@debian.org>
Date: Sat, 14 May 2022 03:13:33 +0800
Subject: Check whether the Apple Altivec instruction set is defined, if
`bool' is also defined.
Last-Update: 2018-04-09
Forwarded: yes
Origin: commit:5d3999900bc2a80e2807c9f2111cec6b57970a56
---
Drivers/Postgre7.1/md5.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Drivers/Postgre7.1/md5.h b/Drivers/Postgre7.1/md5.h
index 2e2429d..2b16430 100644
--- a/Drivers/Postgre7.1/md5.h
+++ b/Drivers/Postgre7.1/md5.h
@@ -21,7 +21,7 @@
#ifndef __cplusplus
-#ifndef bool
+#if !defined(bool) || defined(__APPLE_ALTIVEC__)
typedef char bool;
#endif

40
debian/patches/drvcfg-spelling.patch vendored
View File

@ -1,40 +0,0 @@
From: Hugh McMaster <hugh.mcmaster@outlook.com>
Date: Sat, 14 May 2022 03:13:33 +0800
Subject: Fix some spelling errors in drvcfg.c.
Last-Update: 2018-05-09
Forwarded: yes
Origin: commit:0087b7ca16fa89826d239d7c4bcd11b0f73ee8b8
---
DRVConfig/txt/drvcfg.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/DRVConfig/txt/drvcfg.c b/DRVConfig/txt/drvcfg.c
index 2c126f6..48ac1a5 100644
--- a/DRVConfig/txt/drvcfg.c
+++ b/DRVConfig/txt/drvcfg.c
@@ -19,7 +19,7 @@
/**********************************************
* STATIC LOOKUP VALUES
**********************************************/
-static const char *aColumnSeperators[] =
+static const char *aColumnSeparators[] =
{
"|",
",",
@@ -73,11 +73,11 @@ int ODBCINSTGetProperties( HODBCINSTPROPERTY hLastProperty )
hLastProperty->pNext = (HODBCINSTPROPERTY)calloc( 1, sizeof(ODBCINSTPROPERTY) );
hLastProperty = hLastProperty->pNext;
hLastProperty->nPromptType = ODBCINST_PROMPTTYPE_COMBOBOX;
- hLastProperty->aPromptData = malloc( sizeof( aColumnSeperators ) );
- memcpy( hLastProperty->aPromptData, aColumnSeperators, sizeof( aColumnSeperators ) );
- strncpy( hLastProperty->szName, "ColumnSeperator", INI_MAX_PROPERTY_NAME );
+ hLastProperty->aPromptData = malloc( sizeof( aColumnSeparators ) );
+ memcpy( hLastProperty->aPromptData, aColumnSeparators, sizeof( aColumnSeparators ) );
+ strncpy( hLastProperty->szName, "ColumnSeparator", INI_MAX_PROPERTY_NAME );
strncpy( hLastProperty->szValue, "|", INI_MAX_PROPERTY_VALUE );
- hLastProperty->pszHelp = strdup( "Column seperator character used in table files.\nCAN NOT EXIST IN COLUMN VALUES." );
+ hLastProperty->pszHelp = strdup( "Column separator character used in table files.\nCANNOT EXIST IN COLUMN VALUES." );
return 1;
}

36
debian/patches/export-odbcinst-functions.patch vendored
View File

@ -1,36 +0,0 @@
From: Steve Langasek <vorlon@debian.org>
Date: Sat, 14 May 2022 03:13:33 +0800
Subject: Export additional odbcinst functions.
Last-Update: 2018-04-09
Forwarded: no
---
odbcinst/odbcinst.exp | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/odbcinst/odbcinst.exp b/odbcinst/odbcinst.exp
index 55999f9..9d57145 100644
--- a/odbcinst/odbcinst.exp
+++ b/odbcinst/odbcinst.exp
@@ -64,3 +64,21 @@ _odbcinst_UserINI
_odbcinst_FileINI
_SQLDriverConnectPrompt
inst_logPushMsg
+iniClose
+iniCommit
+iniElement
+iniObject
+iniObjectDelete
+iniObjectEOL
+iniObjectFirst
+iniObjectNext
+iniObjectSeek
+iniObjectSeekSure
+iniOpen
+iniProperty
+iniPropertyEOL
+iniPropertyFirst
+iniPropertyInsert
+iniPropertyNext
+iniToUpper
+iniValue

24
debian/patches/fix-DriverManager-exports.patch vendored
View File

@ -1,24 +0,0 @@
From: Hugh McMaster <hugh.mcmaster@outlook.com>
Date: Sat, 14 May 2022 03:13:33 +0800
Subject: Prevent some functions from being exported.
Last-Update: 2018-05-09
Forwarded: yes
Origin: commit:5d3999900bc2a80e2807c9f2111cec6b57970a56
---
DriverManager/DriverManager.exp | 2 --
1 file changed, 2 deletions(-)
diff --git a/DriverManager/DriverManager.exp b/DriverManager/DriverManager.exp
index 0b6c8ad..bb09bdb 100644
--- a/DriverManager/DriverManager.exp
+++ b/DriverManager/DriverManager.exp
@@ -153,8 +153,6 @@ SQLTablesW
SQLTablesA
SQLTransact
ODBCSharedTraceFlag
-dm_log_write
-__post_internal_error
uodbc_open_stats
uodbc_close_stats
uodbc_get_stats

26
debian/patches/iniopen.patch vendored
View File

@ -1,26 +0,0 @@
From: Steve Langasek <vorlon@debian.org>
Date: Sat, 14 May 2022 03:13:33 +0800
Subject: Do not create odbc.ini if it does not exist.
Last-Update: 2018-04-09
Forwarded: no
---
odbcinst/_SQLGetInstalledDrivers.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/odbcinst/_SQLGetInstalledDrivers.c b/odbcinst/_SQLGetInstalledDrivers.c
index 6a70d51..2846ea0 100644
--- a/odbcinst/_SQLGetInstalledDrivers.c
+++ b/odbcinst/_SQLGetInstalledDrivers.c
@@ -55,9 +55,9 @@ int _SQLGetInstalledDrivers( LPCSTR pszSection,
/* PROCESS ODBC INI FILE */
#ifdef __OS2__
- if ( iniOpen( &hIni, szIniName, "#;", '[', ']', '=', 1, 1L ) != INI_SUCCESS )
+ if ( iniOpen( &hIni, szIniName, "#;", '[', ']', '=', FALSE, 1L ) != INI_SUCCESS )
#else
- if ( iniOpen( &hIni, szIniName, "#;", '[', ']', '=', 1 ) != INI_SUCCESS )
+ if ( iniOpen( &hIni, szIniName, "#;", '[', ']', '=', FALSE ) != INI_SUCCESS )
#endif
{
inst_logPushMsg( __FILE__, __FILE__, __LINE__, LOG_CRITICAL, ODBC_ERROR_COMPONENT_NOT_FOUND, "" );

25
debian/patches/makefile-am-destdir.patch vendored
View File

@ -1,25 +0,0 @@
From: Steve Langasek <vorlon@debian.org>
Date: Sat, 14 May 2022 03:13:33 +0800
Subject: Create the destination directory before adding empty files to it.
Last-Update: 2018-04-09
Forwarded: yes
Origin: commit:b29f17259d941f211215fd26f11691c06c775a4b,
commit:3b550a7a6c827e0f2b87badbd95f7d3f20574ba6
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 4628401..0ef7182 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_DIST = \
Makefile.svn
install-data-am: install-pkgconfigDATA
+ -mkdir -p $(DESTDIR)${sysconfdir}/ODBCDataSources
-touch $(DESTDIR)${sysconfdir}/odbcinst.ini
-touch $(DESTDIR)${sysconfdir}/odbc.ini
- -mkdir -p $(DESTDIR)${sysconfdir}/ODBCDataSources
cp unixodbc_conf.h $(DESTDIR)${includedir}/unixodbc_conf.h

116
debian/patches/multiarch-libltdl.patch vendored
View File

@ -1,116 +0,0 @@
From: Steve Langasek <vorlon@debian.org>
Date: Sat, 14 May 2022 03:13:33 +0800
Subject: Replace the auto-generated libltdl library search path with a
multiarch-friendly search path. Also amend the shared library name.
Last-Update: 2018-04-09
Forwarded: no
---
DriverManager/SQLConnect.c | 1 +
configure.ac | 4 ++++
odbcinst/ODBCINSTConstructProperties.c | 1 +
odbcinst/SQLConfigDataSource.c | 1 +
odbcinst/SQLConfigDriver.c | 1 +
odbcinst/SQLCreateDataSource.c | 1 +
odbcinst/SQLManageDataSources.c | 5 +++--
7 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/DriverManager/SQLConnect.c b/DriverManager/SQLConnect.c
index 21ce2f2..56e427f 100644
--- a/DriverManager/SQLConnect.c
+++ b/DriverManager/SQLConnect.c
@@ -1116,6 +1116,7 @@ int __connect_part_one( DMHDBC connection, char *driver_lib, char *driver_name,
mutex_lib_entry(); /* warning, this doesn't protect from other libs in the application */
/* in their own threads calling dlinit(); */
lt_dlinit();
+ lt_dlsetsearchpath(MODULEDIR);
mutex_lib_exit();
/*
diff --git a/configure.ac b/configure.ac
index e4bcdaf..1b5c2ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,10 @@ eval "SHLIBEXT=$shrext_cmds"
AC_MSG_RESULT($SHLIBEXT)
AC_SUBST(SHLIBEXT,$SHLIBEXT)
++dnl export the libdir, so we can have a multiarch-friendly search path
++dnl for ODBC drivers.
++AC_DEFINE_UNQUOTED([MODULEDIR], ["`eval echo $libdir/odbc`"], [ODBC driver search path])
+
AC_DEFINE_UNQUOTED([SHLIBEXT], "$shrext_cmds", [Shared lib extension])
AC_DEFINE_DIR([DEFLIB_PATH], [libdir], [Lib directory])
AC_DEFINE_DIR([LIB_PREFIX], [libdir], [Lib directory])
diff --git a/odbcinst/ODBCINSTConstructProperties.c b/odbcinst/ODBCINSTConstructProperties.c
index ab28824..4417ba7 100644
--- a/odbcinst/ODBCINSTConstructProperties.c
+++ b/odbcinst/ODBCINSTConstructProperties.c
@@ -165,6 +165,7 @@ int ODBCINSTConstructProperties( char *pszDriver, HODBCINSTPROPERTY *hFirstPrope
*/
lt_dlinit();
+ lt_dlsetsearchpath(MODULEDIR);
/* TRY GET FUNC FROM DRIVER SETUP */
if ( !(hDLL = lt_dlopen( szDriverSetup )) )
diff --git a/odbcinst/SQLConfigDataSource.c b/odbcinst/SQLConfigDataSource.c
index 9c96a23..38002de 100644
--- a/odbcinst/SQLConfigDataSource.c
+++ b/odbcinst/SQLConfigDataSource.c
@@ -80,6 +80,7 @@ static BOOL SQLConfigDataSourceWide( HWND hWnd,
*/
lt_dlinit();
+ lt_dlsetsearchpath(MODULEDIR);
#ifdef PLATFORM64
if ( iniPropertySeek( hIni, (char *)pszDriver, "Setup64", "" ) == INI_SUCCESS ||
diff --git a/odbcinst/SQLConfigDriver.c b/odbcinst/SQLConfigDriver.c
index 25520a1..5637c58 100644
--- a/odbcinst/SQLConfigDriver.c
+++ b/odbcinst/SQLConfigDriver.c
@@ -86,6 +86,7 @@ static BOOL SQLConfigDriverWide( HWND hWnd,
*/
lt_dlinit();
+ lt_dlsetsearchpath(MODULEDIR);
/* process request */
switch ( nRequest )
diff --git a/odbcinst/SQLCreateDataSource.c b/odbcinst/SQLCreateDataSource.c
index 83a1e9e..982204e 100644
--- a/odbcinst/SQLCreateDataSource.c
+++ b/odbcinst/SQLCreateDataSource.c
@@ -216,6 +216,7 @@ BOOL SQLCreateDataSource( HWND hWnd, LPCSTR pszDS )
inst_logPushMsg( __FILE__, __FILE__, __LINE__, LOG_CRITICAL, ODBC_ERROR_GENERAL_ERR, "lt_dlinit() failed" );
return FALSE;
}
+ lt_dlsetsearchpath(MODULEDIR);
/* get plugin name */
_appendUIPluginExtension( szNameAndExtension, _getUIPluginName( szName, hODBCInstWnd->szUI ) );
diff --git a/odbcinst/SQLManageDataSources.c b/odbcinst/SQLManageDataSources.c
index 0eea527..953eb1d 100644
--- a/odbcinst/SQLManageDataSources.c
+++ b/odbcinst/SQLManageDataSources.c
@@ -76,9 +76,9 @@ char *_getUIPluginName( char *pszName, char *pszUI )
char *_appendUIPluginExtension( char *pszNameAndExtension, char *pszName )
{
if ( strlen( SHLIBEXT ) > 0 )
- sprintf( pszNameAndExtension, "%s%s", pszName, SHLIBEXT );
+ sprintf( pszNameAndExtension, "%s%s.1", pszName, SHLIBEXT );
else
- sprintf( pszNameAndExtension, "%s.so", pszName );
+ sprintf( pszNameAndExtension, "%s.so.1", pszName );
return pszName;
}
@@ -143,6 +143,7 @@ BOOL SQLManageDataSources( HWND hWnd )
inst_logPushMsg( __FILE__, __FILE__, __LINE__, LOG_CRITICAL, ODBC_ERROR_GENERAL_ERR, "lt_dlinit() failed" );
return FALSE;
}
+ lt_dlsetsearchpath(MODULEDIR);
/* get plugin name */
_appendUIPluginExtension( szNameAndExtension, _getUIPluginName( szName, hODBCInstWnd->szUI ) );

32
debian/patches/odbcinst.ini.5-spelling.patch vendored
View File

@ -1,32 +0,0 @@
From: Hugh McMaster <hugh.mcmaster@outlook.com>
Date: Sat, 14 May 2022 03:13:33 +0800
Subject: Fix formatting and spelling in odbcinst.ini.5.
Last-Update: 2018-04-12
Forwarded: yes
Origin: 161c7c9bcd36807b24bfc58f4a7e5dd1923d9a6e,
f2c283162ab77135fd99a8a5cf84110730dd069b,
0087b7ca16fa89826d239d7c4bcd11b0f73ee8b8
---
man/odbcinst.ini.5 | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/man/odbcinst.ini.5 b/man/odbcinst.ini.5
index b5d6f7a..0f29154 100644
--- a/man/odbcinst.ini.5
+++ b/man/odbcinst.ini.5
@@ -68,13 +68,11 @@ as follows:
.RS
.nf
-...
Driver = PostgreSQL
-...
.fi
.RE
-The recommended way to add that driver is by creating template file containg:
+The recommended way to add that driver is by creating a template file containing:
.RS
.nf

8
debian/patches/series vendored
View File

@ -1,8 +0,0 @@
makefile-am-destdir.patch
multiarch-libltdl.patch
iniopen.patch
apple-altivec-defined.patch
export-odbcinst-functions.patch
drvcfg-spelling.patch
odbcinst.ini.5-spelling.patch
fix-DriverManager-exports.patch

2
debian/source/format vendored
View File

@ -1 +1 @@
3.0 (quilt)
3.0 (native)