[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/gq/ gq.patch gq.spec
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2006-01-30 19:05:11
Message-ID: 20060130190511.31CD81B5049 () master ! openpkg ! org
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src                      Date:   30-Jan-2006 20:05:10
  Branch: HEAD                             Handle: 2006013019050900

  Added files:
    openpkg-src/gq          gq.patch
  Modified files:
    openpkg-src/gq          gq.spec

  Log:
    fix building and apply a bunch of additional fixes from the FreeBSD
    ports tree

  Summary:
    Revision    Changes     Path
    1.1         +82 -0      openpkg-src/gq/gq.patch
    1.11        +3  -1      openpkg-src/gq/gq.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/gq/gq.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 gq.patch
  --- /dev/null	2006-01-30 20:05:09 +0100
  +++ gq.patch	2006-01-30 20:05:09 +0100
  @@ -0,0 +1,82 @@
  +Index: src/configfile.h
  +--- src/configfile.h.orig	2003-11-03 22:34:52 +0100
  ++++ src/configfile.h	2006-01-30 20:02:32 +0100
  +@@ -31,6 +31,7 @@
  + #include <glib.h>
  + 
  + #include "common.h"
  ++#include "util.h"
  + 
  + #define CURRENT_CONFIG_VERSION	3
  + 
  +@@ -220,9 +221,9 @@
  + extern struct gq_config *config;
  + extern GList *transient_servers;
  + 
  +-extern const struct tokenlist token_bindtype[];
  +-extern const struct tokenlist token_ldifformat[];
  +-extern const struct tokenlist token_searchargument[];
  ++extern const struct tokenlist token_bindtype[4];
  ++extern const struct tokenlist token_ldifformat[3];
  ++extern const struct tokenlist token_searchargument[5];
  + 
  + #endif
  + 
  +Index: src/state.c
  +--- src/state.c.orig	2003-11-03 22:19:54 +0100
  ++++ src/state.c	2006-01-30 20:00:09 +0100
  +@@ -754,7 +754,7 @@
  + 	}
  +     }
  + 
  +-    if (n != NULL && v->type != 0) {
  ++    if (n != NULL && v!=NULL && v->type != 0) {
  + 	char *ep;
  + 
  + 	assert(v);
  +Index: src/util.c
  +--- src/util.c.orig	2003-11-03 23:28:24 +0100
  ++++ src/util.c	2006-01-30 20:00:09 +0100
  +@@ -1909,7 +1909,7 @@
  + char **gq_ldap_explode_dn(const char *dn, int dummy)
  + {
  +      int i, rc;
  +-     LDAPDN *parts;
  ++     LDAPDN parts;
  +      char **v = 0; 
  +      
  +      rc = ldap_str2dn(dn, &parts, LDAP_DN_FORMAT_LDAPV3);
  +@@ -1921,7 +1921,7 @@
  +      v = (char **) calloc((i + 2), sizeof(char*));
  + 
  +      for( i = 0 ; parts[i] ; i++ ) {
  +-	  ldap_rdn2str(parts[0][i], &v[i],
  ++	  ldap_rdn2str(parts[i], &v[i],
  + 		       LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
  +      } 
  +      return v;
  +Index: src/xmlparse.c
  +--- src/xmlparse.c.orig	2003-11-03 22:05:18 +0100
  ++++ src/xmlparse.c	2006-01-30 20:00:09 +0100
  +@@ -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 @@
  +     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 */
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/gq/gq.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 gq.spec
  --- openpkg-src/gq/gq.spec	1 Jan 2006 13:14:15 -0000	1.10
  +++ openpkg-src/gq/gq.spec	30 Jan 2006 19:05:09 -0000	1.11
  @@ -37,10 +37,11 @@
   Group:        Database
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20041228
  +Release:      20060130
   
   #   list of sources
   Source0:      http://osdn.dl.sourceforge.net/sourceforge/gqclient/gq-%{V_dist}.tar.gz
  +Patch0:       gq.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -65,6 +66,7 @@
   
   %prep
       %setup -q -n gq-%{V_dist}
  +    %patch -p0
   
   %build
       CC="%{l_cc}" \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

[prev in list] [next in list] [prev in thread] [next in thread]