Hey!
Attached is an update to gq-1.2.1. Since I'm currently at p2k6, I'm not
able to test it with a real ldap server. It would be nice if someone
could do that. Thanks!
Tested on i386 so far.
Bernd
Index: Makefile
===================================================================
RCS file: /home/OpenBSD/cvs/ports/databases/gq/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 18 Sep 2006 11:40:07 -0000 1.20
+++ Makefile 19 Oct 2006 09:56:53 -0000
@@ -2,11 +2,10 @@
COMMENT= "GTK-based LDAP client"
-DISTNAME= gq-1.0beta1
-PKGNAME= ${DISTNAME}p4
+DISTNAME= gq-1.2.1
CATEGORIES= databases
-HOMEPAGE= http://biot.com/gq/
+HOMEPAGE= http://gq-project.org/
MAINTAINER= Marc Balmer <[EMAIL PROTECTED]>
@@ -18,22 +17,29 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqclient/}
-WANTLIB= X11 c crypto fontconfig freetype m z ssl \
- atk-1.0 glib-2.0 \
- gmodule-2.0 gobject-2.0 krb5 pango-1.0 \
- pangocairo-1.0 pangoft2-1.0 sasl2 cairo
+WANTLIB= X11 c fontconfig freetype m z ssl \
+ atk-1.0 glib-2.0 gmodule-2.0 gobject-2.0 krb5 pango-1.0 \
+ pangocairo-1.0 pangoft2-1.0 sasl2 cairo gpg-error
MODULES= devel/gettext
-BUILD_DEPENDS= :cyrus-sasl-*:security/cyrus-sasl2
+BUILD_DEPENDS= ::textproc/p5-XML-Parser \
+ ::devel/pkgconfig
LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
ldap.>=7,lber.>=7::databases/openldap \
- xml2::textproc/libxml
+ xml2::textproc/libxml \
+ gnome-keyring.>=0::x11/gnome/keyring \
+ gcrypt.>=12::security/libgcrypt \
+ glade-2.0::devel/libglade2
+
+USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.57
+AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} \
--with-sasl-prefix=${LOCALBASE} \
- --with-kerberos-prefix=/usr
+ --with-kerberos-prefix=/usr \
+ --disable-debugging \
+ --disable-update-mimedb
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/OpenBSD/cvs/ports/databases/gq/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 28 Feb 2005 13:30:07 -0000 1.5
+++ distinfo 19 Oct 2006 08:30:06 -0000
@@ -1,4 +1,4 @@
-MD5 (gq-1.0beta1.tar.gz) = c904ff52f513a58516d9543f8dc3fe5b
-RMD160 (gq-1.0beta1.tar.gz) = 6d757f39d2543a41f4c99b5aa39890de726e4d9c
-SHA1 (gq-1.0beta1.tar.gz) = fcfeb2874326962e891433d54df7932840fab6ff
-SIZE (gq-1.0beta1.tar.gz) = 475081
+MD5 (gq-1.2.1.tar.gz) = e56613c81e70727c20ffe9974cdc6df0
+RMD160 (gq-1.2.1.tar.gz) = 4f6c549c3841ed23d3e69cad84175fb61cb6e32d
+SHA1 (gq-1.2.1.tar.gz) = 96f9e93b43156903fa6872f46bc96a0d644c4029
+SIZE (gq-1.2.1.tar.gz) = 395701
Index: patches/patch-configure_in
===================================================================
RCS file: /home/OpenBSD/cvs/ports/databases/gq/patches/patch-configure_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_in
--- patches/patch-configure_in 12 Nov 2005 10:39:08 -0000 1.3
+++ patches/patch-configure_in 19 Oct 2006 08:35:35 -0000
@@ -1,6 +1,6 @@
---- configure.in.orig Mon Nov 3 23:56:14 2003
-+++ configure.in Sat Nov 12 11:30:15 2005
-@@ -278,9 +278,9 @@ AC_CHECK_LIB(lber, ber_alloc,
+--- configure.in.orig Thu Oct 19 10:33:07 2006
++++ configure.in Thu Oct 19 10:34:12 2006
+@@ -144,9 +144,9 @@ AC_CHECK_LIB(lber, ber_alloc,
)
AC_CHECK_LIB(ldap, ldap_simple_bind,
@@ -12,21 +12,21 @@
)
AC_CACHE_CHECK([OpenLDAP version], gq_cv_OpenLDAP_version,
-@@ -340,7 +340,7 @@ AC_CHECK_FUNCS(ldap_str2objectclass ldap
+@@ -244,7 +244,7 @@ AC_CHECK_FUNCS(ldap_str2objectclass ldap
AC_ARG_WITH(kerberos-prefix,
- [ --with-kerberos-prefix=PFX Prefix where Kerberos is installed],
+ AC_HELP_STRING([--with-kerberos-prefix=PFX], [Prefix where Kerberos
is installed]),
[
- LIBS="-L$with_kerberos_prefix/lib -lkrb5 -ldes425 $LIBS"
+ LIBS="-L$with_kerberos_prefix/lib -lkrb5 $LIBS"
AC_DEFINE(HAVE_KERBEROS,1,[Define if you have Kerberos installed])
HAVE_KERBEROS=1
]
-@@ -491,7 +491,7 @@ AC_ARG_ENABLE(browser-dnd,
+@@ -375,7 +375,7 @@ gq_cv_compiler_supports_flag() {
- dnl Only use -Wall if we have gcc
- 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
+ # 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"
Index: patches/patch-intl_dcigettext_c
===================================================================
RCS file: patches/patch-intl_dcigettext_c
diff -N patches/patch-intl_dcigettext_c
--- patches/patch-intl_dcigettext_c 28 Feb 2005 13:30:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
---- intl/dcigettext.c.orig Sat May 4 18:10:13 2002
-+++ intl/dcigettext.c Tue Feb 15 03:50:16 2005
-@@ -57,11 +57,6 @@ extern int errno;
- #include <stdlib.h>
-
- #include <string.h>
--#if !HAVE_STRCHR && !defined _LIBC
--# ifndef strchr
--# define strchr index
--# endif
--#endif
-
- #if defined HAVE_UNISTD_H || defined _LIBC
- # include <unistd.h>
-@@ -868,7 +863,7 @@ _nl_find_msg (domain_file, domainbinding
-
- outleft = freemem_size - sizeof (size_t);
- if (iconv (domain->conv,
-- (ICONV_CONST char **) &inptr, &inleft,
-+ (const char **) &inptr, &inleft,
- &outptr, &outleft)
- != (size_t) (-1))
- {
Index: patches/patch-src_dt_password_c
===================================================================
RCS file: patches/patch-src_dt_password_c
diff -N patches/patch-src_dt_password_c
--- patches/patch-src_dt_password_c 28 Feb 2005 13:30:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_dt_password_c,v 1.1 2005/02/28 13:30:07 mbalmer Exp $
---- src/dt_password.c.orig Mon Nov 3 22:07:57 2003
-+++ src/dt_password.c Tue Feb 15 03:54:03 2005
-@@ -268,14 +268,14 @@ static GByteArray *dt_password_encode_pa
- MD4_CTX MD4context;
-
- #if defined(HAVE_ICONV)
-- ICONV_CONST char *in;
-+ const char *in;
- char *out;
- size_t inlen, outlen;
- iconv_t conv;
-
- conv = iconv_open("UNICODE", gq_codeset);
- if (conv != (iconv_t) -1) {
-- in = (ICONV_CONST char *) data;
-+ in = (const char *) data;
- inlen = len;
- outlen = len * 2 + 4;
- g_byte_array_set_size(unicode, outlen);
Index: patches/patch-src_encode_c
===================================================================
RCS file: patches/patch-src_encode_c
diff -N patches/patch-src_encode_c
--- patches/patch-src_encode_c 28 Feb 2005 13:30:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$OpenBSD: patch-src_encode_c,v 1.1 2005/02/28 13:30:07 mbalmer Exp $
---- src/encode.c.orig Wed Oct 8 23:21:16 2003
-+++ src/encode.c Tue Feb 15 03:51:19 2005
-@@ -53,14 +53,14 @@ const char *decode_string(char *native_s
- size_t len)
- {
- #if defined(HAVE_ICONV)
-- ICONV_CONST char *in;
-+ const char *in;
- char *out;
- size_t outlen;
- iconv_t conv;
-
- conv = iconv_open(gq_codeset, LDAP_CODESET);
- if (conv != (iconv_t) -1) {
-- in = (ICONV_CONST char *) ldap_string;
-+ in = (const char *) ldap_string;
- out = native_string;
- /* len = strlen(in); */
- outlen = len;
-@@ -94,12 +94,12 @@ const gchar *encode_string(gchar *ldap_s
- size_t len)
- {
- #if defined(HAVE_ICONV)
-- ICONV_CONST char *in;
-+ const char *in;
- char *out;
- size_t outlen;
- iconv_t conv;
-
-- in = (ICONV_CONST char *) native_string;
-+ in = (const char *) native_string;
- out = ldap_string;
- /* len = strlen(in); */
- outlen = len * 2 + 1; /* Worst case */
Index: patches/patch-src_gq-hash-openssl_c
===================================================================
RCS file: patches/patch-src_gq-hash-openssl_c
diff -N patches/patch-src_gq-hash-openssl_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gq-hash-openssl_c 19 Oct 2006 08:38:27 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/gq-hash-openssl.c.orig Thu Oct 19 10:37:48 2006
++++ src/gq-hash-openssl.c Thu Oct 19 10:37:57 2006
+@@ -180,7 +180,7 @@ gq_hash_nthash(gchar const* data, gsize
+ MD4_CTX MD4context;
+
+ #if defined(HAVE_ICONV)
+- ICONV_CONST char *in;
++ const char *in;
+ guchar *out;
+ size_t inlen, outlen;
+ iconv_t conv;
+@@ -189,7 +189,7 @@ gq_hash_nthash(gchar const* data, gsize
+ if (conv != (iconv_t) -1) {
+ gchar* outbuf;
+
+- in = (ICONV_CONST char *) data;
++ in = (const char *) data;
+ inlen = len;
+ outlen = len * 2 + 4;
+ g_byte_array_set_size(unicode, outlen);
Index: patches/patch-src_state_c
===================================================================
RCS file: /home/OpenBSD/cvs/ports/databases/gq/patches/patch-src_state_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_state_c
--- patches/patch-src_state_c 28 Feb 2005 13:30:07 -0000 1.1
+++ patches/patch-src_state_c 19 Oct 2006 08:40:53 -0000
@@ -1,6 +1,6 @@
---- src/state.c.orig Mon Nov 3 22:19:54 2003
-+++ src/state.c Sat Feb 5 06:50:26 2005
-@@ -754,7 +754,7 @@ static void state_valueE(struct parser_c
+--- src/state.c.orig Thu Oct 19 10:40:22 2006
++++ src/state.c Thu Oct 19 10:40:22 2006
+@@ -744,7 +744,7 @@ static void state_valueE(struct parser_c
}
}
@@ -8,4 +8,4 @@
+ if (n != NULL && v != NULL && v->type != 0) {
char *ep;
- assert(v);
+ g_assert(v);
Index: patches/patch-src_util_c
===================================================================
RCS file: patches/patch-src_util_c
diff -N patches/patch-src_util_c
--- patches/patch-src_util_c 12 Nov 2005 10:39:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-$OpenBSD: patch-src_util_c,v 1.2 2005/11/12 10:39:08 espie Exp $
---- src/util.c.orig Mon Nov 3 23:28:24 2003
-+++ src/util.c Sat Nov 12 04:34:27 2005
-@@ -1909,27 +1909,51 @@ GList *get_suffixes(int error_context, s
- char **gq_ldap_explode_dn(const char *dn, int dummy)
- {
- int i, rc;
-- LDAPDN *parts;
-- char **v = 0;
-+ LDAPDN parts;
-+ char **v = NULL;
-
- rc = ldap_str2dn(dn, &parts, LDAP_DN_FORMAT_LDAPV3);
-
-- if (rc != LDAP_SUCCESS || parts == NULL) return NULL;
-+ if (rc != LDAP_SUCCESS)
-+ return NULL;
-+ if (parts == NULL) {
-+ v = calloc(1, sizeof(char *));
-+ if (v == NULL)
-+ return NULL;
-+ v[0] = NULL;
-+ return v;
-+ }
-
- /* count DN elements */
- for( i = 0 ; parts[i] ; i++ ) ;
-- v = (char **) calloc((i + 2), sizeof(char*));
-
-- for( i = 0 ; parts[i] ; i++ ) {
-- ldap_rdn2str(parts[0][i], &v[i],
-+ v = calloc(i + 1, sizeof(char *));
-+ if (v == NULL) {
-+ ldap_dnfree(parts);
-+ return NULL;
-+ }
-+
-+ for(i = 0; parts[i]; i++) {
-+ ldap_rdn2str(parts[i], &v[i],
- LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
- }
-+
-+ ldap_dnfree(parts);
-+ v[i] = NULL;
-+
- return v;
- }
-
- void gq_exploded_free(char **exploded_dn)
- {
-- if (exploded_dn) free(exploded_dn);
-+ int i;
-+
-+ if (exploded_dn == NULL)
-+ return;
-+ for (i = 0; exploded_dn[i]; i++)
-+ free(exploded_dn[i]);
-+
-+ free(exploded_dn);
- }
-
- #endif
Index: patches/patch-src_xmlparse_c
===================================================================
RCS file: /home/OpenBSD/cvs/ports/databases/gq/patches/patch-src_xmlparse_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_xmlparse_c
--- patches/patch-src_xmlparse_c 28 Feb 2005 13:30:07 -0000 1.1
+++ patches/patch-src_xmlparse_c 14 Sep 2006 11:05:26 -0000
@@ -1,5 +1,5 @@
---- src/xmlparse.c.orig Mon Nov 3 22:05:18 2003
-+++ src/xmlparse.c Sat Feb 5 06:50:26 2005
+--- src/xmlparse.c.orig Thu Sep 14 13:04:26 2006
++++ src/xmlparse.c Thu Sep 14 13:04:55 2006
@@ -51,7 +51,7 @@
#include "xmlparse.h"
@@ -16,7 +16,7 @@
- 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] = (guchar*)strdup((gchar*)attrs[i]);
}
+ e->attrs[i] = NULL;
}
Index: pkg/PLIST
===================================================================
RCS file: /home/OpenBSD/cvs/ports/databases/gq/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 28 Feb 2005 13:30:07 -0000 1.7
+++ pkg/PLIST 19 Oct 2006 09:41:56 -0000
@@ -1,15 +1,18 @@
@comment $OpenBSD: PLIST,v 1.7 2005/02/28 13:30:07 mbalmer Exp $
bin/gq
-share/gnome/
-share/gnome/apps/
-share/gnome/apps/Internet/
-share/gnome/apps/Internet/gq.desktop
+share/applications/
+share/applications/gq.desktop
+share/gq/
+share/gq/gq.glade
+share/mime/
+share/mime/packages/
+share/mime/packages/gq-ldif.xml
share/pixmaps/
share/pixmaps/gq/
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
