From 6e8d27a735ce8157aa04c2a88b5c922f0a8ef165 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 28 Mar 2018 15:24:17 +0800 Subject: unixodbc: update to 2.3.6 Release notes from http://www.unixodbc.org/: * Single bug fix that was a possible security issue so I have pushed a version out. - Fix order of arguments in SQLWriteFileDSN.c, fix unwanted free() in iusql.c - Add pkg-config files Signed-off-by: Jackie Huang Signed-off-by: Armin Kuster --- .../do-not-use-libltdl-source-directory.patch | 12 +++++----- meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb | 27 ---------------------- meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb | 27 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb create mode 100644 meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch b/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch index 69d26adca9..2499cff72d 100644 --- a/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch +++ b/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch @@ -13,22 +13,22 @@ Signed-off-by: Jackie Huang 2 files changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am -index e881cca..1321802 100644 +index 4628401..e8989bf 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -5,7 +5,6 @@ SUBDIRS = \ +@@ -11,7 +11,6 @@ SUBDIRS = \ log \ lst \ ini \ -- libltdl \ +- libltdl \ odbcinst \ DriverManager \ exe \ diff --git a/configure.ac b/configure.ac -index 218502f..d50b7af 100644 +index e4bcdaf..58aa5c5 100644 --- a/configure.ac +++ b/configure.ac -@@ -136,9 +136,7 @@ dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) +@@ -144,9 +144,7 @@ dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) dnl LT_CONFIG_LTDL_DIR([libltdl]) dnl LTDL_INIT @@ -39,5 +39,5 @@ index 218502f..d50b7af 100644 dnl Substitute INCLTDL and LIBLTDL in the Makefiles AC_SUBST(LTDLINCL) -- -2.8.1 +2.12.3 diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb deleted file mode 100644 index 6f57f375e8..0000000000 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "An Open Source ODBC sub-system" -DESCRIPTION = "unixODBC is an Open Source ODBC sub-system and an ODBC SDK \ -for Linux, Mac OSX, and UNIX." - -HOMEPAGE = "http://www.unixodbc.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7b37bf80a3df5a65b355433ae36d206" - -DEPENDS = "libtool mysql5" - -SRC_URI = "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${PV}.tar.gz \ - file://do-not-use-libltdl-source-directory.patch \ -" -SRC_URI[md5sum] = "bd25d261ca1808c947cb687e2034be81" -SRC_URI[sha256sum] = "2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39" - -inherit autotools-brokensep - -S = "${WORKDIR}/unixODBC-${PV}" - -EXTRA_OEMAKE += "LIBS=-lltdl" - -do_configure_prepend() { - # old m4 files will cause libtool version don't match - rm -rf m4/* - rm -fr libltdl -} diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb new file mode 100644 index 0000000000..62d9db8439 --- /dev/null +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb @@ -0,0 +1,27 @@ +SUMMARY = "An Open Source ODBC sub-system" +DESCRIPTION = "unixODBC is an Open Source ODBC sub-system and an ODBC SDK \ +for Linux, Mac OSX, and UNIX." + +HOMEPAGE = "http://www.unixodbc.org/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d7b37bf80a3df5a65b355433ae36d206" + +DEPENDS = "libtool mysql5" + +SRC_URI = "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${PV}.tar.gz \ + file://do-not-use-libltdl-source-directory.patch \ +" +SRC_URI[md5sum] = "a8629fd2953b04b4639d0a9d8a5cf9d1" +SRC_URI[sha256sum] = "88b637f647c052ecc3861a3baa275c3b503b193b6a49ff8c28b2568656d14d69" + +inherit autotools-brokensep + +S = "${WORKDIR}/unixODBC-${PV}" + +EXTRA_OEMAKE += "LIBS=-lltdl" + +do_configure_prepend() { + # old m4 files will cause libtool version don't match + rm -rf m4/* + rm -fr libltdl +} -- cgit 1.2.3-korg