--- unixodbc-2.3.4.orig/DriverManager/SQLConnect.c +++ unixodbc-2.3.4/DriverManager/SQLConnect.c @@ -1116,6 +1116,7 @@ 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(); /* --- unixodbc-2.3.4.orig/Drivers/Postgre7.1/md5.h +++ unixodbc-2.3.4/Drivers/Postgre7.1/md5.h @@ -21,7 +21,7 @@ #ifndef __cplusplus -#ifndef bool +#if !defined(bool) || defined(__APPLE_ALTIVEC__) typedef char bool; #endif --- unixodbc-2.3.4.orig/Drivers/nn/nnconfig.h +++ unixodbc-2.3.4/Drivers/nn/nnconfig.h @@ -21,6 +21,7 @@ # include # include # include +# include # define MEM_ALLOC(size) (malloc((size_t)(size))) # define MEM_FREE(ptr) {if(ptr) free(ptr);} --- unixodbc-2.3.4.orig/Makefile.am +++ unixodbc-2.3.4/Makefile.am @@ -40,7 +40,7 @@ Makefile.svn install-data-am: + -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 --- unixodbc-2.3.4.orig/configure.ac +++ unixodbc-2.3.4/configure.ac @@ -156,6 +156,10 @@ 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]) --- unixodbc-2.3.4.orig/debian/NEWS +++ unixodbc-2.3.4/debian/NEWS @@ -0,0 +1,17 @@ +unixodbc (2.2.14p2-3) unstable; urgency=low + + * Multiarch directory added to search path + + In order to support installation of ODBC drivers for multiple + architectures at once and to enable architecture-neutral odbcinst.ini to + locate these drivers, libodbc now adds /usr/lib/$arch/odbc to its + internal search path. Drivers installed to this directory can be + referred to with a relative filename in odbcinst.ini, and libodbc will + automatically look in the correct library for this architecture. + + Drivers using such relative paths in their odbcinst.ini settings should + declare Breaks: unixodbc (<< 2.2.14p2-3), odbcinst1debian2 (<< + 2.2.14p2-3), libiodbc2. (This logic may be implemented in libiodbc2 at + a later date.) + + -- Steve Langasek Sat, 20 Aug 2011 14:57:15 -0700 --- unixodbc-2.3.4.orig/debian/changelog +++ unixodbc-2.3.4/debian/changelog @@ -0,0 +1,847 @@ +unixodbc (2.3.4-1) unstable; urgency=medium + + * New upstream release. Closes: #843847. + - Drop patches to autogenerated files in the source tree, since we use + dh-autoreconf already. + - Drop AM_MAINTAINER_MODE, no longer needed due to the above. + - Drop no-longer-used lintian override. + * Standards-Version to 3.9.8. + + -- Steve Langasek Mon, 12 Dec 2016 10:55:09 +0000 + +unixodbc (2.3.1-5) unstable; urgency=low + + * Make unixodbc-dev depend directly on libodbc1, not just transitively + via unixodbc, now that unixodbc is Multi-Arch: foreign. + Closes: #839170. + * Fix unixodbc-dev package section. Closes: #813991. + + -- Steve Langasek Thu, 29 Sep 2016 13:13:32 -0700 + +unixodbc (2.3.1-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use AC_CONFIG_MACRO_DIR([libltdl/m4]) in configure.in + instead of ACLOCAL_AMFLAGS=-I libltdl/m4 in Makefile.am + to add libltdl/m4 macro directory. Closes: #818407. + + -- John Paul Adrian Glaubitz Mon, 04 Apr 2016 23:51:00 +0200 + +unixodbc (2.3.1-4) unstable; urgency=medium + + * odbcinst/_SQLGetInstalledDrivers.c: don't open /etc/odbcinst.ini for + writing when we never write to it. Closes: #801258. + + -- Steve Langasek Wed, 07 Oct 2015 19:29:52 -0700 + +unixodbc (2.3.1-3) unstable; urgency=low + + * DriverManager/SQLConnect.c: put a mutex around the call to + lt_dlsetsearchpath(), to avoid double-frees in a multithreaded context. + Closes: #746423. + + -- Steve Langasek Wed, 30 Apr 2014 00:35:50 +0000 + +unixodbc (2.3.1-2) unstable; urgency=medium + + * Use dh-autoreconf instead of a homegrown autotools target; this fixes + problems caused by config.sub having the wrong permissions in the upstream + tarball. Closes: #738516. + + -- Steve Langasek Sun, 06 Apr 2014 09:58:18 +0000 + +unixodbc (2.3.1-1) unstable; urgency=low + + * New upstream release. Closes: #650267. + - Drop changes to exe/isql.c, exe/odbcinst.c, exe/iusql.c, fixed + differently upstream. + - Drop libgtrtst library from libodbc1; this is technically an ABI + change, but nothing has ever used this library so we're not changing + the package name. + - Since the library ABI has not changed in Debian (ever), keep the + package names the same and provide backwards-compatible symlinks to + avoid an unnecessary library transition; and update the symbols/shlibs + to make it clear the old versions of the library don't satisfy these + dependencies any longer. + * Bump the build dependency on debhelper to 9. + * Fix LDFLAGS handling so that we pick up hardening flags properly. + Closes: #717257. + * Fix debian/copyright to comply with copyright-format 1.0. + * Update to Standards-Version 3.9.4. + * Fix the section of the odbcinst package. Closes: #663077. + * Update the odbcinst manpage to document all the current options. + Closes: #709968 + + -- Steve Langasek Mon, 14 Oct 2013 06:10:57 +0000 + +unixodbc (2.2.14p2-5) unstable; urgency=low + + * Mark unixodbc Multi-Arch: foreign. + + -- Steve Langasek Tue, 08 Nov 2011 10:49:50 -0800 + +unixodbc (2.2.14p2-4) unstable; urgency=low + + * Add libltdl/config.sub to debian/clean + * exe/isql.c, exec/odbcinst.c, exe/iusql.c: fix passing of usage + information to printf, so that we don't fail the checks for unsafe + format string handling. + * Drop the Qt library and unixodbc-bin, now split into a separate source + upstream. Closes: #604387. + + -- Steve Langasek Mon, 17 Oct 2011 17:34:33 +0000 + +unixodbc (2.2.14p2-3) unstable; urgency=low + + * Add Vcs-Bzr field. + * Build for multiarch. + * Split unixodbc into a libodbc1 package and a unixodbc package, + the latter now containing just isql and with a versioned dependency on + libodbc1 for compatibility with existing dependencies. This is better + that moving isql into a new 'isql' package and having unixodbc depend + on it because 'unixodbc' is a wrong name for a library package. + * exe/isql.c: patch from upstream to fix isql segfault with the -b option. + Thanks to Tim Gokcen for reporting. Closes: #607895. + * Call lt_dlsetsearchpath() so that we can use relative paths for ODBC + modules in a multiarch-clean manner + * Document the availability of multiarch driver support in debian/NEWS. + * DriverManager/SQLDriverConnect.c: fix a potential buffer overflow. + Closes: #617655 + * debian/rules: update libltdl/config.sub, not just config.sub, when out + of date. Closes: #576980. + * odbcinst1debian2 Breaks the old drivers that reference driver setup + modules in /usr/lib that are shipped in this package, so declare this. + * Standards-Version to 3.9.2. + * Drop .la files from unixodbc-dev, now that there are no shared libraries + left that depend on them. + * Pull patch from Ubuntu to fix FTBFS on ppc64. + * Clean up the odbcinst1debian2 package description. + + -- Steve Langasek Sun, 21 Aug 2011 06:35:23 +0000 + +unixodbc (2.2.14p2-2) unstable; urgency=low + + * Apply patch from + http://cvs.fedoraproject.org/viewvc/devel/unixODBC/odbcint64-config.patch + to ensure we get the necessary (U)ODBCINST64 defines. Thanks to + Matthias Klose for the pointer. Closes: #582591, LP: #620428. + + -- Steve Langasek Fri, 20 Aug 2010 14:51:31 -0700 + +unixodbc (2.2.14p2-1) unstable; urgency=low + + * New upstream release (closes: #433312). + - Fixes compatibility with Oracle driver. Closes: #567521. + - The txt driver has been dropped upstream. + - The prototype of odbcinst_system_file_path has changed, so time for + another package rename to odbcinst1debian2. + - Touch debian/unixodbc.symbols for new interfaces. + * Drop build-dependencies on flex-old and bison, no longer used. + * Build-conflict with unixodbc-dev, to work around libtool's persistent + relinking problems + * Build-depend on libqt3-compat-headers instead of patching all of the code; + if libqt3-compat-headers ever goes away, we should just switch to Qt4 + instead. + * exe/Makefile.am: don't build dltest, this only works if we're using + the bundled libtool. + * Port AC_LIBTOOL_LANG_CXX_CONFIG changes over to the current + _LT_LANG_CXX_CONFIG macro. + * Build with --without-pth, we want pthreads even if pth is installed in the + build env. + * Fix installation of libnn.so at build time, so we don't ship a dangling + symlink instead. Closes: #563283. + + -- Steve Langasek Wed, 24 Mar 2010 16:22:28 -0700 + +unixodbc (2.2.11-21) unstable; urgency=low + + * Fix short description of odbcinst1debian1 to not refer to the bits that + have been moved to odbcinst. + * Build-depend on libreadline-dev instead of libreadline5-dev, for the + readline6 transition; doesn't interfere with backports, since + libreadline5-dev already provided libreadline-dev. Closes: #553870. + * Copy in the setup libraries correctly, so we don't wind up with dangling + symlinks in the package. Closes: #552161. + + -- Steve Langasek Mon, 02 Nov 2009 03:59:14 -0800 + +unixodbc (2.2.11-20) unstable; urgency=low + + * Split binaries out of odbcinst1debian1 into a new odbcinst package, so + that we aren't in the situation of trying to clean up config files in + the purge target of a shared library package. + + -- Steve Langasek Sun, 06 Sep 2009 13:50:40 -0700 + +unixodbc (2.2.11-19) unstable; urgency=low + + * /etc/odbcinst.ini should not be a conffile. Create it in the postinst + on upgrade instead if it doesn't exist, and remove in postrm purge. + (As a side effect, this means we'll need to split this package for + multiarch, but we already have to do that due to /usr/bin/odbcinst; we + just need to do it sooner rather than later, to avoid purging config + files on library purge...) Closes: #376368. + + -- Steve Langasek Fri, 04 Sep 2009 20:56:00 -0700 + +unixodbc (2.2.11-18) unstable; urgency=low + + * Put the headers back in unixodbc-dev; those are kind of important. + Closes: #544438. + + -- Steve Langasek Mon, 31 Aug 2009 10:20:58 -0700 + +unixodbc (2.2.11-17) unstable; urgency=low + + * Drop dltest from the package description, because it was dropped from the + package two years ago; thanks to Pete Boyd for pointing this out. + Closes: #448610. + * Build-Depend on libltdl-dev instead of libltdl3-dev. Closes: #476452. + * Have unixodbc Suggest: unixodbc-bin, per user request. Closes: #240035. + * Suggest tdsodbc, not libct1. + * Update debhelper compat to 7, adding ${misc:Depends} where needed + * Drop debian/dh_makeshlibs and the .manifest files in favor of the + now-standard dpkg-gensymbols .symbols files + * Rename lintian files to *.lintian-overrides so dh_lintian will take care + of them + * Migrate from dh_movefiles to dh_install + * Switch debian/rules to use dh + * Clean up debian/copyright to be more accurate (and approximate DEP5) + * Fix up menu files for the current section names (Apps->Applications; + Databases->Data Management) + * Neuter the .la files to not net dependency_libs, so that we can + eventually get rid of them entirely + * Drop unused debian/odbcinst_psql.ini file + * Drop unneeded entries in debian/dirs + * Set LDFLAGS=-Wl,-z,defs in debian/rules, to guard against all undefined + symbols + * Fix libodbcinstq1c2's missing dep on libltdl, picked up by the above + change + * Fix libodbctxt to not use undefined "stricmp" function + * Add Homepage field + * Standards-Version to 3.8.3. + + -- Steve Langasek Sun, 30 Aug 2009 18:47:57 -0700 + +unixodbc (2.2.11-16) unstable; urgency=low + + * The "libtool loves me, yes I know, because my upstream tells me so" + release + * Synchronize the local modifications to AC_LIBTOOL_LANG_CXX_CONFIG, + introduced in 2.2.11-14, with the current version from the libtool + package, as used in 2.2.11-15; now we should actually be getting usable + PIC libraries again and building on all archs, not just hurd. + Closes: #434203. + + -- Steve Langasek Thu, 26 Jul 2007 23:56:04 -0700 + +unixodbc (2.2.11-15) unstable; urgency=low + + * Relibtoolize with newest Debian libtool, to add hurd support. + Closes: #407114. + + -- Steve Langasek Fri, 13 Jul 2007 12:28:21 -0700 + +unixodbc (2.2.11-14) unstable; urgency=low + + * Include modified AC_LIBTOOL_LANG_CXX_CONFIG macro in acinclude.m4, + so that libtool -export-symbols actually works with GNU ld for C++ + libs; and update the symbol manifests to match. + Closes: #429600, #342084. + * The libtool version used in the package was updated in the process. + Closes: #366436. + * Replace ${Source-Version} with ${binary:Version}. + * Install lintian overrides for library package names. + * Set LC_MESSAGES=C explicitly in debian/dh_makeshlibs when calling + objdump, so that grep works as intended. Closes: #407062. + + -- Steve Langasek Thu, 28 Jun 2007 07:24:19 -0700 + +unixodbc (2.2.11-13) unstable; urgency=low + + * Pull in an ABI change from unixodbc 2.2.12 for 64-bit platforms; + 2.2.12 hasn't been released yet, but if the ABI is going to change + we should change it sooner rather than later. + * Fix a typo in the odbcinst(1) manpage; thanks to Rowan Rodrik van + der Molen for catching this. Closes: #347362. + + -- Steve Langasek Sat, 8 Apr 2006 00:20:49 -0700 + +unixodbc (2.2.11-12) unstable; urgency=low + + * Remove the last traces of libtemplate from unixodbc-dev. + Closes: #360343. + + -- Steve Langasek Sun, 2 Apr 2006 18:03:04 -0700 + +unixodbc (2.2.11-11) unstable; urgency=low + + * Drop gtkodbcconfig0 and godbcconfig packages; the godbcconfig interface + was never very good (compared to the Qt-based tools in unixodbc-bin) and + doesn't seem to be maintained upstream, the gtkodbcconfig0 package has no + other reverse-depends and now has an RC rpath bug which it just isn't + worth trying to fix. Closes: #136559, #136560, #358142. + * This means we can drop the build-depends on libgnome-dev, gdk-imlib1-dev, + and libgtk1.2-dev as well. + + -- Steve Langasek Tue, 21 Mar 2006 18:07:44 -0800 + +unixodbc (2.2.11-10) unstable; urgency=low + + * One-line patch to sqltypes.h to define BUILD_REAL_64_BIT_MODE explicitly, + instead of depending on the caller to define it; this ensures everyone is + building against the ABI that's actually present in the library, so they + will at minimum get compiler warnings if they get the prototypes wrong. + + -- Steve Langasek Sat, 4 Mar 2006 02:19:44 -0800 + +unixodbc (2.2.11-9) unstable; urgency=low + + * Go ahead and rebuild against libqt3-mt, since unixodbc-dev is + currently uninstallable and the current package version won't reach + testing without rebuilds of some of its reverse-depends. + Closes: #323358. + * Rename libodbcinstq1 to libodbcinstq1c2 for the C++ transition. + + -- Steve Langasek Fri, 9 Sep 2005 03:30:04 -0700 + +unixodbc (2.2.11-8) unstable; urgency=low + + * Fix backslash issue in debian/dh_makeshlibs -- grepping out bogus + symbols didn't work after all + + -- Steve Langasek Sun, 3 Jul 2005 10:40:40 -0700 + +unixodbc (2.2.11-7) unstable; urgency=low + + * The "never-ending fun" release + * Version two of the library symbol manifest format: + - include only weak and global symbols in the manifest, not local + symbols + - demangle C++ symbols so that the names are consistent across + - architectures + - record the __cxa_pure_virtual symbol, which includes the C++ ABI + name (for *most* libs) + - trim the extra symbols that the toolchain is known to add on mips, + mipsel, powerpc, and hppa. + The library manifest should now work across all archs for the vast + majority of libs without the finicky per-arch manifests. + + -- Steve Langasek Sun, 3 Jul 2005 00:07:26 -0700 + +unixodbc (2.2.11-6) unstable; urgency=low + + * Per-arch manifests still needed on ia64, due to all libs picking up + symbols on ia64 even though they don't on any other architecture. :/ + + -- Steve Langasek Thu, 30 Jun 2005 16:05:30 -0700 + +unixodbc (2.2.11-5) unstable; urgency=low + + * And ia64 also needs a per-arch manifest due to compiler-generated + symbols. + * Drop libtemplate.so.1 from the unixodbc package, because it's not + worth all this trouble just for a sample driver that doesn't + actually do anything. + + -- Steve Langasek Wed, 29 Jun 2005 23:02:15 -0700 + +unixodbc (2.2.11-4) unstable; urgency=low + + * once more... powerpc needs per-arch manifests for some + libraries still, due to compiler-generated symbols. + + -- Steve Langasek Sun, 26 Jun 2005 17:31:56 -0700 + +unixodbc (2.2.11-3) unstable; urgency=low + + * Add one final symbol to odbcinst, needed by libodbcinstQ.so.1. + * Add a per-arch manifest for gtkodbcconfig0 as well on mips/mipsel + (irritating compiler-provided symbols...), and one for libobcinstq1 + on m68k due to C++ symbol mangling differences + * Move UnixODBC tools to App/Databases in the Debian menu (from + Apps/Tools). Closes: #230682. + + -- Steve Langasek Thu, 23 Jun 2005 04:19:02 -0700 + +unixodbc (2.2.11-2) unstable; urgency=low + + * Fix library manifest handling to support per-architecture manifest + files, and deal with differences in the format of objdump -T output + between 32-bit and 64-bit architectures + * Add ia64, alpha, amd64, mips, and mipsel manifests for specific + packages, due to architecture differences in the resulting symbol + tables + + -- Steve Langasek Wed, 22 Jun 2005 22:45:18 -0700 + +unixodbc (2.2.11-1) unstable; urgency=low + + * New upstream release (closes: #225572) + - most of the Debian diff merged upstream + - possible fix for segfault connecting with db2 from perl (closes: + #268472) + - libboundparam.so.1 and libodbcextras.so.1 are now dropped from + the unixodbc package (and upstream); not changing the package + name, because the one was sample code and the other had a total of + one exported symbol, named "__extra_func_to_mollify_linker"... + - odbcinst1 is renamed to odbcinst1debian1: symbols have been + dropped (and function prototypes changed) without an upstream + soname change, so we get an ugly package name instead. + - use --enable-ltdllib now instead of --disable-ltdl-install, since + upstream appears to have an option now that does what we want + without hacking configure.in. + * Switch build-depends from flex to flex-old, and add build-depends on + bison. + * Bump build-depends on readline to libreadline5-dev. + * Add ini* to the list of exported symbols from libodbcinst.so + (needed by some applications) + * Drop the obsolete odbcinst1.preinst. + * Drop the dltest command, which is of limited utility to end users + * Integrate new isql(1) manpage provided by Kurt Roeckx (closes: + #236476). + * Drop headers from unixodbc-dev that we shouldn't be installing; + upstream has a working install target, so there's no reason to + overshoot by installing headers manually, and most of the extras + we were installing weren't usable for anything at all. This also + means the Conflicts: with arla-dev can be dropped (closes: #312129). + + -- Steve Langasek Tue, 14 Jun 2005 04:16:42 -0700 + +unixodbc (2.2.4-11) unstable; urgency=low + + * Brown paper bag me: conflicts do not write themselves just because + you add a line to the changelog. + + -- Steve Langasek Fri, 15 Oct 2004 03:07:52 -0700 + +unixodbc (2.2.4-10) unstable; urgency=high + + * High-urgency upload for an RC bugfix. + * Suggest libct1 instead of libct0, since the latter is no more + (closes: #255534). + * Conflict with arla-dev, since both provide /usr/include/log.h (at + least for now). Closes: #274784. + + -- Steve Langasek Tue, 5 Oct 2004 00:07:04 -0700 + +unixodbc (2.2.4-9) unstable; urgency=low + + * Fix a pair of undefined symbols in libodbccr.so that would have + caused linker assertions if this code were ever actually used + (closes: #215974). + + -- Steve Langasek Sat, 24 Jan 2004 16:04:53 -0600 + +unixodbc (2.2.4-8) unstable; urgency=low + + * Fix godbcconfig's section to 'gnome' instead of 'x11'. + * Upgrade to libtool 1.5, so that we can avoid unnecessary linking of + indirect dependencies; should address bugs like #210628. Also + closes: #211106. + + -- Steve Langasek Fri, 12 Sep 2003 10:27:00 -0500 + +unixodbc (2.2.4-7) unstable; urgency=low + + * Suggest libct1 instead of the defunct libct0. + * Provide more detail in long package descriptions (closes: #209667, + #210142). + + -- Steve Langasek Sun, 7 Sep 2003 11:48:34 -0500 + +unixodbc (2.2.4-6) unstable; urgency=low + + * Fix the path passed to dh_shlibdeps, so we actually find our + libraries. + * Make sure SQLLEN and SQLULEN are #defines on 64-bit archs as well, + to make it easier for app build scripts to cope. + * Make unixodbc-dev depend on libltdl3-dev, now that we're using the + external libltdl. + + -- Steve Langasek Sat, 1 Mar 2003 15:01:01 -0600 + +unixodbc (2.2.4-5) unstable; urgency=low + + * Fix the libodbctxt.so problem again: exempt it from the dh_movefiles + list, and also change to using the system libltdl. + + -- Steve Langasek Mon, 24 Feb 2003 20:35:04 -0600 + +unixodbc (2.2.4-4) unstable; urgency=low + + * remove extra directories from unixodbc binary package + * set AM_MAINTAINER_MODE for gODBCConfig, overlooked earlier + + -- Steve Langasek Sun, 23 Feb 2003 20:00:19 -0600 + +unixodbc (2.2.4-3) unstable; urgency=low + + * Address the upload race-condition that had libqt3-headers moving + at the same time I was preparing an upload depending on it. + * Add more 64-bit fixes to the code; now builds cleanly on alpha, + and works with all the drivers that worked before. + + -- Steve Langasek Sun, 23 Feb 2003 12:59:06 -0600 + +unixodbc (2.2.4-2) unstable; urgency=low + + * Fix the build scripts to not depend on xmkmf, and to also + account for changes to autoconf's internal macros between + 2.13 and 2.57. + * While we're at it, add --disable-dependency-tracking to the + configure options; saves time building given that 'make clean' + happens with every invocation of dpkg-buildpackage anyway. + + -- Steve Langasek Wed, 19 Feb 2003 19:37:50 -0600 + +unixodbc (2.2.4-1) unstable; urgency=low + + * New upstream release (closes: #159447). + * Conflict with old versions of remembrance-agent, which included + libtemplate.a (closes: #155101). + * Remove the alpha-specific build flags, since we're now using gcc 3.2. + * Move libodbcinstQ.so into its own package, as part of the C++ ABI + transition (closes: #140733). + * Fix libgtkodbcconfig so that it's properly linked against libs it + depends on. Correspondingly move this helper lib to its own package, + so no one screams at me for forcing the installation of libesd on + their servers. + * shuffle build rules about, to clean up empty dirs in the main + (unixodbc) package. + + -- Steve Langasek Sun, 26 Jan 2003 12:36:05 -0600 + +unixodbc (2.1.1-10) unstable; urgency=low + + * "libtool is my shepherd, I shall not want": try (again!) to get + libtool to behave itself by upgrading to libtool 1.4.2, since it's + now breaking builds on mips and mipsel that worked before. + + -- Steve Langasek Sun, 6 Oct 2002 00:13:58 -0500 + +unixodbc (2.1.1-9) unstable; urgency=low + + * Amend build-deps to point to the new gdk-imlib1-dev package + (closes: #162562). + * Polish the package descriptions for accuracy. + + -- Steve Langasek Fri, 27 Sep 2002 09:14:24 -0500 + +unixodbc (2.1.1-8) unstable; urgency=low + + * Loosen the relationship between unixodbc-dev and the GUI development + packages; for the most part, people developing GUIs should be able + to figure out for themselves what packages they need, without being + strongarmed by dselect. + + -- Steve Langasek Sat, 30 Mar 2002 10:52:17 -0600 + +unixodbc (2.1.1-7) unstable; urgency=low + + * Add manpages for odbcinst(1), ODBCConfig, and gODBCConfig. + Addresses 3 out of 7 lintian errors. + + -- Steve Langasek Sat, 2 Mar 2002 18:06:07 -0600 + +unixodbc (2.1.1-6) unstable; urgency=low + + * Avoid duplication of effort: we no longer ship the postgres driver, + but refer to the odbc-postgresql package instead. + + -- Steve Langasek Thu, 21 Feb 2002 21:14:50 -0600 + +unixodbc (2.1.1-5) unstable; urgency=low + + * The why-do-we-care-about-the-text-driver-anyway? release. + * Since libtool is so completely broken in handling libodbctxt.so, + and since libodbctxt.so is so useless, let's just ignore it. If it + doesn't build, eehhhh. + + -- Steve Langasek Fri, 8 Feb 2002 09:59:55 -0600 + +unixodbc (2.1.1-4) unstable; urgency=low + + * Patch ltmain.sh to handle the 'relinking' issue with libraries + depending on other libraries in the package. (closes: #130030) + * Fix use of libodbcinstQ to look for .so.1 instead of .so when + dlopening. (closes: #129845) + * Tweak to the install target (DESTDIR && !sysconfdir) + * Use GNU-standard arch values when passing to configure. + + -- Steve Langasek Thu, 31 Jan 2002 11:29:00 -0600 + +unixodbc (2.1.1-3) unstable; urgency=low + + * Try to fix the libtool brokenness by using DESTDIR instead of + prefix. + * Make sure Qt support gets built properly on i386 this time + (closes: #129845) + * Add library path to dh_shlibdeps invocation, fix for behavior when + building on a machine where unixodbc is not already installed. + + -- Steve Langasek Mon, 21 Jan 2002 11:28:00 -0600 + +unixodbc (2.1.1-2) unstable; urgency=low + + * Separate odbcinst library into a separate package, so that drivers + can depend on just this package instead of on all of unixodbc. + * Move GUI configure libs and included drivers into subdirectory, + /usr/lib/odbc/ + * Get rid of static versions of plugins, since nothing should link to + them directly. + * Pave the way for automatic install of postgres, txt, nn drivers. + + -- Steve Langasek Mon, 14 Jan 2002 11:08:00 -0600 + +unixodbc (2.1.1-1) unstable; urgency=low + + * New upstream release (closes: 116375 (for real this time)) + * Add build-dep for flex, which was accidentally chopped. + * Build against the multi-threaded version of the Qt library; fixes + possible build problems if libqt-mt is installed in the build + environment but libqt-mt-dev is not. Plus multi-threading is good. + + -- Steve Langasek Thu, 3 Jan 2002 17:01:28 -0600 + +unixodbc (2.0.11-1) unstable; urgency=low + + * New upstream release (closes: 116375) + * Correct spelling of QT to Qt. (closes: 118879) + * Change priority of unixodbc-dev to match the overrides file. + * Remove alpha dependency on gcc-3.0, to keep in sync with Qt packages. + * Add static libs to the -dev package, previously missing. + + -- Steve Langasek Sat, 17 Nov 2001 20:04:34 -0600 + +unixodbc (2.0.8-4) unstable; urgency=low + + * change unixodbc's preinst to only move files out of /etc/unixodbc + that match the names of known config files. This addresses problems + reported when /etc is under control of CVS, and also prevents + accidental overwriting of existing files in /etc. (closes: 117873) + + -- Steve Langasek Fri, 2 Nov 2001 16:41:00 -0600 + +unixodbc (2.0.8-3) unstable; urgency=low + + * cosmetic fix to package descriptions (closes: 110196) + * manually specify {host,build} arch, eliminating need for config.guess. + + -- Steve Langasek Mon, 27 Aug 2001 12:15:00 -0500 + +unixodbc (2.0.8-2) unstable; urgency=low + + * Fix alpha build now that qt is better-supported + * Fix config.{guess,sub} in the gODBCConfig subdirectory + + -- Steve Langasek Tue, 10 Jul 2001 20:18:00 -0500 + +unixodbc (2.0.8-1) unstable; urgency=low + + * New upstream release + * Set up build rules to always use the local config.{guess,sub} scripts or + the ones installed on the system, whichever are newer (closes: #103381) + + -- Steve Langasek Tue, 10 Jul 2001 16:40:28 -0500 + +unixodbc (2.0.5-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Run libtoolize to get support for new architectures. Closes: #103381 + + -- LaMont Jones Mon, 9 Jul 2001 21:39:34 -0600 + +unixodbc (2.0.5-2) unstable; urgency=low + + * New maintainer (closes: #89581) + * Removed indirect build-dependencies; let the packages we depend on pick + those up. + * Removed unnecessary unixodbc-dev dependency on libc6-dev, which is + build-essential and not cross-platform. + * temporarily disable building of Qt GUI tools on alpha until we have a + working compiler. + + -- Steve Langasek Sun, 20 May 2001 21:35:00 -0500 + +unixodbc (2.0.5-1) unstable; urgency=low + + * Removed build-dependency on libdb2-dev, since libgnoem-dev already + depends on libdb3-dev. (closes: #96985) + + -- Bas Zoetekouw Fri, 11 May 2001 15:14:02 +0200 + +unixodbc (2.0.5-0.1) unstable; urgency=low + + * NMU + * New upstream version + * Update maintainer field + + -- Ivan E. Moore II Wed, 18 Apr 2001 02:30:00 -0700 + +unixodbc (2.0.4-4) unstable; urgency=low + + * Changing maintainer to Debian QA + + -- Ivan E. Moore II Wed, 14 Mar 2001 00:18:00 -0700 + +unixodbc (2.0.4-3) unstable; urgency=low + + * Update Build-Depends to force build with new qt + * Build against new qt package + * Remove versioned depends + + -- Ivan E. Moore II Fri, 23 Feb 2001 09:48:00 -0700 + +unixodbc (2.0.4-2) unstable; urgency=low + + * Fix Build-Depends to reflect new libqt-dev package + * Remove undocumented links + * update shlibs since I forgot to do it before + * Update recommends for -dev package + + -- Ivan E. Moore II Mon, 19 Feb 2001 03:11:00 -0700 + +unixodbc (2.0.4-1) unstable; urgency=low + + * New upstream version + * Fix postgres socket again (Closes: #85262) + + -- Ivan E. Moore II Fri, 09 Feb 2001 04:15:00 -0700 + +unixodbc (2.0.3-2) unstable; urgency=low + + * Cleanup build-depends adding a couple missing ones + * Fixing shlibs + + -- Ivan E. Moore II Tue, 23 Jan 2001 23:43:00 -0700 + +unixodbc (2.0.3-1) unstable; urgency=low + + * New upstream version + + -- Ivan E. Moore II Wed, 17 Jan 2001 09:54:00 -0700 + +unixodbc (2.0.2-1) unstable; urgency=low + + * New upstream version + + -- Ivan E. Moore II Sat, 13 Jan 2001 02:50:00 -0700 + +unixodbc (2.0.1-1) unstable; urgency=low + + * New upstream version + * Adding in menus + + -- Ivan E. Moore II Sun, 07 Jan 2001 05:20:00 -0700 + +unixodbc (1.8.13.0-1) unstable; urgency=low + + * New upstream stable release - woh I got behind + * Build against new qt + * More work on build-depends + + -- Ivan E. Moore II Wed, 13 Dec 2000 18:30:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.9) unstable; urgency=low + + * More dependency work + * Build against new qt + + -- Ivan E. Moore II Wed, 13 Dec 2000 18:30:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.7) unstable; urgency=low + + * Building against new qt and xlibs + + -- Ivan E. Moore II Sat, 04 Nov 2000 14:30:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.6) unstable; urgency=low + + * Updating libmyodbc suggest + + -- Ivan E. Moore II Mon, 23 Oct 2000 17:54:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.5) unstable; urgency=low + + * Including missing header files (Closes: #75393) + + -- Ivan E. Moore II Mon, 23 Oct 2000 12:47:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.4) unstable; urgency=low + + * Fixing m68k build and others by removing dup movefiles listing + + -- Ivan E. Moore II Thu, 19 Oct 2000 21:00:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.3) unstable; urgency=low + + * Changing recommends to suggests (Closes: #72763) + * Building against qt 2.2.1 + + -- Ivan E. Moore II Sun, 08 Oct 2000 05:00:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.2) unstable; urgency=low + + * Fixing perm problem with configure + + -- Ivan E. Moore II Tue, 26 Sep 2000 22:30:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.1) unstable; urgency=low + + * New upstream cvs version + + -- Ivan E. Moore II Tue, 26 Sep 2000 17:30:00 -0700 + +unixodbc (1.8.12-8) unstable; urgency=low + + * More build-depends fixes + * Adding in a Recommend for libmyodbc2.50.26 + + -- Ivan E. Moore II Mon, 25 Sep 2000 16:45:00 -0700 + +unixodbc (1.8.12-7) unstable; urgency=low + + * Fixing conffile problem...oops + + -- Ivan E. Moore II Wed, 20 Sep 2000 17:00:00 -0700 + +unixodbc (1.8.12-6) unstable; urgency=low + + * Fixing Driver location problem (Closes: #71725) + + -- Ivan E. Moore II Mon, 18 Sep 2000 21:30:00 -0700 + +unixodbc (1.8.12-5) unstable; urgency=low + + * Fixing Postgres socket (Closes: #71740) + + -- Ivan E. Moore II Mon, 18 Sep 2000 16:45:00 -0700 + +unixodbc (1.8.12-4) unstable; urgency=low + + * Adding in a conflict for libiodbc-dev (Closes: #71342) + + -- Ivan E. Moore II Mon, 11 Sep 2000 03:30:00 -0700 + +unixodbc (1.8.12-3) unstable; urgency=low + + * Fixing a dangling .so file + + -- Ivan E. Moore II Sun, 10 Sep 2000 01:00:00 -0700 + +unixodbc (1.8.12-2) unstable; urgency=low + + * Fixing global section + + -- Ivan E. Moore II Fri, 08 Sep 2000 02:30:00 -0700 + +unixodbc (1.8.12-1) unstable; urgency=low + + * Initial Release. + + -- Ivan E. Moore II Sat, 26 Aug 2000 02:53:23 -0600 + +Local variables: +mode: debian-changelog +End: --- unixodbc-2.3.4.orig/debian/clean +++ unixodbc-2.3.4/debian/clean @@ -0,0 +1,8 @@ +# this symlink seems not to be cleaned properly. +config.status +# cleaning up after autotools-dev +config.sub +libltdl/config.sub +# autogenerated files that should also be cleaned upstream but aren't +ODBCConfig/mclass*.cpp +DataManager/mclass*.cpp --- unixodbc-2.3.4.orig/debian/compat +++ unixodbc-2.3.4/debian/compat @@ -0,0 +1 @@ +9 --- unixodbc-2.3.4.orig/debian/control +++ unixodbc-2.3.4/debian/control @@ -0,0 +1,87 @@ +Source: unixodbc +Build-Depends: debhelper (>= 9), dh-exec, dh-autoreconf, + libreadline-dev, libltdl-dev +Build-Conflicts: unixodbc-dev +Section: libs +Priority: optional +Maintainer: Steve Langasek +Standards-Version: 3.9.8 +Homepage: http://www.unixodbc.org/ +Vcs-Bzr: nosmart+http://bzr.debian.org/bzr/users/vorlon/unixodbc/trunk/ +Vcs-Browser: http://anonscm.debian.org/loggerhead/users/vorlon/unixodbc/trunk/ + +Package: unixodbc +Architecture: any +Multi-Arch: foreign +Section: database +Depends: ${shlibs:Depends}, ${misc:Depends}, libodbc1 (>= 2.2.14p2-3) +Conflicts: unixodbc-bin (<< 2.2.4-1) +Description: Basic ODBC tools + UnixODBC is an implementation of the Open Database Connectivity standard, + a database abstraction layer that allows applications to be used with + many different relational databases by way of a single library. + . + This package contains isql, a command-line tool that allows SQL commands + to be entered interactively. + +Package: libodbc1 +Architecture: any +Multi-Arch: same +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Suggests: libmyodbc, odbc-postgresql, tdsodbc, unixodbc-bin +Breaks: unixodbc (<< 2.2.14p2-3) +Replaces: unixodbc (<< 2.2.14p2-3) +Description: ODBC library for Unix + UnixODBC is an implementation of the Open DataBase Connectivity standard, + a database abstraction layer that allows applications to be used with + many different relational databases by way of a single library. + . + This package provides the UnixODBC shared library, libodbc; and + libodbctxt.so, a sample driver that reads from and writes to flat text + files. + +Package: unixodbc-dev +Architecture: any +Section: libdevel +Priority: extra +Depends: libodbc1 (= ${binary:Version}), + odbcinst1debian2 (= ${binary:Version}), + libltdl3-dev, ${misc:Depends} +Conflicts: libiodbc2-dev, remembrance-agent (<< 2.11-4) +Description: ODBC libraries for UNIX (development files) + This package contains the development files (headers and libraries) for + unixODBC, an implementation of the Open DataBase Connectivity interface + for Unix systems. You should not need to install this package unless + you intend to develop C language applications which use ODBC, or to + compile ODBC-using applications from source. + +Package: odbcinst1debian2 +Architecture: any +Multi-Arch: same +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends}, odbcinst +Pre-Depends: ${misc:Pre-Depends} +Replaces: unixodbc (<< 2.1.1-2) +Conflicts: odbcinst1, odbcinst1debian1 +Breaks: libmyodbc (<< 5.1.6-2), tdsodbc (<< 0.82-8), + odbc-postgresql (<< 1:09.00.0310-1.1) +Description: Support library for accessing odbc ini files + This package contains the libodbcinst library from unixodbc, a library + used by ODBC drivers for reading their configuration settings from + /etc/odbc.ini and ~/.odbc.ini. + . + Also contained in this package are the driver setup plugins, which + describe the features supported by individual ODBC drivers. + +Package: odbcinst +Architecture: any +Multi-Arch: foreign +Section: utils +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: unixodbc (<< 2.1.1-2), odbcinst1debian1 (<< 2.2.11-20), odbcinst1 +Conflicts: odbcinst1 +Description: Helper program for accessing odbc ini files + This package contains the odbcinst helper tool, which allows ODBC driver + packages to install their own driver settings. --- unixodbc-2.3.4.orig/debian/copyright +++ unixodbc-2.3.4/debian/copyright @@ -0,0 +1,58 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: unixODBC +Upstream-Contact: unixodbc-dev@mailman.unixodbc.org +Source: http://www.unixodbc.org/ + +Files: * +Copyright: 1999-2005 Nick Gorham , + Peter Harvey , et al. +License: LGPL-2+ + +Files: exe/* +Copyright: 1999-2005 Nick Gorham , + Peter Harvey , et al. +License: GPL-2+ + +Files: DRVConfig/esoob/esoobS.c +Copyright: 1999 Easysoft Ltd. +License: LGPL-2+ + +Files: Drivers/nn/* +Copyright: 1995, 1996 Ke Jin +License: GPL-2+ + +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This library 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian GNU/Linux systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL'. + +License: GPL-2+ + 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. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL'. --- unixodbc-2.3.4.orig/debian/dirs +++ unixodbc-2.3.4/debian/dirs @@ -0,0 +1 @@ +usr/lib/odbc --- unixodbc-2.3.4.orig/debian/docs +++ unixodbc-2.3.4/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README --- unixodbc-2.3.4.orig/debian/isql.1 +++ unixodbc-2.3.4/debian/isql.1 @@ -0,0 +1,60 @@ +.TH isql 1 "Dec 2004" UnixODBC "UnixODBC Reference" +.SH NAME +isql \- utility to submit SQL queries to a data source. +.br +iusql \- Unicode version of isql. +.SH SYNOPSIS +.B isql +DSN [UID [PWD]] [options] +.br +.SH DESCRIPTION +.I isql +can be used to submit SQL to a data source and to format/output results. +It can be used in batch or interactive mode. +.br +.SH OPTIONS +.TP +.B DSN +Name of the data source you want to connect to. +.TP +.B UID +Your login to connect the DSN. +.TP +.B PWD +Your password needed to login to the DSN. +.TP +.B \-b +Batch mode. +It will not do any prompting. +.TP +.B \-dx +Delimit columns with x. +.TP +.B \-x0xXX +Delimit columns with XX, where XX is in hex. +For example -x0x09 will use a tab. +.TP +.B \-w +Wrap results in an HTML table +.TP +.B \-c +Print column names on first row. +This options only has effect in combination with the -d option. +.TP +.B \-mn +Limit column display width to n +.TP +.B \-v +Verbose output. +.TP +.B \-\-version +This prints the version. +.SH EXAMPLES +.TP +.I cat My.sql | isql WebDB MyID MyPWD -w +Each line in My.sql must contain exactly 1 SQL command except for the +last line which must be blank. +.SH AUTHOR +This manual page was written by Kurt Roeckx +for the Debian package of unixODBC. + --- unixodbc-2.3.4.orig/debian/libodbc1.install +++ unixodbc-2.3.4/debian/libodbc1.install @@ -0,0 +1,3 @@ +usr/lib/*/libodbc.so.* +usr/lib/*/libodbccr.so.* +usr/lib/*/odbc/libnn.so --- unixodbc-2.3.4.orig/debian/libodbc1.links +++ unixodbc-2.3.4/debian/libodbc1.links @@ -0,0 +1,3 @@ +#!/usr/bin/dh-exec +usr/lib/${DEB_HOST_MULTIARCH}/libodbc.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libodbc.so.1 +usr/lib/${DEB_HOST_MULTIARCH}/libodbccr.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libodbccr.so.1 --- unixodbc-2.3.4.orig/debian/libodbc1.lintian-overrides +++ unixodbc-2.3.4/debian/libodbc1.lintian-overrides @@ -0,0 +1,2 @@ +libodbc1: package-name-doesnt-match-sonames libodbc2 libodbccr2 +libodbc1: symbols-file-contains-debian-revision on symbol CLConnect@Base --- unixodbc-2.3.4.orig/debian/libodbc1.symbols +++ unixodbc-2.3.4/debian/libodbc1.symbols @@ -0,0 +1,164 @@ +libodbc.so.2 libodbc1 #MINVER# + ODBCGetTryWaitValue@Base 2.3.1 + ODBCSetTryWaitValue@Base 2.3.1 + ODBCSharedTraceFlag@Base 2.3.1 + SQLAllocConnect@Base 2.3.1 + SQLAllocEnv@Base 2.3.1 + SQLAllocHandle@Base 2.3.1 + SQLAllocHandleStd@Base 2.3.1 + SQLAllocStmt@Base 2.3.1 + SQLBindCol@Base 2.3.1 + SQLBindParam@Base 2.3.1 + SQLBindParameter@Base 2.3.1 + SQLBrowseConnect@Base 2.3.1 + SQLBrowseConnectA@Base 2.3.1 + SQLBrowseConnectW@Base 2.3.1 + SQLBulkOperations@Base 2.3.1 + SQLCancel@Base 2.3.1 + SQLCloseCursor@Base 2.3.1 + SQLColAttribute@Base 2.3.1 + SQLColAttributeA@Base 2.3.1 + SQLColAttributeW@Base 2.3.1 + SQLColAttributes@Base 2.3.1 + SQLColAttributesA@Base 2.3.1 + SQLColAttributesW@Base 2.3.1 + SQLColumnPrivileges@Base 2.3.1 + SQLColumnPrivilegesA@Base 2.3.1 + SQLColumnPrivilegesW@Base 2.3.1 + SQLColumns@Base 2.3.1 + SQLColumnsA@Base 2.3.1 + SQLColumnsW@Base 2.3.1 + SQLConnect@Base 2.3.1 + SQLConnectA@Base 2.3.1 + SQLConnectW@Base 2.3.1 + SQLCopyDesc@Base 2.3.1 + SQLDataSources@Base 2.3.1 + SQLDataSourcesA@Base 2.3.1 + SQLDataSourcesW@Base 2.3.1 + SQLDescribeCol@Base 2.3.1 + SQLDescribeColA@Base 2.3.1 + SQLDescribeColW@Base 2.3.1 + SQLDescribeParam@Base 2.3.1 + SQLDisconnect@Base 2.3.1 + SQLDriverConnect@Base 2.3.1 + SQLDriverConnectA@Base 2.3.1 + SQLDriverConnectW@Base 2.3.1 + SQLDrivers@Base 2.3.1 + SQLDriversA@Base 2.3.1 + SQLDriversW@Base 2.3.1 + SQLEndTran@Base 2.3.1 + SQLError@Base 2.3.1 + SQLErrorA@Base 2.3.1 + SQLErrorW@Base 2.3.1 + SQLExecDirect@Base 2.3.1 + SQLExecDirectA@Base 2.3.1 + SQLExecDirectW@Base 2.3.1 + SQLExecute@Base 2.3.1 + SQLExtendedFetch@Base 2.3.1 + SQLFetch@Base 2.3.1 + SQLFetchScroll@Base 2.3.1 + SQLForeignKeys@Base 2.3.1 + SQLForeignKeysA@Base 2.3.1 + SQLForeignKeysW@Base 2.3.1 + SQLFreeConnect@Base 2.3.1 + SQLFreeEnv@Base 2.3.1 + SQLFreeHandle@Base 2.3.1 + SQLFreeStmt@Base 2.3.1 + SQLGetConnectAttr@Base 2.3.1 + SQLGetConnectAttrA@Base 2.3.1 + SQLGetConnectAttrW@Base 2.3.1 + SQLGetConnectOption@Base 2.3.1 + SQLGetConnectOptionA@Base 2.3.1 + SQLGetConnectOptionW@Base 2.3.1 + SQLGetCursorName@Base 2.3.1 + SQLGetCursorNameA@Base 2.3.1 + SQLGetCursorNameW@Base 2.3.1 + SQLGetData@Base 2.3.1 + SQLGetDescField@Base 2.3.1 + SQLGetDescFieldA@Base 2.3.1 + SQLGetDescFieldW@Base 2.3.1 + SQLGetDescRec@Base 2.3.1 + SQLGetDescRecA@Base 2.3.1 + SQLGetDescRecW@Base 2.3.1 + SQLGetDiagField@Base 2.3.1 + SQLGetDiagFieldA@Base 2.3.1 + SQLGetDiagFieldW@Base 2.3.1 + SQLGetDiagRec@Base 2.3.1 + SQLGetDiagRecA@Base 2.3.1 + SQLGetDiagRecW@Base 2.3.1 + SQLGetEnvAttr@Base 2.3.1 + SQLGetFunctions@Base 2.3.1 + SQLGetInfo@Base 2.3.1 + SQLGetInfoA@Base 2.3.1 + SQLGetInfoW@Base 2.3.1 + SQLGetStmtAttr@Base 2.3.1 + SQLGetStmtAttrA@Base 2.3.1 + SQLGetStmtAttrW@Base 2.3.1 + SQLGetStmtOption@Base 2.3.1 + SQLGetTypeInfo@Base 2.3.1 + SQLGetTypeInfoA@Base 2.3.1 + SQLGetTypeInfoW@Base 2.3.1 + SQLMoreResults@Base 2.3.1 + SQLNativeSql@Base 2.3.1 + SQLNativeSqlA@Base 2.3.1 + SQLNativeSqlW@Base 2.3.1 + SQLNumParams@Base 2.3.1 + SQLNumResultCols@Base 2.3.1 + SQLParamData@Base 2.3.1 + SQLParamOptions@Base 2.3.1 + SQLPrepare@Base 2.3.1 + SQLPrepareA@Base 2.3.1 + SQLPrepareW@Base 2.3.1 + SQLPrimaryKeys@Base 2.3.1 + SQLPrimaryKeysA@Base 2.3.1 + SQLPrimaryKeysW@Base 2.3.1 + SQLProcedureColumns@Base 2.3.1 + SQLProcedureColumnsA@Base 2.3.1 + SQLProcedureColumnsW@Base 2.3.1 + SQLProcedures@Base 2.3.1 + SQLProceduresA@Base 2.3.1 + SQLProceduresW@Base 2.3.1 + SQLPutData@Base 2.3.1 + SQLRowCount@Base 2.3.1 + SQLSetConnectAttr@Base 2.3.1 + SQLSetConnectAttrA@Base 2.3.1 + SQLSetConnectAttrW@Base 2.3.1 + SQLSetConnectOption@Base 2.3.1 + SQLSetConnectOptionA@Base 2.3.1 + SQLSetConnectOptionW@Base 2.3.1 + SQLSetCursorName@Base 2.3.1 + SQLSetCursorNameA@Base 2.3.1 + SQLSetCursorNameW@Base 2.3.1 + SQLSetDescField@Base 2.3.1 + SQLSetDescFieldA@Base 2.3.1 + SQLSetDescFieldW@Base 2.3.1 + SQLSetDescRec@Base 2.3.1 + SQLSetEnvAttr@Base 2.3.1 + SQLSetParam@Base 2.3.1 + SQLSetPos@Base 2.3.1 + SQLSetScrollOptions@Base 2.3.1 + SQLSetStmtAttr@Base 2.3.1 + SQLSetStmtAttrA@Base 2.3.1 + SQLSetStmtAttrW@Base 2.3.1 + SQLSetStmtOption@Base 2.3.1 + SQLSetStmtOptionA@Base 2.3.1 + SQLSetStmtOptionW@Base 2.3.1 + SQLSpecialColumns@Base 2.3.1 + SQLSpecialColumnsA@Base 2.3.1 + SQLSpecialColumnsW@Base 2.3.1 + SQLStatistics@Base 2.3.1 + SQLStatisticsA@Base 2.3.1 + SQLStatisticsW@Base 2.3.1 + SQLTablePrivileges@Base 2.3.1 + SQLTablePrivilegesA@Base 2.3.1 + SQLTablePrivilegesW@Base 2.3.1 + SQLTables@Base 2.3.1 + SQLTablesA@Base 2.3.1 + SQLTablesW@Base 2.3.1 + SQLTransact@Base 2.3.1 + uodbc_close_stats@Base 2.3.1 + uodbc_get_stats@Base 2.3.1 + uodbc_open_stats@Base 2.3.1 + uodbc_stats_error@Base 2.3.1 +libodbccr.so.2 libodbc1 #MINVER# + CLConnect@Base 2.3.1 --- unixodbc-2.3.4.orig/debian/odbcinst.1 +++ unixodbc-2.3.4/debian/odbcinst.1 @@ -0,0 +1,172 @@ +.TH odbcinst 1 "2nd Mar 2002" UnixODBC "UnixODBC Reference" +.SH NAME +odbcinst \- command line tool for batch ODBC configuration +.SH SYNOPSIS +.B odbcinst +.I action object options +.PP +.B action +is one of +.RS +.IP -i +install a driver or data source +.IP -u +uninstall a driver or data source +.IP -q +query a list of drivers or data sources present on the system +.IP -j +print config info +.IP -c +call SQLCreateDataSource +.IP -m +call SQLManageDataSources +.IP --version +shows the version number of the program +.RE +.PP +.B object +is one of +.RS +.IP -d +an ODBC driver in +.I /etc/odbcinst.ini +.IP -s +an ODBC Data Source Name (DSN) in an +.I odbc.ini +file. +.RE +.PP +.B options +are zero or more of +.RS +.TP +.BI "-f " "template file" +Used with +.BR -i , +this option specifies a template file containing the driver or DSN +to be installed. +.TP +.B -r +Read the template from standard input. +.TP +.BI "-n " "Driver/Data Source Name" +Used with +.B -u +to specify a driver or DSN to remove. +.TP +.B -v +Contrary to standard practice, this turns +.B off +verbose output; there is no output, even for errors. +.TP +.B -l +The specified Data Source object is a System DSN, in +.IR /etc/odbc.ini . +.TP +.B -h +The specified Data Source object is a User DSN, in the current user's +.IR $HOME/.odbc.ini . +This is the default with +.BR -s . +.RE +.SH DESCRIPTION +.B odbcinst +updates the configuration files that control ODBC access to database +servers on the current host. It also maintains in +.I /etc/odbcinst.ini +a count of the number of references to a particular driver, which can be +used to determine whether it should be removed from the file (only when +the reference count drops to 0). +.SS Installing +Drivers and DSNs are installed using the +.B -i +option. +.PP +If the object to be installed is a +.I driver +.RB ( -d ), +the specified driver is added to +.I /etc/odbcinst.ini +or its reference count is incremented if it is already there. +.PP +If the object is a +.I data source +.RB ( -s ), +the data source is added either to +.I /etc/odbc.ini +(if +.B -l +is used) or to +.I $HOME/.odbc.ini +(the default, which can also be specified with +.B -h\fP). +.SS Uninstalling +Uninstalling a driver is done with the command +.B odbcinst -u -d -n +.IR " driver name" . +Uninstalling a DSN is done with the command +.B odbcinst -u -s -n +.IR " data source name" . +Uninstalling causes the reference count on the object to be decremented. +If nothing else has requested this driver or DSN (i.e., the reference +count drops to zero), it is removed from the config file. +.PP +The options +.BR -l " and " -h +are used with +.B -s +to specify which +.I odbc.ini +file to configure. +.SS Queries +The command +.B odbcinst -q -d +returns a list of all drivers present in +.IR /etc/odbcinst.ini . +The command +.B odbcinst -q -s +returns a list of all system and user DSNs available. +.SH EXIT STATUS +.TP +.B 0 +Success +.TP +.B non-zero +Failure +.SH TEMPLATE FILES +A typical driver template looks like this: +.RS + [MySQL] + Description = MySQL driver + Driver = /usr/lib/odbc/libmyodbc.so + Setup = /usr/lib/odbc/libodbcmyS.so +.RE +.PP +A DSN template looks like this: +.RS + [Sample DSN] + Description = Test MySQL connection + Driver = MySQL + Trace = Yes + TraceFile = /tmp/odbc.log + Database = junk + Server = localhost + Port = 3306 + Socket = +.RE +.PP +The +.BR "Description " and " Driver" +fields should be present in all DSN configurations. Other options are +driver-specific; consult your ODBC driver's documentation for a list of +allowed options, or see +.B ODBCConfig(1) +for a graphical tool that can be used to interactively set up a DSN or +driver the first time. +.SH FILES +.IR /etc/odbcinst.ini ", " /etc/odbc.ini ", " $HOME/.odbc.ini +.SH AUTHOR +This manual page was written by Oliver Elphick and +Steve Langasek for the Debian package of unixODBC. +.SH SEE ALSO +.BR ODBCConfig(1) ", " gODBCConfig(1) --- unixodbc-2.3.4.orig/debian/odbcinst.install +++ unixodbc-2.3.4/debian/odbcinst.install @@ -0,0 +1,2 @@ +usr/bin/odbcinst usr/bin +etc/odbc.ini etc --- unixodbc-2.3.4.orig/debian/odbcinst.manpages +++ unixodbc-2.3.4/debian/odbcinst.manpages @@ -0,0 +1 @@ +debian/odbcinst.1 --- unixodbc-2.3.4.orig/debian/odbcinst.postinst +++ unixodbc-2.3.4/debian/odbcinst.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = configure ] && dpkg --compare-versions "$2" lt 2.2.14p2-4 \ + && [ ! -e /etc/odbcinst.ini ] +then + touch /etc/odbcinst.ini +fi + +#DEBHELPER# --- unixodbc-2.3.4.orig/debian/odbcinst.postrm +++ unixodbc-2.3.4/debian/odbcinst.postrm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = purge ]; then + rm -f /etc/odbcinst.ini +fi + +#DEBHELPER# --- unixodbc-2.3.4.orig/debian/odbcinst1debian2.dirs +++ unixodbc-2.3.4/debian/odbcinst1debian2.dirs @@ -0,0 +1 @@ +etc/ODBCDataSources --- unixodbc-2.3.4.orig/debian/odbcinst1debian2.install +++ unixodbc-2.3.4/debian/odbcinst1debian2.install @@ -0,0 +1,2 @@ +usr/lib/*/libodbcinst.so.* +usr/lib/*/odbc/*S.so --- unixodbc-2.3.4.orig/debian/odbcinst1debian2.links +++ unixodbc-2.3.4/debian/odbcinst1debian2.links @@ -0,0 +1,2 @@ +#!/usr/bin/dh-exec +usr/lib/${DEB_HOST_MULTIARCH}/libodbcinst.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libodbcinst.so.1 --- unixodbc-2.3.4.orig/debian/odbcinst1debian2.lintian-overrides +++ unixodbc-2.3.4/debian/odbcinst1debian2.lintian-overrides @@ -0,0 +1,2 @@ +odbcinst1debian2: package-name-doesnt-match-sonames libodbcinst2 +odbcinst1debian2: symbols-file-contains-debian-revision on symbol ODBCINSTAddProperty@Base and 53 others --- unixodbc-2.3.4.orig/debian/odbcinst1debian2.symbols +++ unixodbc-2.3.4/debian/odbcinst1debian2.symbols @@ -0,0 +1,85 @@ +libodbcinst.so.2 odbcinst1debian2 #MINVER# + ODBCINSTAddProperty@Base 2.3.1 + ODBCINSTConstructProperties@Base 2.3.1 + ODBCINSTDestructProperties@Base 2.3.1 + ODBCINSTSetProperty@Base 2.3.1 + ODBCINSTValidateProperties@Base 2.3.1 + ODBCINSTValidateProperty@Base 2.3.1 + SQLConfigDataSource@Base 2.3.1 + SQLConfigDataSourceW@Base 2.3.1 + SQLConfigDriver@Base 2.3.1 + SQLConfigDriverW@Base 2.3.1 + SQLCreateDataSource@Base 2.3.1 + SQLCreateDataSourceW@Base 2.3.1 + SQLGetAvailableDrivers@Base 2.3.1 + SQLGetAvailableDriversW@Base 2.3.1 + SQLGetConfigMode@Base 2.3.1 + SQLGetInstalledDrivers@Base 2.3.1 + SQLGetInstalledDriversW@Base 2.3.1 + SQLGetPrivateProfileString@Base 2.3.1 + SQLGetPrivateProfileStringW@Base 2.3.1 + SQLGetTranslator@Base 2.3.1 + SQLGetTranslatorW@Base 2.3.1 + SQLInstallDriver@Base 2.3.1 + SQLInstallDriverEx@Base 2.3.1 + SQLInstallDriverExW@Base 2.3.1 + SQLInstallDriverManager@Base 2.3.1 + SQLInstallDriverManagerW@Base 2.3.1 + SQLInstallDriverW@Base 2.3.1 + SQLInstallODBC@Base 2.3.1 + SQLInstallODBCW@Base 2.3.1 + SQLInstallTranslator@Base 2.3.1 + SQLInstallTranslatorEx@Base 2.3.1 + SQLInstallTranslatorExW@Base 2.3.1 + SQLInstallTranslatorW@Base 2.3.1 + SQLInstallerError@Base 2.3.1 + SQLInstallerErrorW@Base 2.3.1 + SQLManageDataSources@Base 2.3.1 + SQLPostInstallerError@Base 2.3.1 + SQLPostInstallerErrorW@Base 2.3.1 + SQLReadFileDSN@Base 2.3.1 + SQLReadFileDSNW@Base 2.3.1 + SQLRemoveDSNFromIni@Base 2.3.1 + SQLRemoveDSNFromIniW@Base 2.3.1 + SQLRemoveDefaultDataSource@Base 2.3.1 + SQLRemoveDriver@Base 2.3.1 + SQLRemoveDriverManager@Base 2.3.1 + SQLRemoveDriverW@Base 2.3.1 + SQLRemoveTranslator@Base 2.3.1 + SQLRemoveTranslatorW@Base 2.3.1 + SQLSetConfigMode@Base 2.3.1 + SQLValidDSN@Base 2.3.1 + SQLValidDSNW@Base 2.3.1 + SQLWriteDSNToIni@Base 2.3.1 + SQLWriteDSNToIniW@Base 2.3.1 + SQLWriteFileDSN@Base 2.3.1 + SQLWriteFileDSNW@Base 2.3.1 + SQLWritePrivateProfileString@Base 2.3.1 + SQLWritePrivateProfileStringW@Base 2.3.1 + _SQLDriverConnectPrompt@Base 2.3.1 + _odbcinst_FileINI@Base 2.3.1 + _odbcinst_SystemINI@Base 2.3.1 + _odbcinst_UserINI@Base 2.3.1 + iniClose@Base 2.3.1 + iniCommit@Base 2.3.1 + iniElement@Base 2.3.1 + iniObject@Base 2.3.1 + iniObjectDelete@Base 2.3.1 + iniObjectEOL@Base 2.3.1 + iniObjectFirst@Base 2.3.1 + iniObjectNext@Base 2.3.1 + iniObjectSeek@Base 2.3.1 + iniObjectSeekSure@Base 2.3.1 + iniOpen@Base 2.3.1 + iniProperty@Base 2.3.1 + iniPropertyEOL@Base 2.3.1 + iniPropertyFirst@Base 2.3.1 + iniPropertyInsert@Base 2.3.1 + iniPropertyNext@Base 2.3.1 + iniToUpper@Base 2.3.1 + iniValue@Base 2.3.1 + inst_logPushMsg@Base 2.3.1 + odbcinst_system_file_name@Base 2.3.1 + odbcinst_system_file_path@Base 2.3.1 + odbcinst_user_file_name@Base 2.3.1 + odbcinst_user_file_path@Base 2.3.1 --- unixodbc-2.3.4.orig/debian/odbcinst_txt.ini +++ unixodbc-2.3.4/debian/odbcinst_txt.ini @@ -0,0 +1,7 @@ +[TXT] +Description = Sample ODBC driver for a text file back-end +Driver = /usr/lib/odbc/libodbctxt.so +Setup = /usr/lib/odbc/libodbctxtS.so +CPTimeout = +CPReuse = + --- unixodbc-2.3.4.orig/debian/rules +++ unixodbc-2.3.4/debian/rules @@ -0,0 +1,33 @@ +#!/usr/bin/make -f +# Copyright 2009 Steve Langasek + +# build should fail if anything at all is wrong with the library symbols +export DPKG_GENSYMBOLS_CHECK_LEVEL=4 +# always force the check for undefined symbols +export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +%: + dh $@ --with autoreconf + +override_dh_auto_configure: + # Add here commands to configure the package. + CXXFLAGS="-g -O2 -pipe" \ + dh_auto_configure -- --enable-static --enable-ltdllib --without-pth \ + --enable-drivers --enable-driverc + +override_dh_auto_clean: + dh_auto_clean + +override_dh_auto_install: + dh_auto_install + mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/odbc + cp -L $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lib*S.so $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnn.so $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/odbc + +override_dh_makeshlibs: + dh_makeshlibs -X lib/$(DEB_HOST_MULTIARCH)/odbc/lib + +override_dh_link: + chmod a+x debian/libodbc1.links debian/odbcinst1debian2.links + dh_link --- unixodbc-2.3.4.orig/debian/unixodbc-dev.install +++ unixodbc-2.3.4/debian/unixodbc-dev.install @@ -0,0 +1,7 @@ +usr/lib/*/libodbc.so +usr/lib/*/libodbccr.so +usr/lib/*/libodbcinst.so +usr/lib/*/libodbc.a +usr/lib/*/libodbccr.a +usr/lib/*/libodbcinst.a +usr/include/* --- unixodbc-2.3.4.orig/debian/unixodbc.install +++ unixodbc-2.3.4/debian/unixodbc.install @@ -0,0 +1,2 @@ +usr/bin/isql +usr/bin/iusql --- unixodbc-2.3.4.orig/debian/unixodbc.links +++ unixodbc-2.3.4/debian/unixodbc.links @@ -0,0 +1 @@ +usr/share/man/man1/isql.1 usr/share/man/man1/iusql.1 --- unixodbc-2.3.4.orig/debian/unixodbc.manpages +++ unixodbc-2.3.4/debian/unixodbc.manpages @@ -0,0 +1 @@ +debian/isql.1 --- unixodbc-2.3.4.orig/debian/update-manifest.sh +++ unixodbc-2.3.4/debian/update-manifest.sh @@ -0,0 +1,19 @@ +#!/bin/sh +LC_COLLATE=C +export LC_COLLATE + +echo Updating library manifest... +for package in $@; do + manifest=debian/$package.manifest + # file format version number + echo " VERSION 2" > $manifest; \ + for i in $(find $(pwd)/debian/$package -type f \ + \( -name '*.so' -or -name '*.so.*' \)) + do + version=`dpkg-parsechangelog |awk '/Version:/ { print $2 }'` + objdump -p $i | sed -n -e"s/\( SONAME.*\)/\\1 $version/p" >> $manifest + objdump -T $i | grep -E ' [gw] .*\.text|__cxa_pure_virtual' \ + | grep -vE '\b((__gmon_start__|_ftext)\b|_(rest|save)[fg]pr)' \ + | cut -b34- | c++filt | sort >> $manifest + done +done --- unixodbc-2.3.4.orig/odbcinst/ODBCINSTConstructProperties.c +++ unixodbc-2.3.4/odbcinst/ODBCINSTConstructProperties.c @@ -165,6 +165,7 @@ */ lt_dlinit(); + lt_dlsetsearchpath(MODULEDIR); /* TRY GET FUNC FROM DRIVER SETUP */ if ( !(hDLL = lt_dlopen( szDriverSetup )) ) --- unixodbc-2.3.4.orig/odbcinst/SQLConfigDataSource.c +++ unixodbc-2.3.4/odbcinst/SQLConfigDataSource.c @@ -80,6 +80,7 @@ */ lt_dlinit(); + lt_dlsetsearchpath(MODULEDIR); #ifdef PLATFORM64 if ( iniPropertySeek( hIni, (char *)pszDriver, "Setup64", "" ) == INI_SUCCESS || --- unixodbc-2.3.4.orig/odbcinst/SQLConfigDriver.c +++ unixodbc-2.3.4/odbcinst/SQLConfigDriver.c @@ -86,6 +86,7 @@ */ lt_dlinit(); + lt_dlsetsearchpath(MODULEDIR); /* process request */ switch ( nRequest ) --- unixodbc-2.3.4.orig/odbcinst/SQLCreateDataSource.c +++ unixodbc-2.3.4/odbcinst/SQLCreateDataSource.c @@ -196,6 +196,7 @@ 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 ) ); --- unixodbc-2.3.4.orig/odbcinst/SQLManageDataSources.c +++ unixodbc-2.3.4/odbcinst/SQLManageDataSources.c @@ -76,9 +76,9 @@ 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 @@ 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 ) ); --- unixodbc-2.3.4.orig/odbcinst/_SQLGetInstalledDrivers.c +++ unixodbc-2.3.4/odbcinst/_SQLGetInstalledDrivers.c @@ -55,9 +55,9 @@ /* 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, "" ); --- unixodbc-2.3.4.orig/odbcinst/odbcinst.exp +++ unixodbc-2.3.4/odbcinst/odbcinst.exp @@ -64,3 +64,21 @@ _odbcinst_FileINI _SQLDriverConnectPrompt inst_logPushMsg +iniClose +iniCommit +iniElement +iniObject +iniObjectDelete +iniObjectEOL +iniObjectFirst +iniObjectNext +iniObjectSeek +iniObjectSeekSure +iniOpen +iniProperty +iniPropertyEOL +iniPropertyFirst +iniPropertyInsert +iniPropertyNext +iniToUpper +iniValue