[pkgsrc/trunk]: pkgsrc/databases/gq Changes 1.2.3:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df065ef11bd3
branches:  trunk
changeset: 537526:df065ef11bd3
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jan 10 21:42:50 2008 +0000

description:
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

diffstat:

 databases/gq/Makefile         |  20 +++++++++-----------
 databases/gq/PLIST            |  13 ++++++++-----
 databases/gq/distinfo         |  36 +++++++++---------------------------
 databases/gq/patches/patch-aa |   6 +++---
 databases/gq/patches/patch-ab |  33 ++++++++++++---------------------
 databases/gq/patches/patch-ac |   6 +++---
 databases/gq/patches/patch-ad |   6 +++---
 databases/gq/patches/patch-ae |  26 --------------------------
 databases/gq/patches/patch-af |  28 ----------------------------
 databases/gq/patches/patch-ag |  15 ---------------
 databases/gq/patches/patch-ah |  20 --------------------
 databases/gq/patches/patch-ai |  15 ---------------
 databases/gq/patches/patch-aj |  12 ------------
 databases/gq/patches/patch-ak |  15 ---------------
 databases/gq/patches/patch-al |  14 --------------
 databases/gq/patches/patch-am |  17 -----------------
 databases/gq/patches/patch-an |  23 +++++++++++++----------
 databases/gq/patches/patch-ao |  14 --------------
 databases/gq/patches/patch-ap |  16 ----------------
 databases/gq/patches/patch-aq |  17 -----------------
 databases/gq/patches/patch-ar |  16 ----------------
 databases/gq/patches/patch-as |  14 --------------
 databases/gq/patches/patch-at |  15 ---------------
 databases/gq/patches/patch-au |  14 --------------
 databases/gq/patches/patch-av |  14 --------------
 databases/gq/patches/patch-aw |  15 ---------------
 26 files changed, 60 insertions(+), 380 deletions(-)

diffs (truncated from 592 to 300 lines):

diff -r 41d9da2caadd -r df065ef11bd3 databases/gq/Makefile
--- a/databases/gq/Makefile     Thu Jan 10 20:54:16 2008 +0000
+++ b/databases/gq/Makefile     Thu Jan 10 21:42:50 2008 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2006/10/04 20:53:45 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.33 2008/01/10 21:42:50 adam Exp $
 
-DISTNAME=      gq-1.0beta1
-PKGREVISION=   10
+DISTNAME=      gq-1.2.3
 CATEGORIES=    databases net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gqclient/}
 
@@ -11,16 +9,16 @@
 COMMENT=       GTK-based LDAP client
 
 USE_DIRS+=             gnome2-1.5
+USE_PKGLOCALEDIR=      yes
+USE_TOOLS+=            gmake perl pkg-config
 GNU_CONFIGURE=         yes
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            pkg-config
-
 CONFIGURE_ARGS+=       --enable-browser-dnd
-CONFIGURE_ARGS+=       --with-ssl-prefix=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=       --enable-cache
+CONFIGURE_ARGS+=       --with-ssl-prefix=${BUILDLINK_PREFIX.openssl}
 
-.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../security/gnome-keyring/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 41d9da2caadd -r df065ef11bd3 databases/gq/PLIST
--- a/databases/gq/PLIST        Thu Jan 10 20:54:16 2008 +0000
+++ b/databases/gq/PLIST        Thu Jan 10 21:42:50 2008 +0000
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/21 16:26:37 cube Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/01/10 21:42:51 adam Exp $
 bin/gq
-share/gnome/apps/Internet/gq.desktop
+share/applications/gq.desktop
+share/gq/gq.glade
+share/mime/packages/gq-ldif.xml
 share/pixmaps/gq/bomb.xpm
+share/pixmaps/gq/entry.png
+share/pixmaps/gq/gq.xpm
 share/pixmaps/gq/hide.xpm
-share/pixmaps/gq/line.xpm
-share/pixmaps/gq/logo.xpm
 share/pixmaps/gq/new.xpm
-share/pixmaps/gq/textarea.xpm
+share/pixmaps/gq/textview.png
 share/pixmaps/gq/warning.xpm
 @dirrm share/pixmaps/gq
+@dirrm share/gq
diff -r 41d9da2caadd -r df065ef11bd3 databases/gq/distinfo
--- a/databases/gq/distinfo     Thu Jan 10 20:54:16 2008 +0000
+++ b/databases/gq/distinfo     Thu Jan 10 21:42:50 2008 +0000
@@ -1,28 +1,10 @@
-$NetBSD: distinfo,v 1.8 2006/07/17 08:46:28 seb Exp $
+$NetBSD: distinfo,v 1.9 2008/01/10 21:42:51 adam Exp $
 
-SHA1 (gq-1.0beta1.tar.gz) = fcfeb2874326962e891433d54df7932840fab6ff
-RMD160 (gq-1.0beta1.tar.gz) = 6d757f39d2543a41f4c99b5aa39890de726e4d9c
-Size (gq-1.0beta1.tar.gz) = 475081 bytes
-SHA1 (patch-aa) = 65c7e14f38e20862cace92b36fbd2ca091f60e10
-SHA1 (patch-ab) = f1ade063dad913f334cb47c9cfb0b1d49c3ac22f
-SHA1 (patch-ac) = b750774ac9292a7c466716fc46ad39cf5bfe1e5f
-SHA1 (patch-ad) = 5a9da1912fea5f7fcbe1cd807caf6b77e498ea05
-SHA1 (patch-ae) = 295196adb9b78af2feab13206dd6e38ef1618d91
-SHA1 (patch-af) = e07d3f6bd24dff4fc46f07e7154bf1c68324900d
-SHA1 (patch-ag) = 67727e7e930723ae343ebcfea27650106f015e97
-SHA1 (patch-ah) = 9ccd7ff5dc8830b41b0e8358cefcb5d5cbbe90a6
-SHA1 (patch-ai) = 2e1e8e8f26c0fb0a42ac92189508e7284f72cac5
-SHA1 (patch-aj) = 3b1be7c4529a7d12f4dcda8a583ac3ba6377a5e3
-SHA1 (patch-ak) = 58a2d7f297be87498197fb04044cfd7d0206be75
-SHA1 (patch-al) = c40683c1380e44b6e2b29379ff4675fdd69a9473
-SHA1 (patch-am) = 98478d32330fc7d6d2a76ca562512ca939b79496
-SHA1 (patch-an) = ce98c982053cd8a297ece506d11b957ad7d2765c
-SHA1 (patch-ao) = 281a9f1c734df028d46592d112c08339cfe75e03
-SHA1 (patch-ap) = 5db49fe6ea5d49bc30ff4c54164ba01b2eeecf5d
-SHA1 (patch-aq) = 5c13baa3d80ed67933fd9820636d06852fe3c341
-SHA1 (patch-ar) = f9381a0540139bb9fed792b58b9049c146d960d2
-SHA1 (patch-as) = 21a28a09820d26335be3c2e21d22ffa57cd83dd3
-SHA1 (patch-at) = 21e98e22751ae900317690cdc6309c26f0d3c60e
-SHA1 (patch-au) = 4f71d878fbf50f6e7c59825368c772133a289183
-SHA1 (patch-av) = 0ec6643d26f898f82c9f51f490f88206b1d4398d
-SHA1 (patch-aw) = b9da541ea6395d53acdbb5db7ef762adcc834bb7
+SHA1 (gq-1.2.3.tar.gz) = dc11f4c1c05037786ca6b212f4945fc20ecd33a4
+RMD160 (gq-1.2.3.tar.gz) = 4e8bf1700f4d7aacd906559e01a11654f6ce0f90
+Size (gq-1.2.3.tar.gz) = 423119 bytes
+SHA1 (patch-aa) = b243ab8d862e1aae6dc3a1e4769faa8e8949efe6
+SHA1 (patch-ab) = aa4918c9ee9900b839c58692e68c4adb675dcb17
+SHA1 (patch-ac) = d2180a16425a672c93c19697d9648e4c552cdcb8
+SHA1 (patch-ad) = 9a9a2e038163ab6a39f5325bbcdd01fa7589885b
+SHA1 (patch-an) = 29806e725bfa9f4827b2f7367006005b7ad44c6c
diff -r 41d9da2caadd -r df065ef11bd3 databases/gq/patches/patch-aa
--- a/databases/gq/patches/patch-aa     Thu Jan 10 20:54:16 2008 +0000
+++ b/databases/gq/patches/patch-aa     Thu Jan 10 21:42:50 2008 +0000
@@ -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 -r 41d9da2caadd -r df065ef11bd3 databases/gq/patches/patch-ab
--- a/databases/gq/patches/patch-ab     Thu Jan 10 20:54:16 2008 +0000
+++ b/databases/gq/patches/patch-ab     Thu Jan 10 21:42:50 2008 +0000
@@ -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 @@
 +             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 -r 41d9da2caadd -r df065ef11bd3 databases/gq/patches/patch-ac
--- a/databases/gq/patches/patch-ac     Thu Jan 10 20:54:16 2008 +0000
+++ b/databases/gq/patches/patch-ac     Thu Jan 10 21:42:50 2008 +0000
@@ -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 -r 41d9da2caadd -r df065ef11bd3 databases/gq/patches/patch-ad
--- a/databases/gq/patches/patch-ad     Thu Jan 10 20:54:16 2008 +0000
+++ b/databases/gq/patches/patch-ad     Thu Jan 10 21:42:50 2008 +0000
@@ -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 -r 41d9da2caadd -r df065ef11bd3 databases/gq/patches/patch-ae
--- a/databases/gq/patches/patch-ae     Thu Jan 10 20:54:16 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 41d9da2caadd -r df065ef11bd3 databases/gq/patches/patch-af
--- a/databases/gq/patches/patch-af     Thu Jan 10 20:54:16 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 41d9da2caadd -r df065ef11bd3 databases/gq/patches/patch-ag
--- a/databases/gq/patches/patch-ag     Thu Jan 10 20:54:16 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 41d9da2caadd -r df065ef11bd3 databases/gq/patches/patch-ah
--- a/databases/gq/patches/patch-ah     Thu Jan 10 20:54:16 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 41d9da2caadd -r df065ef11bd3 databases/gq/patches/patch-ai