Update qore-openldap-module to version 1.5.

Patches have been applied upstream.

Release notes:

* disable openssl cleanup in the Qore library since the openldap module
  makes openssl cleanup calls and calling those routines twice can
  result in segfaults
* updated example/test scripts to use %strict-args

5 files changed, 80 insertions, 117 deletions

diff --git a/databases/qore-openldap-module/Makefile b/databases/qore-openldap-module/Makefile
index 4d5baf08a7a..4ca35b6dc0a 100644
--- a/databases/qore-openldap-module/Makefile
+++ b/databases/qore-openldap-module/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2016/03/05 11:28:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2016/07/20 13:27:43 nros Exp $
 
-DISTNAME=	qore-openldap-module-1.0
-PKGREVISION=	5
+DISTNAME=	qore-openldap-module-1.1
 CATEGORIES=	databases
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=qore/}
+MASTER_SITES=   ${MASTER_SITE_GITHUB:=qorelanguage/}
 EXTRACT_SUFX=   .tar.bz2
+GITHUB_PROJECT=	module-openldap
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
-MAINTAINER=	nros@users.sourceforge.net
+MAINTAINER=	nros@netbsd.org
 COMMENT=	Openldap module for Qore
 HOMEPAGE=	http://www.qore.org/
 LICENSE=	gnu-lgpl-v2.1
@@ -17,6 +18,8 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pax
 PTHREAD_OPTS+=	native
 
+CONFIGURE_ARGS+=--with-libsuffix=""
+
 #install docs
 INSTALLATION_DIRS+=share/doc/${PKGBASE}
 post-install:
diff --git a/databases/qore-openldap-module/PLIST b/databases/qore-openldap-module/PLIST
index da1c0aba600..6a95647ec58 100644
--- a/databases/qore-openldap-module/PLIST
+++ b/databases/qore-openldap-module/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2014/12/30 15:43:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/07/20 13:27:43 nros Exp $
 ${QORE_MODULE_DIR}/openldap-api-${QORE_LATEST_MODULE_API}.qmod
 share/doc/qore-openldap-module/html/QC__LdapClient_8dox_8h_source.html
 share/doc/qore-openldap-module/html/annotated.html
 share/doc/qore-openldap-module/html/annotated.js
+share/doc/qore-openldap-module/html/annotated_dup.js
+share/doc/qore-openldap-module/html/arrowdown.png
+share/doc/qore-openldap-module/html/arrowright.png
 share/doc/qore-openldap-module/html/bc_s.png
 share/doc/qore-openldap-module/html/bdwn.png
 share/doc/qore-openldap-module/html/classOpenLdap_1_1LdapClient-members.html
@@ -11,27 +14,15 @@ share/doc/qore-openldap-module/html/classOpenLdap_1_1LdapClient.js
 share/doc/qore-openldap-module/html/classes.html
 share/doc/qore-openldap-module/html/closed.png
 share/doc/qore-openldap-module/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+share/doc/qore-openldap-module/html/dir_68267d1309a1af8e8297ef4c3efbcdba.js
+share/doc/qore-openldap-module/html/doc.png
 share/doc/qore-openldap-module/html/doxygen.css
 share/doc/qore-openldap-module/html/doxygen.png
 share/doc/qore-openldap-module/html/dynsections.js
 share/doc/qore-openldap-module/html/files.html
 share/doc/qore-openldap-module/html/files.js
-share/doc/qore-openldap-module/html/ftv2blank.png
-share/doc/qore-openldap-module/html/ftv2cl.png
-share/doc/qore-openldap-module/html/ftv2doc.png
-share/doc/qore-openldap-module/html/ftv2folderclosed.png
-share/doc/qore-openldap-module/html/ftv2folderopen.png
-share/doc/qore-openldap-module/html/ftv2lastnode.png
-share/doc/qore-openldap-module/html/ftv2link.png
-share/doc/qore-openldap-module/html/ftv2mlastnode.png
-share/doc/qore-openldap-module/html/ftv2mnode.png
-share/doc/qore-openldap-module/html/ftv2mo.png
-share/doc/qore-openldap-module/html/ftv2node.png
-share/doc/qore-openldap-module/html/ftv2ns.png
-share/doc/qore-openldap-module/html/ftv2plastnode.png
-share/doc/qore-openldap-module/html/ftv2pnode.png
-share/doc/qore-openldap-module/html/ftv2splitbar.png
-share/doc/qore-openldap-module/html/ftv2vertline.png
+share/doc/qore-openldap-module/html/folderclosed.png
+share/doc/qore-openldap-module/html/folderopen.png
 share/doc/qore-openldap-module/html/functions.html
 share/doc/qore-openldap-module/html/functions_func.html
 share/doc/qore-openldap-module/html/group__ldap__constants.html
@@ -55,71 +46,76 @@ share/doc/qore-openldap-module/html/nav_g.png
 share/doc/qore-openldap-module/html/nav_h.png
 share/doc/qore-openldap-module/html/navtree.css
 share/doc/qore-openldap-module/html/navtree.js
+share/doc/qore-openldap-module/html/navtreedata.js
 share/doc/qore-openldap-module/html/navtreeindex0.js
 share/doc/qore-openldap-module/html/open.png
 share/doc/qore-openldap-module/html/resize.js
-share/doc/qore-openldap-module/html/search/all_61.html
-share/doc/qore-openldap-module/html/search/all_61.js
-share/doc/qore-openldap-module/html/search/all_62.html
-share/doc/qore-openldap-module/html/search/all_62.js
-share/doc/qore-openldap-module/html/search/all_63.html
-share/doc/qore-openldap-module/html/search/all_63.js
-share/doc/qore-openldap-module/html/search/all_64.html
-share/doc/qore-openldap-module/html/search/all_64.js
-share/doc/qore-openldap-module/html/search/all_67.html
-share/doc/qore-openldap-module/html/search/all_67.js
-share/doc/qore-openldap-module/html/search/all_69.html
-share/doc/qore-openldap-module/html/search/all_69.js
-share/doc/qore-openldap-module/html/search/all_6c.html
-share/doc/qore-openldap-module/html/search/all_6c.js
-share/doc/qore-openldap-module/html/search/all_6d.html
-share/doc/qore-openldap-module/html/search/all_6d.js
-share/doc/qore-openldap-module/html/search/all_6f.html
-share/doc/qore-openldap-module/html/search/all_6f.js
-share/doc/qore-openldap-module/html/search/all_70.html
-share/doc/qore-openldap-module/html/search/all_70.js
-share/doc/qore-openldap-module/html/search/all_72.html
-share/doc/qore-openldap-module/html/search/all_72.js
-share/doc/qore-openldap-module/html/search/all_73.html
-share/doc/qore-openldap-module/html/search/all_73.js
-share/doc/qore-openldap-module/html/search/classes_6c.html
-share/doc/qore-openldap-module/html/search/classes_6c.js
+share/doc/qore-openldap-module/html/search/all_0.html
+share/doc/qore-openldap-module/html/search/all_0.js
+share/doc/qore-openldap-module/html/search/all_1.html
+share/doc/qore-openldap-module/html/search/all_1.js
+share/doc/qore-openldap-module/html/search/all_2.html
+share/doc/qore-openldap-module/html/search/all_2.js
+share/doc/qore-openldap-module/html/search/all_3.html
+share/doc/qore-openldap-module/html/search/all_3.js
+share/doc/qore-openldap-module/html/search/all_4.html
+share/doc/qore-openldap-module/html/search/all_4.js
+share/doc/qore-openldap-module/html/search/all_5.html
+share/doc/qore-openldap-module/html/search/all_5.js
+share/doc/qore-openldap-module/html/search/all_6.html
+share/doc/qore-openldap-module/html/search/all_6.js
+share/doc/qore-openldap-module/html/search/all_7.html
+share/doc/qore-openldap-module/html/search/all_7.js
+share/doc/qore-openldap-module/html/search/all_8.html
+share/doc/qore-openldap-module/html/search/all_8.js
+share/doc/qore-openldap-module/html/search/all_9.html
+share/doc/qore-openldap-module/html/search/all_9.js
+share/doc/qore-openldap-module/html/search/all_a.html
+share/doc/qore-openldap-module/html/search/all_a.js
+share/doc/qore-openldap-module/html/search/all_b.html
+share/doc/qore-openldap-module/html/search/all_b.js
+share/doc/qore-openldap-module/html/search/classes_0.html
+share/doc/qore-openldap-module/html/search/classes_0.js
 share/doc/qore-openldap-module/html/search/close.png
-share/doc/qore-openldap-module/html/search/functions_61.html
-share/doc/qore-openldap-module/html/search/functions_61.js
-share/doc/qore-openldap-module/html/search/functions_62.html
-share/doc/qore-openldap-module/html/search/functions_62.js
-share/doc/qore-openldap-module/html/search/functions_63.html
-share/doc/qore-openldap-module/html/search/functions_63.js
-share/doc/qore-openldap-module/html/search/functions_64.html
-share/doc/qore-openldap-module/html/search/functions_64.js
-share/doc/qore-openldap-module/html/search/functions_67.html
-share/doc/qore-openldap-module/html/search/functions_67.js
-share/doc/qore-openldap-module/html/search/functions_69.html
-share/doc/qore-openldap-module/html/search/functions_69.js
-share/doc/qore-openldap-module/html/search/functions_6d.html
-share/doc/qore-openldap-module/html/search/functions_6d.js
-share/doc/qore-openldap-module/html/search/functions_70.html
-share/doc/qore-openldap-module/html/search/functions_70.js
-share/doc/qore-openldap-module/html/search/functions_72.html
-share/doc/qore-openldap-module/html/search/functions_72.js
-share/doc/qore-openldap-module/html/search/functions_73.html
-share/doc/qore-openldap-module/html/search/functions_73.js
-share/doc/qore-openldap-module/html/search/groups_6c.html
-share/doc/qore-openldap-module/html/search/groups_6c.js
+share/doc/qore-openldap-module/html/search/functions_0.html
+share/doc/qore-openldap-module/html/search/functions_0.js
+share/doc/qore-openldap-module/html/search/functions_1.html
+share/doc/qore-openldap-module/html/search/functions_1.js
+share/doc/qore-openldap-module/html/search/functions_2.html
+share/doc/qore-openldap-module/html/search/functions_2.js
+share/doc/qore-openldap-module/html/search/functions_3.html
+share/doc/qore-openldap-module/html/search/functions_3.js
+share/doc/qore-openldap-module/html/search/functions_4.html
+share/doc/qore-openldap-module/html/search/functions_4.js
+share/doc/qore-openldap-module/html/search/functions_5.html
+share/doc/qore-openldap-module/html/search/functions_5.js
+share/doc/qore-openldap-module/html/search/functions_6.html
+share/doc/qore-openldap-module/html/search/functions_6.js
+share/doc/qore-openldap-module/html/search/functions_7.html
+share/doc/qore-openldap-module/html/search/functions_7.js
+share/doc/qore-openldap-module/html/search/functions_8.html
+share/doc/qore-openldap-module/html/search/functions_8.js
+share/doc/qore-openldap-module/html/search/functions_9.html
+share/doc/qore-openldap-module/html/search/functions_9.js
+share/doc/qore-openldap-module/html/search/groups_0.html
+share/doc/qore-openldap-module/html/search/groups_0.js
 share/doc/qore-openldap-module/html/search/mag_sel.png
-share/doc/qore-openldap-module/html/search/namespaces_6f.html
-share/doc/qore-openldap-module/html/search/namespaces_6f.js
+share/doc/qore-openldap-module/html/search/namespaces_0.html
+share/doc/qore-openldap-module/html/search/namespaces_0.js
 share/doc/qore-openldap-module/html/search/nomatches.html
 share/doc/qore-openldap-module/html/search/search.css
 share/doc/qore-openldap-module/html/search/search.js
 share/doc/qore-openldap-module/html/search/search_l.png
 share/doc/qore-openldap-module/html/search/search_m.png
 share/doc/qore-openldap-module/html/search/search_r.png
-share/doc/qore-openldap-module/html/search/variables_64.html
-share/doc/qore-openldap-module/html/search/variables_64.js
-share/doc/qore-openldap-module/html/search/variables_6c.html
-share/doc/qore-openldap-module/html/search/variables_6c.js
+share/doc/qore-openldap-module/html/search/searchdata.js
+share/doc/qore-openldap-module/html/search/variables_0.html
+share/doc/qore-openldap-module/html/search/variables_0.js
+share/doc/qore-openldap-module/html/search/variables_1.html
+share/doc/qore-openldap-module/html/search/variables_1.js
+share/doc/qore-openldap-module/html/splitbar.png
+share/doc/qore-openldap-module/html/sync_off.png
+share/doc/qore-openldap-module/html/sync_on.png
 share/doc/qore-openldap-module/html/tab_a.png
 share/doc/qore-openldap-module/html/tab_b.png
 share/doc/qore-openldap-module/html/tab_h.png
diff --git a/databases/qore-openldap-module/distinfo b/databases/qore-openldap-module/distinfo
index dab9dea127d..7f336e78579 100644
--- a/databases/qore-openldap-module/distinfo
+++ b/databases/qore-openldap-module/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 01:56:29 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/07/20 13:27:43 nros Exp $
 
-SHA1 (qore-openldap-module-1.0.tar.bz2) = 8aefbf1cc848cab8302df0ed4a19a8b78187c90f
-RMD160 (qore-openldap-module-1.0.tar.bz2) = 410481ac442ac4903b8e30c5d7084721b266e2da
-SHA512 (qore-openldap-module-1.0.tar.bz2) = 00059ed0c9835ddd538e0dc9db86d74def250fe489782ddbc68d44eb5fdea0b84ec549d4468600b4d867dbd27dc16c58c27f2e677b0e7437ca0423ee251fa95a
-Size (qore-openldap-module-1.0.tar.bz2) = 398752 bytes
-SHA1 (patch-configure) = 696c3f5d30bb66f0f0266378ac1d0a8a4f85a1ac
-SHA1 (patch-src_Makefile.in) = 6eac9ac3d3f03c68d194c8458f839b0225e2090f
+SHA1 (qore-openldap-module-1.1.tar.bz2) = f10325ce5d5eee2ca8b25cf295230410dfc61ea2
+RMD160 (qore-openldap-module-1.1.tar.bz2) = 34ef15f2f54808e3b72b708e55b76892db8f87a2
+SHA512 (qore-openldap-module-1.1.tar.bz2) = 8d2b4feaead1dad1464020477e5e72d84d0b6276b0f9833f0b116520d5b36ed6baa6e3849648687a68405b1a4957b27356323b9ac1e671176b316ab8999175b0
+Size (qore-openldap-module-1.1.tar.bz2) = 403641 bytes
diff --git a/databases/qore-openldap-module/patches/patch-configure b/databases/qore-openldap-module/patches/patch-configure
deleted file mode 100644
index 854e126e23c..00000000000
--- a/databases/qore-openldap-module/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2014/12/30 15:43:31 wiz Exp $
-pkgsrc doesn't use lib64 so don't set it.
-fixes build on linux.
-http://sf.net/p/qore/code/6817/
---- configure.orig	2014-10-31 21:44:50.730690623 +0000
-+++ configure
-@@ -15574,14 +15574,6 @@ if test "$enable_64bit" = "yes"; then
-       *linux*)	if test "$GXX" = "yes"; then
- 		   CXXFLAGS="$CXXFLAGS -m64"
- 		fi
--		# only set LIBSUFFIX=64 if /usr/lib64 exists
--		if test -d /usr/lib64; then
--		   LIBSUFFIX=64
--                fi
--                target="${host_cpu}-${host_os}"
--                if test -d /usr/lib/$target; then
--                   LIBSUFFIX=/$target
--                fi
- 
- 		;;
-       *hpux*)	if test "$host_cpu" = "ia64"; then
diff --git a/databases/qore-openldap-module/patches/patch-src_Makefile.in b/databases/qore-openldap-module/patches/patch-src_Makefile.in
deleted file mode 100644
index e097978df61..00000000000
--- a/databases/qore-openldap-module/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2014/12/30 15:43:31 wiz Exp $
-* remove .a file
-http://sf.net/p/qore/code/6288/
---- src/Makefile.in.orig	2013-01-07 10:21:11.000000000 +0000
-+++ src/Makefile.in
-@@ -279,6 +279,7 @@ AM_CPPFLAGS = $(QORE_CPPFLAGS)
- @COND_DEBUG_TRUE@@COND_PROFILE_FALSE@AM_CXXFLAGS = -g
- @COND_PROFILE_TRUE@AM_CXXFLAGS = -g -pg
- @COND_MINGW_TRUE@RM_OTHER = $(DESTDIR)$(libdir)/$(MNAME).dll.a
-+@COND_MINGW_FALSE@RM_OTHER = $(DESTDIR)$(libdir)/$(MNAME).a
- all: all-am
- 
- .SUFFIXES: