Changes 1.2.3:

Bug fixes:
 * fixed simple bind with a patch from Pawel Salek (fixes 1753419)

Changes 1.2.2:
Bug fixes:
 * fixed a crash when loading the state file on BSD systems (patch from the
   NetBSD people)
 * make command line argument handling more robust

Changes 1.2.1:
Build Improvements
 * fixed a bash expression

23 files changed, 34 insertions, 337 deletions

diff --git a/databases/gq/patches/patch-aa b/databases/gq/patches/patch-aa
index 930e04399e7..0cc271372c3 100644
--- a/databases/gq/patches/patch-aa
+++ b/databases/gq/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/01/21 16:26:37 cube Exp $
+$NetBSD: patch-aa,v 1.3 2008/01/10 21:42:51 adam Exp $
 
---- config.h.in.orig	2003-11-04 00:07:06.000000000 +0100
+--- config.h.in.orig	2008-01-08 17:41:44.000000000 +0100
 +++ config.h.in
-@@ -130,6 +130,9 @@
+@@ -53,6 +53,9 @@
  /* Define to 1 if you have the `iswspace' function. */
  #undef HAVE_ISWSPACE
  
diff --git a/databases/gq/patches/patch-ab b/databases/gq/patches/patch-ab
index fbbcb89292e..e077deabe1a 100644
--- a/databases/gq/patches/patch-ab
+++ b/databases/gq/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2004/01/21 16:26:37 cube Exp $
+$NetBSD: patch-ab,v 1.3 2008/01/10 21:42:51 adam Exp $
 
---- configure.orig	2003-11-04 00:04:50.000000000 +0100
+--- configure.orig	2008-01-08 17:41:30.000000000 +0100
 +++ configure
-@@ -5330,7 +5330,7 @@ fi
+@@ -6240,7 +6240,7 @@ fi
  for ac_func in ldap_str2objectclass ldap_memfree ldap_rename ldap_str2dn \
  	       ldap_initialize \
  	       iswspace snprintf \
@@ -10,22 +10,13 @@ $NetBSD: patch-ab,v 1.2 2004/01/21 16:26:37 cube Exp $
 +	       g_snprintf btowc
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -6702,7 +6702,7 @@ _ACEOF
- fi;
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -7629,7 +7629,7 @@ echo "${ECHO_T}no" >&6; }
  
- if test "x$GCC" = "xyes"; then
--    for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith -Wfloat-equal
-+    for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith
-     do
- # The following should work as well, but might (?) be less portable
- #	if ! echo "$CFLAGS" | grep -q -w -- "$A" ; then
-@@ -10451,7 +10451,7 @@ echo "${ECHO_T}`eval echo '${'gq_cv_${PR
- 
- 	if test "$gq_cv_snprintf_reordering" = no ; then
- 
--		if test "gq_cv_g_snprintf_reordering" == "yes" ; then
-+		if test "gq_cv_g_snprintf_reordering" = "yes" ; then
- 			gq_cv_snprintf_reordering=yes
- 
- cat >>confdefs.h <<\_ACEOF
+ # a backup of the working CFLAGS
+ WARN_CFLAGS=""
+-for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith -Wfloat-equal
++for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith
+ do
+ 	if test -z "`echo "$CFLAGS" | grep -w -- "$A" 2> /dev/null`" ; then
+ 		gq_cv_compiler_supports_flag "$A"
diff --git a/databases/gq/patches/patch-ac b/databases/gq/patches/patch-ac
index 13aeb581d77..23a7bb0d690 100644
--- a/databases/gq/patches/patch-ac
+++ b/databases/gq/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2003/09/09 18:51:44 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2008/01/10 21:42:51 adam Exp $
 
---- src/filter.c.orig	2002-06-18 22:17:53.000000000 +0200
+--- src/filter.c.orig	2007-05-14 18:26:50.000000000 +0200
 +++ src/filter.c
-@@ -941,11 +941,11 @@ char *unindent_filter(char *indented)
+@@ -1036,11 +1036,11 @@ static char *unindent_filter(char *inden
  	       break;
  	  default:
  	       /* caught spaces before -- this is testing for \n etc */
diff --git a/databases/gq/patches/patch-ad b/databases/gq/patches/patch-ad
index 15850abce39..f62f0183bcb 100644
--- a/databases/gq/patches/patch-ad
+++ b/databases/gq/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/01/21 16:26:37 cube Exp $
+$NetBSD: patch-ad,v 1.2 2008/01/10 21:42:51 adam Exp $
 
---- src/dt_password.c.orig	2003-11-03 22:07:57.000000000 +0100
+--- src/dt_password.c.orig	2007-05-14 18:26:51.000000000 +0200
 +++ src/dt_password.c
-@@ -45,6 +45,15 @@
+@@ -48,6 +48,15 @@
  #include <openssl/md5.h>
  #include <openssl/md4.h>
  #include <openssl/sha.h>
diff --git a/databases/gq/patches/patch-ae b/databases/gq/patches/patch-ae
deleted file mode 100644
index c90b089854c..00000000000
--- a/databases/gq/patches/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/01/21 16:26:37 cube Exp $
-
---- src/xmlparse.c.orig	2003-11-03 22:05:18.000000000 +0100
-+++ src/xmlparse.c
-@@ -51,7 +51,7 @@
- #include "xmlparse.h"
- 
- #define malloc g_malloc
--#define calloc(n,s) g_malloc0(n * s)
-+#define calloc(n,s) g_malloc0((n) * (s))
- 
- #define TAGSTACK_INCR 20
- 
-@@ -162,10 +162,11 @@ static void startElementH(struct parser_
-     e->attrs = NULL;
-     if (attrs) {
- 	for (i = 0 ; attrs[i] ; i++) ;
--	e->attrs = calloc(i, sizeof(xmlChar *));
-+	e->attrs = calloc(i+1, sizeof(xmlChar *));
- 	for (i = 0 ; attrs[i] ; i++) {
- 	    e->attrs[i] = strdup(attrs[i]);
- 	}
-+	e->attrs[i] = NULL;
-     }
-     
-     /* lookup handler */
diff --git a/databases/gq/patches/patch-af b/databases/gq/patches/patch-af
deleted file mode 100644
index ba449996c3d..00000000000
--- a/databases/gq/patches/patch-af
+++ /dev/null
@@ -1,28 +0,0 @@
-$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;
diff --git a/databases/gq/patches/patch-ag b/databases/gq/patches/patch-ag
deleted file mode 100644
index 39f7b48b573..00000000000
--- a/databases/gq/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/browse-export.c.orig	2003-11-03 22:28:24.000000000 +0000
-+++ src/browse-export.c
-@@ -43,9 +43,9 @@
- 
- #include "browse-dnd.h"		/* copy_entry et al */
- 
-+#include "util.h"
- #include "configfile.h"		/* config */
- #include "errorchain.h"
--#include "util.h"
- #include "encode.h"
- #include "i18n.h"
- #include "utf8-compat.h"
diff --git a/databases/gq/patches/patch-ah b/databases/gq/patches/patch-ah
deleted file mode 100644
index fdc6ba539c1..00000000000
--- a/databases/gq/patches/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/browse.c.orig	2003-11-03 21:16:55.000000000 +0000
-+++ src/browse.c
-@@ -34,6 +34,7 @@
- #include <config.h>
- 
- #include "common.h"
-+#include "util.h"
- #include "configfile.h"
- #include "browse.h"
- 
-@@ -43,7 +44,6 @@
- 
- #include "mainwin.h"
- #include "template.h"
--#include "util.h"
- #include "tinput.h"
- #include "errorchain.h"
- #include "ldif.h"
diff --git a/databases/gq/patches/patch-ai b/databases/gq/patches/patch-ai
deleted file mode 100644
index deba1d66075..00000000000
--- a/databases/gq/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/configfile.c.orig	2003-11-03 21:34:52.000000000 +0000
-+++ src/configfile.c
-@@ -37,9 +37,9 @@
- 
- #include <glib.h>
- 
-+#include "util.h"
- #include "configfile.h"
- #include "common.h"
--#include "util.h"
- #include "template.h"
- #include "filter.h"
- #include "encode.h"		/* gq_codeset */
diff --git a/databases/gq/patches/patch-aj b/databases/gq/patches/patch-aj
deleted file mode 100644
index f6a17156f1c..00000000000
--- a/databases/gq/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/debug.c.orig	2003-11-03 21:07:57.000000000 +0000
-+++ src/debug.c
-@@ -34,6 +34,7 @@
- #endif /* HAVE_BACKTRACE */
- 
- #include "debug.h"
-+#include "util.h"
- #include "configfile.h"
- #include "common.h"
- 
diff --git a/databases/gq/patches/patch-ak b/databases/gq/patches/patch-ak
deleted file mode 100644
index 69b6c572cc3..00000000000
--- a/databases/gq/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/dn-browse.c.orig	2003-11-02 07:20:43.000000000 +0000
-+++ src/dn-browse.c
-@@ -47,9 +47,9 @@
- #include "tinput.h"		/* formfill_from_template */
- #include "browse-dnd.h"		/* copy_entry et al */
- 
-+#include "util.h"
- #include "configfile.h"		/* config */
- #include "errorchain.h"
--#include "util.h"
- #include "encode.h"
- #include "i18n.h"
- #include "utf8-compat.h"
diff --git a/databases/gq/patches/patch-al b/databases/gq/patches/patch-al
deleted file mode 100644
index 4c308e86f2c..00000000000
--- a/databases/gq/patches/patch-al
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/formfill.c.orig	2003-11-03 21:07:57.000000000 +0000
-+++ src/formfill.c
-@@ -34,8 +34,8 @@
- #include <ldap.h>
- 
- #include "common.h"
--#include "configfile.h"
- #include "util.h"
-+#include "configfile.h"
- #include "formfill.h"
- #include "ldif.h"
- #include "syntax.h"
diff --git a/databases/gq/patches/patch-am b/databases/gq/patches/patch-am
deleted file mode 100644
index 5fd3bc781cb..00000000000
--- a/databases/gq/patches/patch-am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/gq-xml.c.orig	2003-11-03 22:28:24.000000000 +0000
-+++ src/gq-xml.c
-@@ -38,11 +38,11 @@
- #include <fcntl.h>
- #include <ctype.h>
- 
-+#include "util.h"
- #include "gq-xml.h"
- #include "xmlparse.h"
- #include "xmlutil.h"
- #include "configfile.h"
--#include "util.h"
- #include "i18n.h"
- #include "ldif.h"
- #include "syntax.h"
diff --git a/databases/gq/patches/patch-an b/databases/gq/patches/patch-an
index c74e196172a..f8562dbcd4e 100644
--- a/databases/gq/patches/patch-an
+++ b/databases/gq/patches/patch-an
@@ -1,12 +1,15 @@
-$NetBSD: patch-an,v 1.1 2006/07/17 08:46:29 seb Exp $
+$NetBSD: patch-an,v 1.2 2008/01/10 21:42:54 adam Exp $
 
---- src/gq.c.orig	2003-11-03 21:25:53.000000000 +0000
+--- src/gq.c.orig	2008-01-10 22:31:56.000000000 +0100
 +++ src/gq.c
-@@ -40,6 +40,7 @@
- #include "gq.h"
- #include "i18n.h"
- #include "mainwin.h"
-+#include "util.h"
- #include "configfile.h"
- #include "syntax.h"
- #include "encode.h"
+@@ -32,6 +32,10 @@
+ # include  <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
++#ifdef HAVE_LOCALE_H
++# include  <locale.h>
++#endif /* HAVE_LOCALE_H */
++
+ #ifdef DEBUG
+ #  include "debug.h"
+ #  ifdef HAVE_MCHECK
diff --git a/databases/gq/patches/patch-ao b/databases/gq/patches/patch-ao
deleted file mode 100644
index cb5548f30f8..00000000000
--- a/databases/gq/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/input.c.orig	2003-11-03 21:28:37.000000000 +0000
-+++ src/input.c
-@@ -37,8 +37,8 @@
- 
- #include "mainwin.h"
- #include "common.h"
--#include "configfile.h"
- #include "util.h"
-+#include "configfile.h"
- #include "errorchain.h"
- #include "formfill.h"
- #include "input.h"
diff --git a/databases/gq/patches/patch-ap b/databases/gq/patches/patch-ap
deleted file mode 100644
index 58e1ad70edd..00000000000
--- a/databases/gq/patches/patch-ap
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/mainwin.c.orig	2003-11-03 21:07:57.000000000 +0000
-+++ src/mainwin.c
-@@ -35,10 +35,10 @@
- #include "common.h"
- #include "search.h"
- #include "mainwin.h"
-+#include "util.h"
- #include "configfile.h"
- #include "browse.h"
- #include "prefs.h"
--#include "util.h"
- #include "template.h"
- #include "filter.h"
- #include "COPYING.h"
diff --git a/databases/gq/patches/patch-aq b/databases/gq/patches/patch-aq
deleted file mode 100644
index 4dc87a7b9ba..00000000000
--- a/databases/gq/patches/patch-aq
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/prefs.c.orig	2003-11-03 21:44:19.000000000 +0000
-+++ src/prefs.c
-@@ -35,11 +35,11 @@
- #include <string.h>
- #include <ctype.h>
- 
-+#include "util.h"
- #include "configfile.h"
- #include "common.h"
- #include "prefs.h"
- #include "mainwin.h"
--#include "util.h"
- #include "template.h"
- #include "errorchain.h"
- #include "debug.h"
diff --git a/databases/gq/patches/patch-ar b/databases/gq/patches/patch-ar
deleted file mode 100644
index ec2f9aa1d53..00000000000
--- a/databases/gq/patches/patch-ar
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/ref-browse.c.orig	2003-11-03 21:07:57.000000000 +0000
-+++ src/ref-browse.c
-@@ -40,10 +40,10 @@
- #include "server-browse.h"
- #include "ref-browse.h"
- 
-+#include "util.h"
- #include "configfile.h"		/* free_ldapserver */
- #include "prefs.h"		/* create_edit_server_window */
- 
--#include "util.h"
- #include "i18n.h"
- #include "errorchain.h"
- #include "encode.h"
diff --git a/databases/gq/patches/patch-as b/databases/gq/patches/patch-as
deleted file mode 100644
index ddc6feb2cc1..00000000000
--- a/databases/gq/patches/patch-as
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-as,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/schema.c.orig	2003-11-03 21:07:58.000000000 +0000
-+++ src/schema.c
-@@ -36,8 +36,8 @@
- #include <string.h>
- 
- #include "common.h"
--#include "configfile.h"
- #include "util.h"
-+#include "configfile.h"
- #include "schema.h"
- #include "i18n.h"
- #include "debug.h"
diff --git a/databases/gq/patches/patch-at b/databases/gq/patches/patch-at
deleted file mode 100644
index 6e810681e39..00000000000
--- a/databases/gq/patches/patch-at
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/schemabrowse.c.orig	2003-11-03 21:07:58.000000000 +0000
-+++ src/schemabrowse.c
-@@ -42,9 +42,9 @@
- 
- #include "schemabrowse.h"
- #include "mainwin.h"
-+#include "util.h"
- #include "configfile.h"
- #include "common.h"
--#include "util.h"
- #include "schema.h"
- #include "i18n.h"
- #include "debug.h"
diff --git a/databases/gq/patches/patch-au b/databases/gq/patches/patch-au
deleted file mode 100644
index aabbf0acec9..00000000000
--- a/databases/gq/patches/patch-au
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-au,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/search.c.orig	2003-11-03 21:07:58.000000000 +0000
-+++ src/search.c
-@@ -34,8 +34,8 @@
- 
- #include "common.h"
- #include "mainwin.h"
--#include "configfile.h"
- #include "util.h"
-+#include "configfile.h"
- #include "search.h"
- #include "formfill.h"
- #include "input.h"
diff --git a/databases/gq/patches/patch-av b/databases/gq/patches/patch-av
deleted file mode 100644
index ced54069213..00000000000
--- a/databases/gq/patches/patch-av
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-av,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/state.c.orig	2003-11-03 21:19:54.000000000 +0000
-+++ src/state.c
-@@ -37,8 +37,8 @@
- #include <gtk/gtk.h>
- 
- #include "xmlparse.h"
--#include "configfile.h"
- #include "util.h"
-+#include "configfile.h"
- #include "errorchain.h"
- #include "xmlutil.h"
- #include "i18n.h"
diff --git a/databases/gq/patches/patch-aw b/databases/gq/patches/patch-aw
deleted file mode 100644
index 2c234410676..00000000000
--- a/databases/gq/patches/patch-aw
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2006/07/17 08:46:29 seb Exp $
-
---- src/template.c.orig	2003-11-03 21:41:43.000000000 +0000
-+++ src/template.c
-@@ -38,9 +38,9 @@
- #include <ldap_schema.h>
- 
- #include "mainwin.h"
-+#include "util.h"
- #include "configfile.h"
- #include "common.h"
--#include "util.h"
- #include "schema.h"
- #include "schemabrowse.h"
- #include "template.h"