pkg/31960: Add iODBC support to databases/openldap

[Geert Hendrickx <ghen%telenet.be@localhost>]

>Number:         31960
>Category:       pkg
>Synopsis:       Add iODBC support to databases/openldap
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Oct 31 18:36:00 +0000 2005
>Originator:     Geert Hendrickx
>Release:        NetBSD 2.1
>Organization:
        
>Environment:
        
        
System: NetBSD mantis 2.1 NetBSD 2.1 (MANTIS) #0: Fri Oct 28 15:48:15 CEST 2005 
geert@mantis:/cvs/obj/sys/arch/i386/compile/MANTIS i386
Architecture: i386
Machine: i386
>Description:
        
The patch below adds iODBC support to the databases/openldap package.  It 
allows OpenLDAP to use
an SQL database backend, instead of BDB, as seen on 
http://www.samse.fr/GPL/ldap_pg/HOWTO/ .
>How-To-Repeat:
        
>Fix:
        
? patches/patch-ao
Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/databases/openldap/distinfo,v
retrieving revision 1.42
diff -u -r1.42 distinfo
--- distinfo    26 Oct 2005 15:08:13 -0000      1.42
+++ distinfo    31 Oct 2005 18:11:14 -0000
@@ -12,3 +12,4 @@
 SHA1 (patch-ak) = 80685a7b46ded94722ea91c2842db424572d6513
 SHA1 (patch-am) = 12929851d1cfae97e1afa082cb82a00341a0d9ed
 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
+SHA1 (patch-ao) = 36ca6b7e3c8bae6e705a3d398670bbad57f7b14b
Index: options.mk
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/databases/openldap/options.mk,v
retrieving revision 1.13
diff -u -r1.13 options.mk
--- options.mk  26 Oct 2005 15:08:13 -0000      1.13
+++ options.mk  31 Oct 2005 18:11:14 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.13 2005/10/26 15:08:13 jlam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap
-PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp
+PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp iodbc
 PKG_SUGGESTED_OPTIONS= bdb
 
 .include "../../mk/bsd.options.mk"
@@ -25,6 +25,16 @@
 .endif
 
 ###
+### Whether to build with iODBC to enable SQL based slapd backends
+###
+.if !empty(PKG_OPTIONS:Miodbc)
+.  include "../../databases/iodbc/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-sql
+.else
+CONFIGURE_ARGS+=       --disable sql
+.endif
+
+###
 ### Kerberos authentication is via SASL.
 ###
 .if !empty(PKG_OPTIONS:Mkerberos)
--- /dev/null   2005-10-31 19:10:55.000000000 +0100
+++ patches/patch-ao    2005-10-31 19:06:42.000000000 +0100
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- servers/slapd/back-sql/delete.c.orig       2005-08-09 23:04:06.000000000 
+0200
++++ servers/slapd/back-sql/delete.c
+@@ -363,7 +363,7 @@ backsql_delete( Operation *op, SlapReply
+ 
+       rc = SQLExecute( sth );
+       switch ( rc ) {
+-      case SQL_NO_DATA:
++      case SQL_NO_DATA_FOUND:
+               /* apparently there were no "auxiliary" objectClasses
+                * for this entry... */
+       case SQL_SUCCESS:

>Unformatted: