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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   05-Apr-2006 19:25:46
  Branch: HEAD                             Handle: 2006040518254500

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

  Log:
    upgrading package: gq 1.0b1 -> 1.0b2

  Summary:
    Revision    Changes     Path
    1.2         +6  -51     openpkg-src/gq/gq.patch
    1.12        +3  -3      openpkg-src/gq/gq.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/gq/gq.patch
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 gq.patch
  --- openpkg-src/gq/gq.patch   30 Jan 2006 19:05:09 -0000      1.1
  +++ openpkg-src/gq/gq.patch   5 Apr 2006 17:25:45 -0000       1.2
  @@ -1,30 +1,6 @@
  -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
  +--- src/state.c.orig 2006-04-05 02:53:55 +0200
  ++++ src/state.c      2006-04-05 19:14:43 +0200
   @@ -754,7 +754,7 @@
        }
        }
  @@ -34,30 +10,9 @@
        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
  +--- src/xmlparse.c.orig      2006-04-05 02:49:19 +0200
  ++++ src/xmlparse.c   2006-04-05 19:23:16 +0200
   @@ -51,7 +51,7 @@
    #include "xmlparse.h"
    
  @@ -74,9 +29,9 @@
   -    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;
  ++    e->attrs[i] = NULL;
        }
        
        /* lookup handler */
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/gq/gq.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 gq.spec
  --- openpkg-src/gq/gq.spec    30 Jan 2006 19:05:09 -0000      1.11
  +++ openpkg-src/gq/gq.spec    5 Apr 2006 17:25:45 -0000       1.12
  @@ -23,8 +23,8 @@
   ##
   
   #   package version
  -%define       V_dist  1.0beta1
  -%define       V_opkg  1.0b1
  +%define       V_dist  1.0beta2
  +%define       V_opkg  1.0b2
   
   #   package information
   Name:         gq
  @@ -37,7 +37,7 @@
   Group:        Database
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20060130
  +Release:      20060405
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/sourceforge/gqclient/gq-%{V_dist}.tar.gz
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to