head 1.4; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.4.2.2 OPENPKG_E1_FP:1.4.2.2 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.4.2.2 OPENPKG_2_STABLE:1.4.0.2; locks; strict; comment @# @; 1.4 date 2006.09.19.07.30.36; author rse; state Exp; branches 1.4.2.1; next 1.3; commitid yLySKzuCFfcNrpNr; 1.3 date 2006.08.27.10.24.34; author rse; state Exp; branches; next 1.2; commitid uDvf8Dl8VZxj9tKr; 1.2 date 2006.04.05.17.25.45; author rse; state Exp; branches; next 1.1; commitid kH3vwcqLIwyM60sr; 1.1 date 2006.01.30.19.05.09; author rse; state Exp; branches; next ; commitid uSYtD0YZwkwpKEjr; 1.4.2.1 date 2006.09.19.07.30.36; author rse; state dead; branches; next 1.4.2.2; commitid iZxwRSmmWscPXUQr; 1.4.2.2 date 2006.10.16.14.50.43; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.4 log @upgrading package: gq 1.1.0 -> 1.1.3 @ text @Index: configure --- configure.orig 2006-09-18 16:37:20 +0200 +++ configure 2006-09-19 09:26:06 +0200 @@@@ -4208,7 +4208,7 @@@@ case "$with_keyring_api" in "gnome") - gnome_keyring="gnome-keyring-1 >= 0.4.4" + gnome_keyring="" ;; "apple") gnome_keyring="" Index: src/gq-keyring.c --- src/gq-keyring.c.orig 2006-09-15 12:20:26 +0200 +++ src/gq-keyring.c 2006-09-19 09:27:25 +0200 @@@@ -27,6 +27,7 @@@@ gq_keyring_attribute_list_from_server(GqServer* server) { GnomeKeyringAttributeList* attributes = NULL; +#if 0 g_return_val_if_fail(GQ_IS_SERVER(server), NULL); attributes = gnome_keyring_attribute_list_new(); @@@@ -34,20 +35,25 @@@@ gnome_keyring_attribute_list_append_string(attributes, "server", server->ldaphost); gnome_keyring_attribute_list_append_uint32(attributes, "port", server->ldapport); gnome_keyring_attribute_list_append_string(attributes, "protocol", "ldap"); +#endif return attributes; } static GList* gq_keyring_find_servers(GqServer* server) { +#if 0 GnomeKeyringAttributeList* list = NULL; +#endif GList* found = NULL; +#if 0 list = gq_keyring_attribute_list_from_server(server); // FIXME: do async // FIXME: check result gnome_keyring_find_items_sync(GNOME_KEYRING_ITEM_NETWORK_PASSWORD, list, &found); gnome_keyring_attribute_list_free(list); list = NULL; +#endif return found; } @@@@ -59,6 +65,7 @@@@ g_return_if_fail(GQ_IS_SERVER(server)); +#if 0 if(!gnome_keyring_is_available()) { return; } @@@@ -72,15 +79,19 @@@@ } g_list_free(ret); +#endif } gchar* gq_keyring_get_password(GqServer* server) { GList* found = NULL; GList* item; +#if 0 GnomeKeyringAttributeList* list = NULL; +#endif gchar* retval = NULL; +#if 0 if(!gnome_keyring_is_available()) { return NULL; } @@@@ -97,11 +108,13 @@@@ g_list_foreach(found, (GFunc)gnome_keyring_found_free, NULL); g_list_free(found); +#endif return retval; } void gq_keyring_save_server_password(GqServer* server) { +#if 0 GnomeKeyringAttributeList* list = NULL; gchar* display_name = NULL; guint32 id = 0; @@@@ -125,5 +138,6 @@@@ &id); gnome_keyring_attribute_list_free(list); g_free(display_name); +#endif } Index: src/gq-keyring.h --- src/gq-keyring.h.orig 2006-09-15 12:20:26 +0200 +++ src/gq-keyring.h 2006-09-19 09:26:06 +0200 @@@@ -24,7 +24,11 @@@@ #ifndef GQ_KEYRING_H #define GQ_KEYRING_H +#if 0 #include +#else +typedef int GnomeKeyringAttributeList; +#endif #include "common.h" // for ldapserver G_BEGIN_DECLS @@@@ -35,6 +39,9 @@@@ gchar* gq_keyring_get_password (GqServer* server); void gq_keyring_save_server_password (GqServer* server); +#define gnome_keyring_is_available() 0 +#define gnome_keyring_free_password(n) (void)0 + G_END_DECLS #endif /* !GQ_KEYRING_H */ Index: src/state.c --- src/state.c.orig 2006-09-15 12:20:28 +0200 +++ src/state.c 2006-09-19 09:26:06 +0200 @@@@ -744,7 +744,7 @@@@ } } - if (n != NULL && v->type != 0) { + if (n != NULL && v!=NULL && v->type != 0) { char *ep; g_assert(v); Index: src/xmlparse.c --- src/xmlparse.c.orig 2006-09-15 12:20:26 +0200 +++ src/xmlparse.c 2006-09-19 09:26:06 +0200 @@@@ -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] = (guchar*)strdup((gchar*)attrs[i]); } + e->attrs[i] = NULL; } /* lookup handler */ @ 1.4.2.1 log @file gq.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:50:43 +0000 @ text @d1 160 @ 1.4.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 160 Index: configure --- configure.orig 2006-09-18 16:37:20 +0200 +++ configure 2006-09-19 09:26:06 +0200 @@@@ -4208,7 +4208,7 @@@@ case "$with_keyring_api" in "gnome") - gnome_keyring="gnome-keyring-1 >= 0.4.4" + gnome_keyring="" ;; "apple") gnome_keyring="" Index: src/gq-keyring.c --- src/gq-keyring.c.orig 2006-09-15 12:20:26 +0200 +++ src/gq-keyring.c 2006-09-19 09:27:25 +0200 @@@@ -27,6 +27,7 @@@@ gq_keyring_attribute_list_from_server(GqServer* server) { GnomeKeyringAttributeList* attributes = NULL; +#if 0 g_return_val_if_fail(GQ_IS_SERVER(server), NULL); attributes = gnome_keyring_attribute_list_new(); @@@@ -34,20 +35,25 @@@@ gnome_keyring_attribute_list_append_string(attributes, "server", server->ldaphost); gnome_keyring_attribute_list_append_uint32(attributes, "port", server->ldapport); gnome_keyring_attribute_list_append_string(attributes, "protocol", "ldap"); +#endif return attributes; } static GList* gq_keyring_find_servers(GqServer* server) { +#if 0 GnomeKeyringAttributeList* list = NULL; +#endif GList* found = NULL; +#if 0 list = gq_keyring_attribute_list_from_server(server); // FIXME: do async // FIXME: check result gnome_keyring_find_items_sync(GNOME_KEYRING_ITEM_NETWORK_PASSWORD, list, &found); gnome_keyring_attribute_list_free(list); list = NULL; +#endif return found; } @@@@ -59,6 +65,7 @@@@ g_return_if_fail(GQ_IS_SERVER(server)); +#if 0 if(!gnome_keyring_is_available()) { return; } @@@@ -72,15 +79,19 @@@@ } g_list_free(ret); +#endif } gchar* gq_keyring_get_password(GqServer* server) { GList* found = NULL; GList* item; +#if 0 GnomeKeyringAttributeList* list = NULL; +#endif gchar* retval = NULL; +#if 0 if(!gnome_keyring_is_available()) { return NULL; } @@@@ -97,11 +108,13 @@@@ g_list_foreach(found, (GFunc)gnome_keyring_found_free, NULL); g_list_free(found); +#endif return retval; } void gq_keyring_save_server_password(GqServer* server) { +#if 0 GnomeKeyringAttributeList* list = NULL; gchar* display_name = NULL; guint32 id = 0; @@@@ -125,5 +138,6 @@@@ &id); gnome_keyring_attribute_list_free(list); g_free(display_name); +#endif } Index: src/gq-keyring.h --- src/gq-keyring.h.orig 2006-09-15 12:20:26 +0200 +++ src/gq-keyring.h 2006-09-19 09:26:06 +0200 @@@@ -24,7 +24,11 @@@@ #ifndef GQ_KEYRING_H #define GQ_KEYRING_H +#if 0 #include +#else +typedef int GnomeKeyringAttributeList; +#endif #include "common.h" // for ldapserver G_BEGIN_DECLS @@@@ -35,6 +39,9 @@@@ gchar* gq_keyring_get_password (GqServer* server); void gq_keyring_save_server_password (GqServer* server); +#define gnome_keyring_is_available() 0 +#define gnome_keyring_free_password(n) (void)0 + G_END_DECLS #endif /* !GQ_KEYRING_H */ Index: src/state.c --- src/state.c.orig 2006-09-15 12:20:28 +0200 +++ src/state.c 2006-09-19 09:26:06 +0200 @@@@ -744,7 +744,7 @@@@ } } - if (n != NULL && v->type != 0) { + if (n != NULL && v!=NULL && v->type != 0) { char *ep; g_assert(v); Index: src/xmlparse.c --- src/xmlparse.c.orig 2006-09-15 12:20:26 +0200 +++ src/xmlparse.c 2006-09-19 09:26:06 +0200 @@@@ -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] = (guchar*)strdup((gchar*)attrs[i]); } + e->attrs[i] = NULL; } /* lookup handler */ @ 1.3 log @upgrading package: gq 1.0.0 -> 1.1.0 @ text @d2 11 a12 74 --- configure.orig 2006-08-04 16:32:02 +0200 +++ configure 2006-08-27 12:18:46 +0200 @@@@ -4279,12 +4279,10 @@@@ if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 - gnome-keyring-1 libglade-2.0 libxml-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 - gnome-keyring-1 libglade-2.0 libxml-2.0") 2>&5 ac_status=$? @@@@ -4292,7 +4290,6 @@@@ (exit $ac_status); }; then pkg_cv_GQ_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 - gnome-keyring-1 libglade-2.0 libxml-2.0" 2>/dev/null` else @@@@ -4309,12 +4306,10 @@@@ if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 - gnome-keyring-1 libglade-2.0 libxml-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 - gnome-keyring-1 libglade-2.0 libxml-2.0") 2>&5 ac_status=$? @@@@ -4322,7 +4317,6 @@@@ (exit $ac_status); }; then pkg_cv_GQ_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 - gnome-keyring-1 libglade-2.0 libxml-2.0" 2>/dev/null` else @@@@ -4345,13 +4339,11 @@@@ if test $_pkg_short_errors_supported = yes; then GQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 - gnome-keyring-1 libglade-2.0 libxml-2.0"` else GQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 - gnome-keyring-1 libglade-2.0 libxml-2.0"` fi @@@@ -4360,7 +4352,6 @@@@ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 - gnome-keyring-1 libglade-2.0 libxml-2.0) were not met: @@@@ -4375,7 +4366,6 @@@@ " >&5 echo "$as_me: error: Package requirements (glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 - gnome-keyring-1 libglade-2.0 libxml-2.0) were not met: d14 2 a15 2 --- src/gq-keyring.c.orig 2006-08-04 14:34:22 +0200 +++ src/gq-keyring.c 2006-08-27 12:18:46 +0200 d17 1 a17 1 gq_keyring_attribute_list_from_server(struct ldapserver* server) { d24 1 a24 1 @@@@ -34,14 +35,18 @@@@ d33 1 a33 1 gq_keyring_find_servers(struct ldapserver* server) { d43 1 a43 1 @@@@ -49,11 +54,13 @@@@ d46 1 a47 1 +#endif d50 3 a53 2 void gq_keyring_forget_password(struct ldapserver* server) { d55 3 a57 3 GList* ret = NULL, * item; d66 1 a66 2 gq_keyring_get_password(struct ldapserver* server) { +#if 0 d69 1 d87 1 a87 1 gq_keyring_save_server_password(struct ldapserver* server) { d100 3 a102 3 --- src/gq-keyring.h.orig 2006-05-19 18:00:27 +0200 +++ src/gq-keyring.h 2006-08-27 12:21:08 +0200 @@@@ -24,17 +24,25 @@@@ d114 3 a116 7 + GnomeKeyringAttributeList* gq_keyring_attribute_list_from_server(struct ldapserver* server); void gq_keyring_forget_password (struct ldapserver* server); gchar* gq_keyring_get_password (struct ldapserver* server); void gq_keyring_save_server_password (struct ldapserver* server); d120 1 a120 1 + d125 2 a126 2 --- src/state.c.orig 2006-05-23 19:14:47 +0200 +++ src/state.c 2006-08-27 12:18:46 +0200 d135 1 a135 1 assert(v); d137 2 a138 2 --- src/xmlparse.c.orig 2006-05-23 18:16:42 +0200 +++ src/xmlparse.c 2006-08-27 12:18:46 +0200 @ 1.2 log @upgrading package: gq 1.0b1 -> 1.0b2 @ text @d1 189 d191 3 a193 3 --- 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 @@@@ d203 2 a204 2 --- src/xmlparse.c.orig 2006-04-05 02:49:19 +0200 +++ src/xmlparse.c 2006-04-05 19:23:16 +0200 @ 1.1 log @fix building and apply a bunch of additional fixes from the FreeBSD ports tree @ text @a0 24 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 #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 d2 2 a3 2 --- src/state.c.orig 2003-11-03 22:19:54 +0100 +++ src/state.c 2006-01-30 20:00:09 +0100 a12 21 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; d14 2 a15 2 --- src/xmlparse.c.orig 2003-11-03 22:05:18 +0100 +++ src/xmlparse.c 2006-01-30 20:00:09 +0100 d32 1 a32 1 e->attrs[i] = strdup(attrs[i]); d34 1 a34 1 + e->attrs[i] = NULL; @