CVS commit: pkgsrc/databases/unixodbc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Apr 14 08:26:34 UTC 2018

Modified Files:
        pkgsrc/databases/unixodbc: Makefile PLIST distinfo
Added Files:
        pkgsrc/databases/unixodbc/patches: patch-Drivers_nn_yyparse.c
            patch-exe_Makefile.in

Log Message:
unixodbc: updated to 2.3.6

2.3.6:
Single bug fix that ws 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


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/unixodbc/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/unixodbc/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/unixodbc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/unixodbc/patches/patch-Drivers_nn_yyparse.c \
    pkgsrc/databases/unixodbc/patches/patch-exe_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/unixodbc/Makefile
diff -u pkgsrc/databases/unixodbc/Makefile:1.38 pkgsrc/databases/unixodbc/Makefile:1.39
--- pkgsrc/databases/unixodbc/Makefile:1.38     Wed Jan 10 23:07:01 2018
+++ pkgsrc/databases/unixodbc/Makefile  Sat Apr 14 08:26:34 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2018/01/10 23:07:01 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2018/04/14 08:26:34 adam Exp $
 
-DISTNAME=      unixODBC-2.3.5
+DISTNAME=      unixODBC-2.3.6
 PKGNAME=       ${DISTNAME:S/ODBC/odbc/}
 CATEGORIES=    databases
 MASTER_SITES=  ftp://ftp.unixodbc.org/pub/unixODBC/
@@ -13,13 +13,16 @@ LICENSE=    gnu-lgpl-v2.1
 CONFLICTS+=            iodbc<3.52.7nb2
 
 USE_LIBTOOL=           yes
-USE_TOOLS+=            flex yacc # to get libodbctxt.la
+USE_TOOLS+=            gmake flex yacc # to get libodbctxt.la
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --disable-gui
 CONFIGURE_ARGS+=       --enable-driverc
 CONFIGURE_ARGS+=       --enable-drivers
 CONFIGURE_ARGS+=       --enable-threads
+PKGCONFIG_OVERRIDE+=   DriverManager/odbc.pc.in
+PKGCONFIG_OVERRIDE+=   cur/odbccr.pc.in
+PKGCONFIG_OVERRIDE+=   odbcinst/odbcinst.pc.in
 PTHREAD_OPTS+=         require
 
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/databases/unixodbc/PLIST
diff -u pkgsrc/databases/unixodbc/PLIST:1.12 pkgsrc/databases/unixodbc/PLIST:1.13
--- pkgsrc/databases/unixodbc/PLIST:1.12        Sun Oct 25 08:18:00 2015
+++ pkgsrc/databases/unixodbc/PLIST     Sat Apr 14 08:26:34 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2015/10/25 08:18:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2018/04/14 08:26:34 adam Exp $
 bin/dltest
 bin/isql
 bin/iusql
@@ -35,6 +35,9 @@ ${UNIXODBC_DRIVERS_DIR}/liboraodbcS.la
 ${UNIXODBC_DRIVERS_DIR}/libsapdbS.la
 ${UNIXODBC_DRIVERS_DIR}/libtdsS.la
 ${UNIXODBC_DRIVERS_DIR}/libtemplate.la
+lib/pkgconfig/odbc.pc
+lib/pkgconfig/odbccr.pc
+lib/pkgconfig/odbcinst.pc
 man/man1/dltest.1
 man/man1/isql.1
 man/man1/iusql.1

Index: pkgsrc/databases/unixodbc/distinfo
diff -u pkgsrc/databases/unixodbc/distinfo:1.16 pkgsrc/databases/unixodbc/distinfo:1.17
--- pkgsrc/databases/unixodbc/distinfo:1.16     Wed Jan 10 23:07:01 2018
+++ pkgsrc/databases/unixodbc/distinfo  Sat Apr 14 08:26:34 2018
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.16 2018/01/10 23:07:01 wiz Exp $
+$NetBSD: distinfo,v 1.17 2018/04/14 08:26:34 adam Exp $
 
-SHA1 (unixODBC-2.3.5.tar.gz) = 22b9254626d303be95d1eeafa34d452a45792545
-RMD160 (unixODBC-2.3.5.tar.gz) = 72ed87df0d59ce6a7c5459e1ca72e585c8619d51
-SHA512 (unixODBC-2.3.5.tar.gz) = 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
-Size (unixODBC-2.3.5.tar.gz) = 1633390 bytes
+SHA1 (unixODBC-2.3.6.tar.gz) = 23ff27a449e990f9c4b1b29a6369086006454baa
+RMD160 (unixODBC-2.3.6.tar.gz) = 6ff50a528a648c188f99604652c273fe375b2287
+SHA512 (unixODBC-2.3.6.tar.gz) = 6518a4169946e847dd710d54724a44d268b98954d30064eadadb703edbbeafac05bd1f42a6845c2fdcdab7ae8987800acd1a5f6b4b96de5f3c8c3e4bc370fe30
+Size (unixODBC-2.3.6.tar.gz) = 1661914 bytes
+SHA1 (patch-Drivers_nn_yyparse.c) = c2b1ddbf21eadd2bc07b8373c59920f8505886c5
+SHA1 (patch-exe_Makefile.in) = 85ae24152e0c6c537df2ed12837f436f02b4702e

Added files:

Index: pkgsrc/databases/unixodbc/patches/patch-Drivers_nn_yyparse.c
diff -u /dev/null pkgsrc/databases/unixodbc/patches/patch-Drivers_nn_yyparse.c:1.1
--- /dev/null   Sat Apr 14 08:26:34 2018
+++ pkgsrc/databases/unixodbc/patches/patch-Drivers_nn_yyparse.c        Sat Apr 14 08:26:34 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-Drivers_nn_yyparse.c,v 1.1 2018/04/14 08:26:34 adam Exp $
+
+Fix building.
+
+--- Drivers/nn/yyparse.c.orig  2018-04-14 08:14:33.000000000 +0000
++++ Drivers/nn/yyparse.c
+@@ -82,7 +82,7 @@
+ static        char    sccsid[]
+       = "@(#)SQL parser for NNSQL(NetNews SQL), Copyright(c) 1995, 1996 by Ke Jin";
+ 
+-#include      <config.h>
++#include      "nnconfig.h"
+ 
+ #include      <nncol.h>
+ #include      <yyenv.h>
Index: pkgsrc/databases/unixodbc/patches/patch-exe_Makefile.in
diff -u /dev/null pkgsrc/databases/unixodbc/patches/patch-exe_Makefile.in:1.1
--- /dev/null   Sat Apr 14 08:26:34 2018
+++ pkgsrc/databases/unixodbc/patches/patch-exe_Makefile.in     Sat Apr 14 08:26:34 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-exe_Makefile.in,v 1.1 2018/04/14 08:26:34 adam Exp $
+
+Do not depend on GNU sed.
+
+--- exe/Makefile.in.orig       2018-04-14 07:58:07.000000000 +0000
++++ exe/Makefile.in
+@@ -749,9 +749,12 @@ uninstall-am: uninstall-binPROGRAMS
+ 
+ 
+ all-am:
+-      @sed -i -e "s![@]ODBC_ULEN[@]!`$(CURDIR)/odbc_config$(EXEEXT) --ulen`!" \
+-              -e "s![@]ODBC_CFLAGS[@]!`$(CURDIR)/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \
+-              $(top_builddir)/DriverManager/odbc.pc
++      @sed "s![@]ODBC_ULEN[@]!`$(CURDIR)/odbc_config$(EXEEXT) --ulen`!" \
++              $(top_builddir)/DriverManager/odbc.pc > $(CURDIR)/odbc.pc.tmp
++      @mv $(CURDIR)/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc
++      @sed "s![@]ODBC_CFLAGS[@]!`$(CURDIR)/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \
++              $(top_builddir)/DriverManager/odbc.pc > $(CURDIR)/odbc.pc.tmp
++      @mv $(CURDIR)/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.