Thu Jan 10 21:42:57 2008 UTC ()
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


(adam)
diff -r1.32 -r1.33 pkgsrc/databases/gq/Makefile
diff -r1.3 -r1.4 pkgsrc/databases/gq/PLIST
diff -r1.8 -r1.9 pkgsrc/databases/gq/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/gq/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/databases/gq/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/databases/gq/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/databases/gq/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/databases/gq/patches/patch-an
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-ae
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-af
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-ag
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-ah
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-ai
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-aj
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-ak
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-al
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-am
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-ao
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-ap
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-aq
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-ar
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-as
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-at
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-au
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-av
diff -r1.1 -r0 pkgsrc/databases/gq/patches/patch-aw
cvs diff -r1.32 -r1.33 pkgsrc/databases/gq/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/gq/Attic/Makefile 2006/10/04 20:53:45 1.32
+++ pkgsrc/databases/gq/Attic/Makefile 2008/01/10 21:42:50 1.33
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.32 2006/10/04 20:53:45 wiz Exp $ 1# $NetBSD: Makefile,v 1.33 2008/01/10 21:42:50 adam Exp $
2# 
3 2
4DISTNAME= gq-1.0beta1 3DISTNAME= gq-1.2.3
5PKGREVISION= 10 
6CATEGORIES= databases net 4CATEGORIES= databases net
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqclient/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqclient/}
8 6
9MAINTAINER= rh@NetBSD.org 7MAINTAINER= rh@NetBSD.org
10HOMEPAGE= http://gq-project.org/ 8HOMEPAGE= http://gq-project.org/
11COMMENT= GTK-based LDAP client 9COMMENT= GTK-based LDAP client
12 10
13USE_DIRS+= gnome2-1.5 11USE_DIRS+= gnome2-1.5
14GNU_CONFIGURE= yes 
15USE_PKGLOCALEDIR= yes 12USE_PKGLOCALEDIR= yes
16USE_TOOLS+= pkg-config 13USE_TOOLS+= gmake perl pkg-config
17 14GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --enable-browser-dnd 15CONFIGURE_ARGS+= --enable-browser-dnd
19CONFIGURE_ARGS+= --with-ssl-prefix=${BUILDLINK_PREFIX.openssl} 
20CONFIGURE_ARGS+= --enable-cache 16CONFIGURE_ARGS+= --enable-cache
 17CONFIGURE_ARGS+= --with-ssl-prefix=${BUILDLINK_PREFIX.openssl}
21 18
22.include "../../security/openssl/buildlink3.mk" 19.include "../../devel/libglade/buildlink3.mk"
23.include "../../databases/openldap-client/buildlink3.mk" 20.include "../../databases/openldap-client/buildlink3.mk"
24.include "../../x11/gtk2/buildlink3.mk" 21.include "../../security/gnome-keyring/buildlink3.mk"
25.include "../../textproc/libxml2/buildlink3.mk" 22.include "../../security/libgcrypt/buildlink3.mk"
 23.include "../../security/openssl/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/databases/gq/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/gq/Attic/PLIST 2004/01/21 16:26:37 1.3
+++ pkgsrc/databases/gq/Attic/PLIST 2008/01/10 21:42:51 1.4
@@ -1,11 +1,14 @@ @@ -1,11 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2004/01/21 16:26:37 cube Exp $ 1@comment $NetBSD: PLIST,v 1.4 2008/01/10 21:42:51 adam Exp $
2bin/gq 2bin/gq
3share/gnome/apps/Internet/gq.desktop 3share/applications/gq.desktop
 4share/gq/gq.glade
 5share/mime/packages/gq-ldif.xml
4share/pixmaps/gq/bomb.xpm 6share/pixmaps/gq/bomb.xpm
 7share/pixmaps/gq/entry.png
 8share/pixmaps/gq/gq.xpm
5share/pixmaps/gq/hide.xpm 9share/pixmaps/gq/hide.xpm
6share/pixmaps/gq/line.xpm 
7share/pixmaps/gq/logo.xpm 
8share/pixmaps/gq/new.xpm 10share/pixmaps/gq/new.xpm
9share/pixmaps/gq/textarea.xpm 11share/pixmaps/gq/textview.png
10share/pixmaps/gq/warning.xpm 12share/pixmaps/gq/warning.xpm
11@dirrm share/pixmaps/gq 13@dirrm share/pixmaps/gq
 14@dirrm share/gq
cvs diff -r1.8 -r1.9 pkgsrc/databases/gq/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/gq/Attic/distinfo 2006/07/17 08:46:28 1.8
+++ pkgsrc/databases/gq/Attic/distinfo 2008/01/10 21:42:51 1.9
@@ -1,28 +1,10 @@ @@ -1,28 +1,10 @@
1$NetBSD: distinfo,v 1.8 2006/07/17 08:46:28 seb Exp $ 1$NetBSD: distinfo,v 1.9 2008/01/10 21:42:51 adam Exp $
2 2
3SHA1 (gq-1.0beta1.tar.gz) = fcfeb2874326962e891433d54df7932840fab6ff 3SHA1 (gq-1.2.3.tar.gz) = dc11f4c1c05037786ca6b212f4945fc20ecd33a4
4RMD160 (gq-1.0beta1.tar.gz) = 6d757f39d2543a41f4c99b5aa39890de726e4d9c 4RMD160 (gq-1.2.3.tar.gz) = 4e8bf1700f4d7aacd906559e01a11654f6ce0f90
5Size (gq-1.0beta1.tar.gz) = 475081 bytes 5Size (gq-1.2.3.tar.gz) = 423119 bytes
6SHA1 (patch-aa) = 65c7e14f38e20862cace92b36fbd2ca091f60e10 6SHA1 (patch-aa) = b243ab8d862e1aae6dc3a1e4769faa8e8949efe6
7SHA1 (patch-ab) = f1ade063dad913f334cb47c9cfb0b1d49c3ac22f 7SHA1 (patch-ab) = aa4918c9ee9900b839c58692e68c4adb675dcb17
8SHA1 (patch-ac) = b750774ac9292a7c466716fc46ad39cf5bfe1e5f 8SHA1 (patch-ac) = d2180a16425a672c93c19697d9648e4c552cdcb8
9SHA1 (patch-ad) = 5a9da1912fea5f7fcbe1cd807caf6b77e498ea05 9SHA1 (patch-ad) = 9a9a2e038163ab6a39f5325bbcdd01fa7589885b
10SHA1 (patch-ae) = 295196adb9b78af2feab13206dd6e38ef1618d91 10SHA1 (patch-an) = 29806e725bfa9f4827b2f7367006005b7ad44c6c
11SHA1 (patch-af) = e07d3f6bd24dff4fc46f07e7154bf1c68324900d 
12SHA1 (patch-ag) = 67727e7e930723ae343ebcfea27650106f015e97 
13SHA1 (patch-ah) = 9ccd7ff5dc8830b41b0e8358cefcb5d5cbbe90a6 
14SHA1 (patch-ai) = 2e1e8e8f26c0fb0a42ac92189508e7284f72cac5 
15SHA1 (patch-aj) = 3b1be7c4529a7d12f4dcda8a583ac3ba6377a5e3 
16SHA1 (patch-ak) = 58a2d7f297be87498197fb04044cfd7d0206be75 
17SHA1 (patch-al) = c40683c1380e44b6e2b29379ff4675fdd69a9473 
18SHA1 (patch-am) = 98478d32330fc7d6d2a76ca562512ca939b79496 
19SHA1 (patch-an) = ce98c982053cd8a297ece506d11b957ad7d2765c 
20SHA1 (patch-ao) = 281a9f1c734df028d46592d112c08339cfe75e03 
21SHA1 (patch-ap) = 5db49fe6ea5d49bc30ff4c54164ba01b2eeecf5d 
22SHA1 (patch-aq) = 5c13baa3d80ed67933fd9820636d06852fe3c341 
23SHA1 (patch-ar) = f9381a0540139bb9fed792b58b9049c146d960d2 
24SHA1 (patch-as) = 21a28a09820d26335be3c2e21d22ffa57cd83dd3 
25SHA1 (patch-at) = 21e98e22751ae900317690cdc6309c26f0d3c60e 
26SHA1 (patch-au) = 4f71d878fbf50f6e7c59825368c772133a289183 
27SHA1 (patch-av) = 0ec6643d26f898f82c9f51f490f88206b1d4398d 
28SHA1 (patch-aw) = b9da541ea6395d53acdbb5db7ef762adcc834bb7 
cvs diff -r1.2 -r1.3 pkgsrc/databases/gq/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/databases/gq/patches/Attic/patch-aa 2004/01/21 16:26:37 1.2
+++ pkgsrc/databases/gq/patches/Attic/patch-aa 2008/01/10 21:42:51 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.2 2004/01/21 16:26:37 cube Exp $ 1$NetBSD: patch-aa,v 1.3 2008/01/10 21:42:51 adam Exp $
2 2
3--- config.h.in.orig 2003-11-04 00:07:06.000000000 +0100 3--- config.h.in.orig 2008-01-08 17:41:44.000000000 +0100
4+++ config.h.in 4+++ config.h.in
5@@ -130,6 +130,9 @@ 5@@ -53,6 +53,9 @@
6 /* Define to 1 if you have the `iswspace' function. */ 6 /* Define to 1 if you have the `iswspace' function. */
7 #undef HAVE_ISWSPACE 7 #undef HAVE_ISWSPACE
8  8
9+/* Define if you have the btowc function. */ 9+/* Define if you have the btowc function. */
10+#undef HAVE_BTOWC 10+#undef HAVE_BTOWC
11+ 11+
12 /* Define if you have Kerberos installed */ 12 /* Define if you have Kerberos installed */
13 #undef HAVE_KERBEROS 13 #undef HAVE_KERBEROS
14  14
cvs diff -r1.2 -r1.3 pkgsrc/databases/gq/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/databases/gq/patches/Attic/patch-ab 2004/01/21 16:26:37 1.2
+++ pkgsrc/databases/gq/patches/Attic/patch-ab 2008/01/10 21:42:51 1.3
@@ -1,31 +1,22 @@ @@ -1,31 +1,22 @@
1$NetBSD: patch-ab,v 1.2 2004/01/21 16:26:37 cube Exp $ 1$NetBSD: patch-ab,v 1.3 2008/01/10 21:42:51 adam Exp $
2 2
3--- configure.orig 2003-11-04 00:04:50.000000000 +0100 3--- configure.orig 2008-01-08 17:41:30.000000000 +0100
4+++ configure 4+++ configure
5@@ -5330,7 +5330,7 @@ fi 5@@ -6240,7 +6240,7 @@ fi
6 for ac_func in ldap_str2objectclass ldap_memfree ldap_rename ldap_str2dn \ 6 for ac_func in ldap_str2objectclass ldap_memfree ldap_rename ldap_str2dn \
7 ldap_initialize \ 7 ldap_initialize \
8 iswspace snprintf \ 8 iswspace snprintf \
9- g_snprintf 9- g_snprintf
10+ g_snprintf btowc 10+ g_snprintf btowc
11 do 11 do
12 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 12 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
13 echo "$as_me:$LINENO: checking for $ac_func" >&5 13 { echo "$as_me:$LINENO: checking for $ac_func" >&5
14@@ -6702,7 +6702,7 @@ _ACEOF 14@@ -7629,7 +7629,7 @@ echo "${ECHO_T}no" >&6; }
15 fi; 
16  15
17 if test "x$GCC" = "xyes"; then 16 # a backup of the working CFLAGS
18- for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith -Wfloat-equal 17 WARN_CFLAGS=""
19+ for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith 18-for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith -Wfloat-equal
20 do 19+for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith
21 # The following should work as well, but might (?) be less portable 20 do
22 # if ! echo "$CFLAGS" | grep -q -w -- "$A" ; then 21 if test -z "`echo "$CFLAGS" | grep -w -- "$A" 2> /dev/null`" ; then
23@@ -10451,7 +10451,7 @@ echo "${ECHO_T}`eval echo '${'gq_cv_${PR 22 gq_cv_compiler_supports_flag "$A"
24  
25 if test "$gq_cv_snprintf_reordering" = no ; then 
26  
27- if test "gq_cv_g_snprintf_reordering" == "yes" ; then 
28+ if test "gq_cv_g_snprintf_reordering" = "yes" ; then 
29 gq_cv_snprintf_reordering=yes 
30  
31 cat >>confdefs.h <<\_ACEOF 
cvs diff -r1.1 -r1.2 pkgsrc/databases/gq/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/databases/gq/patches/Attic/patch-ac 2003/09/09 18:51:44 1.1
+++ pkgsrc/databases/gq/patches/Attic/patch-ac 2008/01/10 21:42:51 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ac,v 1.1 2003/09/09 18:51:44 jmmv Exp $ 1$NetBSD: patch-ac,v 1.2 2008/01/10 21:42:51 adam Exp $
2 2
3--- src/filter.c.orig 2002-06-18 22:17:53.000000000 +0200 3--- src/filter.c.orig 2007-05-14 18:26:50.000000000 +0200
4+++ src/filter.c 4+++ src/filter.c
5@@ -941,11 +941,11 @@ char *unindent_filter(char *indented) 5@@ -1036,11 +1036,11 @@ static char *unindent_filter(char *inden
6 break; 6 break;
7 default: 7 default:
8 /* caught spaces before -- this is testing for \n etc */ 8 /* caught spaces before -- this is testing for \n etc */
9-#if defined(HAVE_ISWSPACE) 9-#if defined(HAVE_ISWSPACE)
10+#if defined(HAVE_ISWSPACE) && defined(HAVE_BTOWC) 10+#if defined(HAVE_ISWSPACE) && defined(HAVE_BTOWC)
11 if(!iswspace(btowc(c))) 11 if(!iswspace(btowc(c)))
12 #else 12 #else
13 if(!isspace(c)) 13 if(!isspace(c))
14-#endif /* HAVE_ISWSPACE */ 14-#endif /* HAVE_ISWSPACE */
15+#endif /* HAVE_ISWSPACE && HAVE_BTOWC */ 15+#endif /* HAVE_ISWSPACE && HAVE_BTOWC */
16 unindented[f++] = c; 16 unindented[f++] = c;
17 break; 17 break;
18 } 18 }
cvs diff -r1.1 -r1.2 pkgsrc/databases/gq/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/databases/gq/patches/Attic/patch-ad 2004/01/21 16:26:37 1.1
+++ pkgsrc/databases/gq/patches/Attic/patch-ad 2008/01/10 21:42:51 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ad,v 1.1 2004/01/21 16:26:37 cube Exp $ 1$NetBSD: patch-ad,v 1.2 2008/01/10 21:42:51 adam Exp $
2 2
3--- src/dt_password.c.orig 2003-11-03 22:07:57.000000000 +0100 3--- src/dt_password.c.orig 2007-05-14 18:26:51.000000000 +0200
4+++ src/dt_password.c 4+++ src/dt_password.c
5@@ -45,6 +45,15 @@ 5@@ -48,6 +48,15 @@
6 #include <openssl/md5.h> 6 #include <openssl/md5.h>
7 #include <openssl/md4.h> 7 #include <openssl/md4.h>
8 #include <openssl/sha.h> 8 #include <openssl/sha.h>
9+#include <openssl/opensslv.h> 9+#include <openssl/opensslv.h>
10+#if OPENSSL_VERSION_NUMBER >= 0x00907000L 10+#if OPENSSL_VERSION_NUMBER >= 0x00907000L
11+# define des_fcrypt DES_fcrypt 11+# define des_fcrypt DES_fcrypt
12+# define des_cblock DES_cblock 12+# define des_cblock DES_cblock
13+# define des_set_odd_parity DES_set_odd_parity 13+# define des_set_odd_parity DES_set_odd_parity
14+# define des_set_key_unchecked(key,schedule) DES_set_key_unchecked(key, &(schedule)) 14+# define des_set_key_unchecked(key,schedule) DES_set_key_unchecked(key, &(schedule))
15+# define des_ecb_encrypt(input, output, ks, enc) DES_ecb_encrypt(input, output, &(schedule), enc) 15+# define des_ecb_encrypt(input, output, ks, enc) DES_ecb_encrypt(input, output, &(schedule), enc)
16+# define des_key_schedule DES_key_schedule 16+# define des_key_schedule DES_key_schedule
17+#endif 17+#endif
18 #endif /* defined(HAVE_LIBCRYPTO) */ 18 #endif /* defined(HAVE_LIBCRYPTO) */
cvs diff -r1.1 -r1.2 pkgsrc/databases/gq/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/databases/gq/patches/Attic/patch-an 2006/07/17 08:46:29 1.1
+++ pkgsrc/databases/gq/patches/Attic/patch-an 2008/01/10 21:42:54 1.2
@@ -1,12 +1,15 @@ @@ -1,12 +1,15 @@
1$NetBSD: patch-an,v 1.1 2006/07/17 08:46:29 seb Exp $ 1$NetBSD: patch-an,v 1.2 2008/01/10 21:42:54 adam Exp $
2 2
3--- src/gq.c.orig 2003-11-03 21:25:53.000000000 +0000 3--- src/gq.c.orig 2008-01-10 22:31:56.000000000 +0100
4+++ src/gq.c 4+++ src/gq.c
5@@ -40,6 +40,7 @@ 5@@ -32,6 +32,10 @@
6 #include "gq.h" 6 # include <config.h>
7 #include "i18n.h" 7 #endif /* HAVE_CONFIG_H */
8 #include "mainwin.h" 8
9+#include "util.h" 9+#ifdef HAVE_LOCALE_H
10 #include "configfile.h" 10+# include <locale.h>
11 #include "syntax.h" 11+#endif /* HAVE_LOCALE_H */
12 #include "encode.h" 12+
 13 #ifdef DEBUG
 14 # include "debug.h"
 15 # ifdef HAVE_MCHECK
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-ae
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-af
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-ag
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-ah
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-ai
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-aj
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-ak
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-al
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-am
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-ao
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-ap
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-aq
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-ar
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-as
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-at
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-au
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-av
File Deleted: pkgsrc/databases/gq/patches/Attic/patch-aw