From acfa1a90fc9bd0cb080a4612ad8a63f7fc1b1a68 Mon Sep 17 00:00:00 2001
From: cube <cube@pkgsrc.org>
Date: Thu, 17 Mar 2005 15:23:57 +0000
Subject: Add a patch to follow one API change between OpenLDAP 2.1 and
 OpenLDAP 2.2. gq still compiled (one has to wonder why...), but crashed as
 soon as the user tried to browse a directory.

Patch taken from gq's SourceForge tracker, with changes to allow
compilation with OpenLDAP 2.1.

PKGREVISION++.
---
 databases/gq/Makefile         |  4 ++--
 databases/gq/distinfo         |  3 ++-
 databases/gq/patches/patch-af | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 databases/gq/patches/patch-af

(limited to 'databases')

diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index c27c5d5b3c5..3bda159b550 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/01/01 16:55:53 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2005/03/17 15:23:57 cube Exp $
 #
 
 DISTNAME=	gq-1.0beta1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	databases net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gqclient/}
 
diff --git a/databases/gq/distinfo b/databases/gq/distinfo
index 01962c270bd..1110112942a 100644
--- a/databases/gq/distinfo
+++ b/databases/gq/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 16:33:05 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/03/17 15:23:57 cube Exp $
 
 SHA1 (gq-1.0beta1.tar.gz) = fcfeb2874326962e891433d54df7932840fab6ff
 RMD160 (gq-1.0beta1.tar.gz) = 6d757f39d2543a41f4c99b5aa39890de726e4d9c
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = f1ade063dad913f334cb47c9cfb0b1d49c3ac22f
 SHA1 (patch-ac) = b750774ac9292a7c466716fc46ad39cf5bfe1e5f
 SHA1 (patch-ad) = 5a9da1912fea5f7fcbe1cd807caf6b77e498ea05
 SHA1 (patch-ae) = 295196adb9b78af2feab13206dd6e38ef1618d91
+SHA1 (patch-af) = e07d3f6bd24dff4fc46f07e7154bf1c68324900d
diff --git a/databases/gq/patches/patch-af b/databases/gq/patches/patch-af
new file mode 100644
index 00000000000..ba449996c3d
--- /dev/null
+++ b/databases/gq/patches/patch-af
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.1 2005/03/17 15:23:57 cube Exp $
+
+--- src/util.c.orig	2003-11-03 23:28:24.000000000 +0100
++++ src/util.c
+@@ -1909,7 +1909,11 @@ GList *get_suffixes(int error_context, s
+ char **gq_ldap_explode_dn(const char *dn, int dummy)
+ {
+      int i, rc;
++#if LDAP_VENDOR_VERSION >= 20200
++     LDAPDN parts;
++#else
+      LDAPDN *parts;
++#endif
+      char **v = 0; 
+      
+      rc = ldap_str2dn(dn, &parts, LDAP_DN_FORMAT_LDAPV3);
+@@ -1921,7 +1925,11 @@ char **gq_ldap_explode_dn(const char *dn
+      v = (char **) calloc((i + 2), sizeof(char*));
+ 
+      for( i = 0 ; parts[i] ; i++ ) {
++#if LDAP_VENDOR_VERSION >= 20200
++	  ldap_rdn2str(parts[i], &v[i],
++#else
+ 	  ldap_rdn2str(parts[0][i], &v[i],
++#endif
+ 		       LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
+      } 
+      return v;
-- 
cgit v1.2.3