Re: gq problems

[Waldemar Brodkorb <wbx_(_at_)_openbsd-geek_(_dot_)_de>]

Hi again,
Waldemar Brodkorb wrote,

> Hi,
> 
> I have some segfaults with gq from ports. It has worked before the
> switch to gcc3.3 on OpenBSD/i386.

gcc 3.3 seems not related. OpenLDAP update in ports is the reason.
 
> Now I try to use it on two different OpenBSD-current systems with
> gcc3.3 an only get segfaults, while trying to browse through a tree.
> 
> Anyone else have problems with gq from ports?
> 
> I even tried an unofficial update to gq 1.xx from IIRC Marc Balmer.

Seems I used something old (or does it was released after my mail?):
http://ftp.etc.msys.ch/pub/ports/databases/gq/gq.tgz

fixed it for me after adding some small patches to get it build.

I can't update preferences, but this is another bug...

thx Marc,

    Waldemar

-- 
blog your mind!
http://openbsd-geek.de/

--- 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))
 		{

--- configure.in.orig	Mon Nov  3 23:56:14 2003
+++ configure.in	Tue Feb 15 03:58:15 2005
@@ -340,7 +340,7 @@ AC_CHECK_FUNCS(ldap_str2objectclass ldap
 AC_ARG_WITH(kerberos-prefix,
 	    [  --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,
 
 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

$OpenBSD$
--- 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);

$OpenBSD$
--- 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 */