Hello community,
here is the log from the commit of package libopensync-plugin-gpe
checked in at Thu Mar 29 22:19:21 CEST 2007.
--------
--- libopensync-plugin-gpe/libopensync-plugin-gpe.changes 2006-11-06 20:14:07.000000000 +0100
+++ /mounts/work_src_done/STABLE/libopensync-plugin-gpe/libopensync-plugin-gpe.changes 2007-03-29 20:30:31.973116000 +0200
@@ -1,0 +2,8 @@
+Thu Mar 29 16:19:47 CEST 2007 - cstender@suse.de
+
+- updated to version 0.22
+ o fixed "conv env" check by calling osync_member_set
+ o added support for running gpesyncd as a subprocess
+ o fixed confusion about uid problem
+
+-------------------------------------------------------------------
Old:
----
libopensync-plugin-gpe-0.20.tar.bz2
New:
----
libopensync-plugin-gpe-0.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libopensync-plugin-gpe.spec ++++++
--- /var/tmp/diff_new_pack.A20187/_old 2007-03-29 22:19:17.000000000 +0200
+++ /var/tmp/diff_new_pack.A20187/_new 2007-03-29 22:19:17.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package libopensync-plugin-gpe (Version 0.20)
+# spec file for package libopensync-plugin-gpe (Version 0.22)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,10 +13,10 @@
Name: libopensync-plugin-gpe
BuildRequires: libopensync-devel
URL: http://www.openync.org
-Version: 0.20
+Version: 0.22
Release: 1
Summary: GPE Synchronization Plug-In for OpenSync
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: Productivity/Other
Autoreqprov: on
Source: %{name}-%{version}.tar.bz2
@@ -62,7 +62,12 @@
%{_datadir}/opensync/defaults/gpe-sync
%doc AUTHORS COPYING INSTALL ChangeLog README BUGS
-%changelog -n libopensync-plugin-gpe
+%changelog
+* Thu Mar 29 2007 - cstender@suse.de
+- updated to version 0.22
+ o fixed "conv env" check by calling osync_member_set
+ o added support for running gpesyncd as a subprocess
+ o fixed confusion about uid problem
* Mon Nov 06 2006 - cstender@suse.de
- bumped version to 0.20
* Fri Sep 29 2006 - cstender@suse.de
++++++ libopensync-plugin-gpe-0.20.tar.bz2 -> libopensync-plugin-gpe-0.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libopensync-plugin-gpe-0.20/ChangeLog new/libopensync-plugin-gpe-0.22/ChangeLog
--- old/libopensync-plugin-gpe-0.20/ChangeLog 2006-05-19 04:30:00.000000000 +0200
+++ new/libopensync-plugin-gpe-0.22/ChangeLog 2007-02-19 01:13:36.000000000 +0100
@@ -1,3 +1,7 @@
+2007-02-18 Graham Cobb
+
+ * utils.c: In report_change call osync_change_set_member on the new change.
+
2006-05-19 Martin Felis
* ChangeLog: Changed the emailadress, hoping receiving less span
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libopensync-plugin-gpe-0.20/configure.in new/libopensync-plugin-gpe-0.22/configure.in
--- old/libopensync-plugin-gpe-0.20/configure.in 2006-11-06 18:43:24.000000000 +0100
+++ new/libopensync-plugin-gpe-0.22/configure.in 2007-03-25 18:17:30.000000000 +0200
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.58)
-AC_INIT([OpenSync Gpe Plugin], 0.20, [], [libopensync-plugin-gpe])
+AC_INIT([OpenSync Gpe Plugin], 0.22, [], [libopensync-plugin-gpe])
AM_INIT_AUTOMAKE(foreign)
AC_CONFIG_SRCDIR(src/gpe_sync.c)
AC_CONFIG_HEADER(config.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libopensync-plugin-gpe-0.20/src/calendar.c new/libopensync-plugin-gpe-0.22/src/calendar.c
--- old/libopensync-plugin-gpe-0.20/src/calendar.c 2006-08-23 15:51:25.000000000 +0200
+++ new/libopensync-plugin-gpe-0.22/src/calendar.c 2007-01-11 10:16:48.000000000 +0100
@@ -73,7 +73,7 @@
char *uid = NULL;
char buf[25];
parse_value_modified (modified, &modified, &uid);
- sprintf (buf, "gpe-calendar-%s", uid);
+ sprintf (buf, "gpe-event-%s", uid);
osync_change_set_uid (change, g_strdup (buf));
}
osync_change_set_hash (change, modified);
@@ -119,7 +119,7 @@
gchar *errmsg = NULL;
GSList *uid_list = NULL, *iter;
- osync_debug ("GPE_SYNC", 3, "Getting uidlists for vevens:");
+ osync_debug ("GPE_SYNC", 3, "Getting uidlists for vevents:");
gpesync_client_exec (env->client, "uidlist vevent", client_callback_list, &uid_list, &errmsg);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libopensync-plugin-gpe-0.20/src/gpe-sync new/libopensync-plugin-gpe-0.22/src/gpe-sync
--- old/libopensync-plugin-gpe-0.20/src/gpe-sync 2006-01-07 18:25:09.000000000 +0100
+++ new/libopensync-plugin-gpe-0.22/src/gpe-sync 2007-01-29 15:45:48.000000000 +0100
@@ -1,6 +1,7 @@
<config>
+ 0
+ 1
127.0.0.1
6446
gpeuser
- 1
</config>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libopensync-plugin-gpe-0.20/src/gpe_sync.c new/libopensync-plugin-gpe-0.22/src/gpe_sync.c
--- old/libopensync-plugin-gpe-0.20/src/gpe_sync.c 2006-09-09 16:52:04.000000000 +0200
+++ new/libopensync-plugin-gpe-0.22/src/gpe_sync.c 2007-01-29 15:45:48.000000000 +0100
@@ -77,7 +77,10 @@
OSyncError *error = NULL;
char *client_err;
- if (env->use_ssh)
+ if (env->use_local) {
+ env->client = gpesync_client_open_local(&client_err);
+ }
+ else if (env->use_ssh)
{
gchar *path = g_strdup_printf ("%s@%s", env->username, env->device_addr);
env->client = gpesync_client_open_ssh (path, &client_err);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libopensync-plugin-gpe-0.20/src/gpesync_client.c new/libopensync-plugin-gpe-0.22/src/gpesync_client.c
--- old/libopensync-plugin-gpe-0.20/src/gpesync_client.c 2006-08-23 15:51:25.000000000 +0200
+++ new/libopensync-plugin-gpe-0.22/src/gpesync_client.c 2007-01-29 15:45:48.000000000 +0100
@@ -96,7 +96,7 @@
if (!query_ctx->aborting)
{
if (verbose)
- fprintf (stderr, "[gpesync_client lines_lines] \n<%s>\n", data);
+ fprintf (stderr, "[gpesync_client read_lines] \n<%s>\n", data);
GSList *lines = NULL, *iter;
int argc, i;
@@ -179,6 +179,8 @@
len = atoi (buf->str);
have_len = TRUE;
g_string_assign (buf, "");
+ if (verbose)
+ fprintf (stderr, "[gpesync_client read_response] length:%d\n", len);
continue;
}
}
@@ -286,6 +288,45 @@
}
gpesync_client *
+gpesync_client_open_local (gchar **errmsg)
+{
+ gpesync_client *ctx;
+
+ int in_fds[2], out_fds[2];
+ pid_t pid;
+
+ ctx = g_malloc0 (sizeof (gpesync_client));
+
+ if (pipe (in_fds) && verbose)
+ fprintf(stderr, "[gpsyncclient %s]: pipe failed.\n", __func__);
+
+ if (pipe (out_fds) && verbose)
+ fprintf(stderr, "[gpsyncclinet %s]: pipe fialed.\n", __func__);
+
+ pid = fork ();
+ if (pid == 0)
+ {
+ dup2 (out_fds[0], 0);
+ dup2 (in_fds[1], 1);
+ close (out_fds[1]);
+ close (in_fds[0]);
+ if (verbose)
+ fprintf (stderr, "connecting to gpesyncd locally");
+ execlp ("gpesyncd", "gpesyncd", "--remote",
+ NULL);
+ perror ("exec");
+ }
+
+ close (out_fds[0]);
+ close (in_fds[1]);
+
+ ctx->outfd = out_fds[1];
+ ctx->infd = in_fds[0];
+
+ return ctx;
+}
+
+gpesync_client *
gpesync_client_open (const char *addr, int port, gchar **errmsg)
{
gpesync_client *ctx;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libopensync-plugin-gpe-0.20/src/gpesync_client.h new/libopensync-plugin-gpe-0.22/src/gpesync_client.h
--- old/libopensync-plugin-gpe-0.20/src/gpesync_client.h 2006-05-19 04:30:00.000000000 +0200
+++ new/libopensync-plugin-gpe-0.22/src/gpesync_client.h 2007-01-29 15:45:48.000000000 +0100
@@ -47,7 +47,7 @@
*
*/
gpesync_client *gpesync_client_open_ssh(const char *addr, char **errmsg);
-
+gpesync_client *gpesync_client_open_local(char **errmsg);
gpesync_client *gpesync_client_open(const char *addr, int port, char **errmsg);
/*! \brief Closes an exisiting connection and frees the memory.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libopensync-plugin-gpe-0.20/src/gpe_sync.h new/libopensync-plugin-gpe-0.22/src/gpe_sync.h
--- old/libopensync-plugin-gpe-0.20/src/gpe_sync.h 2006-01-07 18:25:09.000000000 +0100
+++ new/libopensync-plugin-gpe-0.22/src/gpe_sync.h 2007-01-29 15:45:48.000000000 +0100
@@ -45,6 +45,7 @@
char *username; // The user on the handheld
int device_port;
int use_ssh;
+ int use_local;
int debuglevel;
} gpe_environment;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libopensync-plugin-gpe-0.20/src/gpe_xml.c new/libopensync-plugin-gpe-0.22/src/gpe_xml.c
--- old/libopensync-plugin-gpe-0.20/src/gpe_xml.c 2006-01-07 18:25:09.000000000 +0100
+++ new/libopensync-plugin-gpe-0.22/src/gpe_xml.c 2007-01-29 15:45:48.000000000 +0100
@@ -71,6 +71,9 @@
if (!xmlStrcmp(cur->name, (const xmlChar *)"use_ssh")) {
env->use_ssh = atoi(str);
}
+ if (!xmlStrcmp(cur->name, (const xmlChar *)"use_local")) {
+ env->use_local = atoi(str);
+ }
if (!xmlStrcmp(cur->name, (const xmlChar *)"handheld_user")) {
env->username = g_strdup(str);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libopensync-plugin-gpe-0.20/src/utils.c new/libopensync-plugin-gpe-0.22/src/utils.c
--- old/libopensync-plugin-gpe-0.20/src/utils.c 2006-08-23 15:51:25.000000000 +0200
+++ new/libopensync-plugin-gpe-0.22/src/utils.c 2007-02-19 01:13:36.000000000 +0100
@@ -82,6 +82,7 @@
gpe_environment *env = (gpe_environment *)osync_context_get_plugin_data (ctx);
OSyncChange *change;
change = osync_change_new ();
+ osync_change_set_member(change, env->member);
/* We report the uids as
* gpe-contacts-0123, gpe-todo-0123, etc. so that file-sync
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org