rpms/gnome-pilot/FC-4 gb-309077-attach-48373-fix-xml-properties-leak.patch, NONE, 1.1 gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch, NONE, 1.1 gnome-pilot-2.0.13-include-pi-error.patch, NONE, 1.1 rh-161799-attach-116013-backup_conduit_update.diff, NONE, 1.1 rh-161799-attach-116014-conduits_64bit.diff, NONE, 1.1 gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch, 1.1, 1.2 gnome-pilot.spec, 1.27, 1.28
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jun 27 21:50:44 UTC 2005
Author: dmalcolm
Update of /cvs/dist/rpms/gnome-pilot/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20514
Modified Files:
gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch
gnome-pilot.spec
Added Files:
gb-309077-attach-48373-fix-xml-properties-leak.patch
gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
gnome-pilot-2.0.13-include-pi-error.patch
rh-161799-attach-116013-backup_conduit_update.diff
rh-161799-attach-116014-conduits_64bit.diff
Log Message:
* Mon Jun 27 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-3
- Introduce pilot-link-version macro; use to bump version to 1:0.12.0-0.pre2.0
- Update gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch to use version by Mark G Adams (#161824; patch 11)
In addition to the correct port to 0.12, this contains three patches in GNOME bugzilla bug 274032 (error handling, not closing socket on connection, fixed DB reading loop)
- Renabled backup conduit (was patch 12), applying two patches by Mark G Adams (#161799; patch 18 and patch 19)
- Applied patch by Mark G Adams to fix some issues identified using valgrind in the backup conduit (gnome bug 209130, patch 17)
- Applied patch by Mark G Adams to fix some cleanup of XML handling (gnome bug 309077, patch 16)
- Patched to fix a missing #include <pi-error.h> (patch 20)
- Remove test conduit
gb-309077-attach-48373-fix-xml-properties-leak.patch:
gnome-pilot-conduit-management.gob | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletion(-)
--- NEW FILE gb-309077-attach-48373-fix-xml-properties-leak.patch ---
--- libgpilotdCM/gnome-pilot-conduit-management.gob~ 2005-06-26 02:44:11.000000000 -0400
+++ libgpilotdCM/gnome-pilot-conduit-management.gob 2005-06-26 03:19:04.000000000 -0400
@@ -339,8 +339,10 @@
/* g_message ("version = %s",version); */
if (version==NULL || g_strcasecmp (version,CONDUIT_XML_VERSION)!=0) {
g_warning ("incompatible version");
+ xmlFree (version);
return NULL;
}
+ xmlFree (version);
/* g_message ("XML version is ok, creating entry"); */
ret = g_new (GnomePilotConduitMgmtData,1);
ret->string_attributes = g_hash_table_new (g_str_hash,g_str_equal);
@@ -368,22 +370,32 @@
if (id_string==NULL) {
g_warning ("error in XML, missing id_string");
+ xmlFree (type);
+ xmlFree (location);
return FALSE;
} else {
if (strchr (id_string,' ')) {
g_warning ("error in XML, id_string bad");
+ xmlFree (id_string);
+ xmlFree (type);
+ xmlFree (location);
return FALSE;
}
}
if (location==NULL) {
g_warning ("error in XML, missing location");
+ xmlFree (id_string);
+ xmlFree (type);
return FALSE;
}
- if (g_strcasecmp (type,"shlib")==0) {
+ if (type && g_strcasecmp (type,"shlib")==0) {
obj->type = GNOME_PILOT_CONDUIT_TYPE_SHLIB;
} else {
g_warning ("Unknown conduit type");
+ xmlFree (id_string);
+ xmlFree (type);
+ xmlFree (location);
return FALSE;
}
obj->location = g_strdup (location);
@@ -391,6 +403,9 @@
g_hash_table_insert (conduitid_to_datastruct,
obj->id,
obj);
+ xmlFree (id_string);
+ xmlFree (type);
+ xmlFree (location);
return TRUE;
}
@@ -428,6 +443,8 @@
current_name = g_strdup (value);
}
node = node->next;
+ xmlFree (value);
+ xmlFree (lang);
}
}
if (!current_name) {
@@ -462,10 +479,16 @@
if (value==NULL) {
g_warning ("attribute %s for %s(%s) has no value",
name, obj->name, obj->id);
+ xmlFree (lang);
+ xmlFree (name);
+ xmlFree (type);
continue;
}
if (name==NULL) {
g_warning ("attribute has no name");
+ xmlFree (lang);
+ xmlFree (type);
+ xmlFree (value);
continue;
}
@@ -486,6 +509,10 @@
g_warning ("Unknown type %s",type);
}
+ xmlFree (lang);
+ xmlFree (name);
+ xmlFree (type);
+ xmlFree (value);
} else if (g_strcasecmp (node->name, "text") == 0) {
/* ignore text */
} else if (!self_is_other_valid_tag (node->name)) {
gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch:
backup_conduit.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
--- NEW FILE gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch ---
--- conduits/backup/backup_conduit.c~ 2003-03-18 10:12:25.000000000 -0500
+++ conduits/backup/backup_conduit.c 2005-06-27 10:00:46.000000000 -0400
@@ -54,7 +54,7 @@
typedef struct file_db {
gchar fname[256];
struct DBInfo info;
- gint maxblock;
+ size_t maxblock;
gint entries;
} file_db;
@@ -377,7 +377,7 @@
gpointer _cfg)
{
char *name;
- struct pi_file *f;
+ struct pi_file *f = NULL;
struct stat statb;
struct utimbuf times;
GList *iterator;
@@ -576,8 +576,10 @@
gnome_pilot_conduit_send_error(GNOME_PILOT_CONDUIT(conduit),
"Unable to write file to backup directory specified");
result = -1;
+ f = NULL;
goto db_close;
}
+ f = NULL;
g_message ("Wrote %d of %d %s, which is %s",
wrote, entries, PI_DBINFO (dbinfo)->flags & dlpDBFlagResource ? "resources" : "records",
@@ -589,6 +591,7 @@
db_close:
dlp_CloseDB (dbinfo->pilot_socket, dbinfo->db_handle);
exit_and_free:
+ pi_file_close (f);
g_free (name);
exit:
return result;
@@ -621,10 +624,10 @@
{
DIR *dir;
struct dirent *dirent;
- GnomePilotDBInfo info;
file_db **db;
int dbcount = 0;
- int i, j, max, size;
+ int i, j, max;
+ size_t size;
struct pi_file *file;
char *source;
int result = 0;
@@ -679,7 +682,7 @@
/* Find biggest record */
for (i = 0; i < db[dbcount]->entries; i++) {
- if (PI_DBINFO (&info)->flags & dlpDBFlagResource)
+ if (db[dbcount]->info.flags & dlpDBFlagResource)
pi_file_read_resource(file, i, 0, &size, 0, 0);
else
pi_file_read_record(file, i, 0, &size, 0, 0,0 );
gnome-pilot-2.0.13-include-pi-error.patch:
manager.c | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE gnome-pilot-2.0.13-include-pi-error.patch ---
--- gnome-pilot-2.0.13/gpilotd/manager.c.include-pi-error 2005-06-27 17:03:24.000000000 -0400
+++ gnome-pilot-2.0.13/gpilotd/manager.c 2005-06-27 17:04:02.000000000 -0400
@@ -28,6 +28,7 @@
#include <pi-source.h>
#include <pi-sync.h>
#include <pi-dlp.h>
+#include <pi-error.h>
#include <libgnome/libgnome.h>
rh-161799-attach-116013-backup_conduit_update.diff:
backup_conduit.c | 61 +++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 35 deletions(-)
--- NEW FILE rh-161799-attach-116013-backup_conduit_update.diff ---
--- conduits/backup/backup_conduit.c.memfix 2005-06-27 10:14:46.000000000 -0400
+++ conduits/backup/backup_conduit.c 2005-06-27 10:15:37.000000000 -0400
@@ -387,9 +387,10 @@
int keep_reading;
int entries;
int err;
- unsigned char *buffer;
PilotRecord remote;
int wrote;
+ pi_buffer_t *piBuf = NULL;
+ int len;
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (dbinfo != NULL, -1);
@@ -473,21 +474,14 @@
goto db_close;
}
- buffer = g_new0 (unsigned char, 0xffff);
- remote.buffer = buffer;
-
- {
- int l;
- l = dlp_ReadAppBlock (dbinfo->pilot_socket,
- dbinfo->db_handle,
- 0,
- buffer,
- 0xffff);
- if (l>0) {
- pi_file_set_app_info (f, buffer, l);
- }
- }
-
+ piBuf = pi_buffer_new (0xffff);
+ len = dlp_ReadAppBlock (dbinfo->pilot_socket,
+ dbinfo->db_handle,
+ 0,
+ -1,
+ piBuf);
+ if (len > 0)
+ pi_file_set_app_info (f, piBuf->data, len);
index = 0;
keep_reading = 1;
@@ -500,19 +494,18 @@
keep_reading = (dlp_ReadResourceByIndex (dbinfo->pilot_socket,
dbinfo->db_handle,
index,
- remote.buffer,
+ piBuf,
&type,
- &id,
- &remote.len) >= 0);
+ &id) >= 0);
#ifdef DEBUG_REC_IO
g_message ("read resource %d, type = %s, size %d, , index %d/%d",
- id, pi_unmktag (type), remote.len,
+ id, pi_unmktag (type), piBuf->used,
index, entries);
#endif
- if (keep_reading) {
- err = pi_file_append_resource (f,
- remote.buffer,
- remote.len,
+ if (keep_reading > 0) {
+ err = pi_file_append_resource (f,
+ piBuf->data,
+ piBuf->used,
type,
id);
if (err < 0) {
@@ -521,7 +514,7 @@
wrote++;
#ifdef DEBUG_REC_IO
g_message ("write resource %d, type = %s, size %d, index %d/%d",
- id, pi_unmktag (type), remote.len,
+ id, pi_unmktag (type), piBuf->used,
index, entries);
#endif
}
@@ -530,22 +523,21 @@
keep_reading = (dlp_ReadRecordByIndex (dbinfo->pilot_socket,
dbinfo->db_handle,
index,
- remote.buffer,
+ piBuf,
&remote.recID,
- &remote.len,
&remote.flags,
&remote.catID) >= 0);
#ifdef DEBUG_REC_IO
g_message ("read record %d, size %d, index %d/%d",
- remote.recID, remote.len,
+ remote.recID, piBuf->used,
index, entries);
#endif
- if (keep_reading) {
+ if (keep_reading > 0) {
err = pi_file_append_record (f,
- remote.buffer,
- remote.len,
+ piBuf->data,
+ piBuf->used,
remote.flags,
remote.catID,
remote.recID);
@@ -555,7 +547,7 @@
wrote++;
#ifdef DEBUG_REC_IO
g_message ("write record %d, size %d, index %d/%d",
- id, remote.len,
+ id, piBuf->used,
index, entries);
#endif
}
@@ -567,10 +559,8 @@
gnome_pilot_conduit_send_progress (GNOME_PILOT_CONDUIT (conduit),
entries,
index);
- } while (keep_reading && index < entries);
+ } while ((keep_reading > 0) && (index < entries));
- g_free (buffer);
-
if (pi_file_close (f) < 0) {
g_warning("backup conduit can't write file");
gnome_pilot_conduit_send_error(GNOME_PILOT_CONDUIT(conduit),
@@ -593,6 +583,7 @@
exit_and_free:
pi_file_close (f);
g_free (name);
+ pi_buffer_free (piBuf);
exit:
return result;
}
rh-161799-attach-116014-conduits_64bit.diff:
backup/Makefile.am | 2 +-
file/Makefile.am | 2 +-
test/Makefile.am | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE rh-161799-attach-116014-conduits_64bit.diff ---
--- conduits/backup/Makefile.am~ 2005-04-09 00:14:27.000000000 -0400
+++ conduits/backup/Makefile.am 2005-06-26 17:20:25.000000000 -0400
@@ -17,7 +17,7 @@
$(GNOME_PILOT_LIBS)
backup.conduit: backup.conduit.in Makefile
- sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/backup.conduit.in > backup.conduit.tmp \
+ sed -e 's^\@libdir\@^$(libdir)^g' < $(srcdir)/backup.conduit.in > backup.conduit.tmp \
&& mv backup.conduit.tmp backup.conduit
Conduitdir = $(datadir)/gnome-pilot/conduits/
--- conduits/file/Makefile.am~ 2005-04-04 19:53:33.000000000 -0400
+++ conduits/file/Makefile.am 2005-06-26 17:20:41.000000000 -0400
@@ -26,7 +26,7 @@
$(GNOME_PILOT_LIBS)
file.conduit: file.conduit.in Makefile
- sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/file.conduit.in > file.conduit.tmp \
+ sed -e 's^\@libdir\@^$(libdir)^g' < $(srcdir)/file.conduit.in > file.conduit.tmp \
&& mv file.conduit.tmp file.conduit
Conduitdir = $(datadir)/gnome-pilot/conduits/
--- conduits/test/Makefile.am~ 2002-11-22 11:03:58.000000000 -0500
+++ conduits/test/Makefile.am 2005-06-26 17:20:56.000000000 -0400
@@ -15,7 +15,7 @@
$(GNOME_PILOT_LIBS)
test.conduit: test.conduit.in Makefile
- sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/test.conduit.in > test.conduit.tmp \
+ sed -e 's^\@libdir\@^$(libdir)^g' < $(srcdir)/test.conduit.in > test.conduit.tmp \
&& mv test.conduit.tmp test.conduit
Conduitdir = $(datadir)/gnome-pilot/conduits/
gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch:
gpilotd/gnome-pilot-conduit-standard-abs.c | 77 +++++++++++++++++++++++++++--
gpilotd/gpilotd.c | 28 ++++------
gpilotd/manager.c | 29 +++++++---
utils/make-password.c | 10 +--
4 files changed, 106 insertions(+), 38 deletions(-)
Index: gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-4/gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch 17 Mar 2005 00:47:55 -0000 1.1
+++ gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch 27 Jun 2005 21:50:41 -0000 1.2
@@ -1,6 +1,6 @@
---- gnome-pilot-2.0.12/gpilotd/manager.c.port-to-pilot-link-0.12 2004-09-03 12:18:35.000000000 -0400
-+++ gnome-pilot-2.0.12/gpilotd/manager.c 2005-03-16 18:34:33.000000000 -0500
-@@ -294,25 +294,29 @@
+--- gpilotd/manager.c~ 2005-06-27 12:00:42.000000000 -0400
++++ gpilotd/manager.c 2005-06-27 12:00:48.000000000 -0400
+@@ -294,25 +294,36 @@
GPilotPilot *pilot_info;
int error = 0;
int index = 0;
@@ -11,39 +11,43 @@
orbed_notify_daemon_message (pilot_info->name, NULL, _("Collecting synchronization info..."));
- while (1) {
-- GnomePilotDBInfo *dbinfo;
++ while (1)
+ {
-+ int i;
+ pi_buffer_t *pi_buf;
+ int result;
-+
-+ pi_buf = pi_buffer_new (0xffff);
-+ result = dlp_ReadDBList (pfd, 0, dlpDBListRAM, index, pi_buf);
-+
-+ for (i=0;i<result;i++) {
-+ GnomePilotDBInfo *dbinfo;
-
+ GnomePilotDBInfo *dbinfo;
+-
- dbinfo = g_new0 (GnomePilotDBInfo, 1);
- /* load next dbinfo block */
- if (dlp_ReadDBList (pfd, 0, dlpDBListRAM, index, PI_DBINFO (dbinfo)) < 0) {
- /* is <0, there are no more databases, break
- out so we can save the list */
-- break;
-+ dbinfo = g_new0 (GnomePilotDBInfo, 1);
-+ memcpy (dbinfo, pi_buf->data + (sizeof(struct DBInfo)*i), sizeof(struct DBInfo));
-+ index = PI_DBINFO (dbinfo)->index + 1;
-+ dbs = g_list_append (dbs, dbinfo);
++
++ pi_buf = pi_buffer_new (sizeof (struct DBInfo));
++ result = dlp_ReadDBList (pfd, 0, dlpDBListRAM, index, pi_buf);
++ if (result < 0)
++ {
++ pi_buffer_free (pi_buf);
++ if ((result != PI_ERR_DLP_PALMOS) || (pi_palmos_error (pfd) != dlpErrNotFound))
++ {
++ g_error ("Error reading databases from Palm!");
++ g_list_free (dbs);
++ return -1;
++ }
+ break;
}
-- index = PI_DBINFO (dbinfo)->index + 1;
++ dbinfo = g_new0 (GnomePilotDBInfo, 1);
++ memcpy (dbinfo, pi_buf->data, sizeof (struct DBInfo));
+ index = PI_DBINFO (dbinfo)->index + 1;
-
-- dbs = g_list_append (dbs, dbinfo);
+ dbs = g_list_append (dbs, dbinfo);
+ pi_buffer_free (pi_buf);
}
index = 1;
---- gnome-pilot-2.0.12/gpilotd/gnome-pilot-conduit-standard-abs.c.port-to-pilot-link-0.12 2004-08-26 22:02:48.000000000 -0400
-+++ gnome-pilot-2.0.12/gpilotd/gnome-pilot-conduit-standard-abs.c 2005-03-16 18:34:33.000000000 -0500
+--- gpilotd/gnome-pilot-conduit-standard-abs.c~ 2005-06-27 12:01:14.000000000 -0400
++++ gpilotd/gnome-pilot-conduit-standard-abs.c 2005-06-27 12:01:24.000000000 -0400
@@ -31,6 +31,73 @@
#include "gpmarshal.h"
#include "manager.h"
@@ -163,17 +167,26 @@
remote.record,
&remote.ID,
&index,
---- gnome-pilot-2.0.12/gpilotd/gpilotd.c.port-to-pilot-link-0.12 2004-09-03 12:18:35.000000000 -0400
-+++ gnome-pilot-2.0.12/gpilotd/gpilotd.c 2005-03-16 18:34:33.000000000 -0500
-@@ -122,7 +122,6 @@
+--- gpilotd/gpilotd.c~ 2005-06-27 12:01:42.000000000 -0400
++++ gpilotd/gpilotd.c 2005-06-27 12:01:48.000000000 -0400
+@@ -122,8 +122,7 @@
static int
pilot_connect (GPilotDevice *device,int *error)
{
- struct pi_sockaddr addr;
- int sd, listen_sd, pf;
+- int sd, listen_sd, pf;
++ int sd, pf;
int ret;
-@@ -154,8 +153,6 @@
+ if (device->type != PILOT_DEVICE_NETWORK) {
+@@ -148,14 +147,12 @@
+ break;
+ }
+
+- if (!(listen_sd = pi_socket (PI_AF_PILOT, PI_SOCK_STREAM, pf))) {
++ if ((sd = pi_socket (PI_AF_PILOT, PI_SOCK_STREAM, pf)) < 0) {
+ g_warning ("pi_socket: %s",strerror (errno));
+ if (error) *error = 1;
return -1;
}
@@ -182,19 +195,57 @@
/*
Most important for networking
. resolves inside libpisock as network
-@@ -166,9 +163,7 @@
+@@ -166,39 +163,36 @@
device->port = "net:any";
}
- strcpy (addr.pi_device,device->port);
-
- ret = pi_bind (listen_sd, (struct sockaddr*)&addr, sizeof (addr));
-+ ret = pi_bind (listen_sd, device->port);
- if (ret == -1) {
+- if (ret == -1) {
++ ret = pi_bind (sd, device->port);
++ if (ret < 0) {
g_warning (_("Unable to bind to pilot"));
if (error)
---- gnome-pilot-2.0.12/utils/make-password.c.port-to-pilot-link-0.12 2005-03-16 19:23:11.000000000 -0500
-+++ gnome-pilot-2.0.12/utils/make-password.c 2005-03-16 19:23:31.000000000 -0500
+ *error = 1;
+- pi_close(listen_sd);
++ pi_close(sd);
+ return 0;
+ }
+
+- ret = pi_listen (listen_sd, 1);
+- if (ret != 0) {
++ ret = pi_listen (sd, 1);
++ if (ret < 0) {
+ g_warning ("pi_listen: %s", strerror (errno));
+ if (error)
+ *error = 2;
+- pi_close(listen_sd);
++ pi_close(sd);
+ return 0;
+ }
+
+- sd = pi_accept_to (listen_sd, NULL,0, device->timeout);
+- if (sd == -1) {
++ sd = pi_accept_to (sd, NULL,0, device->timeout);
++ if (sd < 0) {
+ g_warning ("pi_accept_to: %s", strerror (errno));
+ g_warning ("pi_accept_to: timeout was %d secs", device->timeout);
+ if (error)
+ *error = 2;
+- pi_close(listen_sd);
++ pi_close(sd);
+ return 0;
+ }
+
+ if (error)
+ *error = 0;
+- pi_close(listen_sd);
+
+ return sd;
+ }
+--- utils/make-password.c~ 2005-06-27 12:01:59.000000000 -0400
++++ utils/make-password.c 2005-06-27 12:02:08.000000000 -0400
@@ -28,7 +28,6 @@
@@ -203,7 +254,7 @@
int sd,ret;
struct PilotUser U;
char salt[3];
-@@ -42,10 +41,7 @@
+@@ -42,17 +41,14 @@
exit(1);
}
@@ -211,7 +262,16 @@
- strcpy(addr.pi_device,argv[1]);
-
- ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));
+- if(ret == -1) {
+ ret = pi_bind(sd, argv[1]);
- if(ret == -1) {
++ if(ret < 0) {
perror("pi_bind");
exit(1);
+ }
+
+ ret = pi_listen(sd, 1);
+- if(ret == -1) {
++ if(ret < 0) {
+ perror("pi_listen");
+ exit(1);
+ }
Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-4/gnome-pilot.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-pilot.spec 30 Apr 2005 05:31:47 -0000 1.27
+++ gnome-pilot.spec 27 Jun 2005 21:50:41 -0000 1.28
@@ -1,7 +1,8 @@
+%define pilot_link_version 1:0.12.0-0.pre2.0
Summary: GNOME pilot programs
Name: gnome-pilot
Version: 2.0.13
-Release: 2
+Release: 3
License: LGPL
Group: Applications/Communications
Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -10,10 +11,20 @@
Patch7: gnome-pilot-2.0.12-move-conduits-code.patch
Patch8: gnome-pilot-2.0.12-move-conduits-autotools.patch
Patch9: gnome-pilot-2.0.12-defines.patch
+
+# This patch has been regenerated by Mark G Adams:
Patch11: gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch
-Patch12: gnome-pilot-2.0.12-disable_backup_conduit.patch
+
+# Various patches by Mark G Adams filed in GNOME and RH Bugzilla:
+Patch16: gb-309077-attach-48373-fix-xml-properties-leak.patch
+Patch17: gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
+Patch18: rh-161799-attach-116013-backup_conduit_update.diff
+Patch19: rh-161799-attach-116014-conduits_64bit.diff
+
+Patch20: gnome-pilot-2.0.13-include-pi-error.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pilot-link >= 1:0.11.4
+Requires: pilot-link >= %{pilot-link-version}
Prereq: scrollkeeper
Prereq: GConf2
BuildRequires: libgnome-devel >= 2.0.0
@@ -24,7 +35,7 @@
BuildRequires: bonobo-activation-devel >= 1.0.3
BuildRequires: gnome-panel-devel >= 2.0.6
BuildRequires: GConf2-devel >= 2.0
-BuildRequires: pilot-link-devel >= 1:0.11.4
+BuildRequires: pilot-link-devel >= %{pilot-link-version}
ExcludeArch: s390 s390x
%description
@@ -35,7 +46,7 @@
Summary: GNOME pilot libraries, includes, etc
Group: Development/Libraries
Requires: ORBit2-devel
-Requires: pilot-link-devel >= 1:0.11.4
+Requires: pilot-link-devel >= %{pilot-link-version}
Requires: %name = %{version}
Requires: libgnomeui-devel
@@ -49,8 +60,14 @@
%patch7 -p1 -b .move-conduits-code
%patch8 -p1 -b .move-conduits-autotools
%patch9 -p1 -b .defines
-%patch11 -p1 -b .port-to-pilot-link-0.12
-%patch12 -p1 -b .disable-backup-conduit
+%patch11 -p0 -b .port-to-pilot-link-0.12
+
+%patch16 -p0 -b .fix-xml-properties-leak
+%patch17 -p0 -b .backup-conduit-valgrind-fixes
+%patch18 -p0 -b .backup_conduit_update
+%patch19 -p0 -b .conduits_64bit
+
+%patch20 -p1 -b .include-pi-error
%build
autoreconf -i
@@ -77,6 +94,7 @@
# remove unwanted files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.{a,la}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*test_conduit.*
rm -f $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*test.*
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
@@ -130,6 +148,16 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Jun 27 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-3
+- Introduce pilot-link-version macro; use to bump version to 1:0.12.0-0.pre2.0
+- Update gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch to use version by Mark G Adams (#161824; patch 11)
+ In addition to the correct port to 0.12, this contains three patches in GNOME bugzilla bug 274032 (error handling, not closing socket on connection, fixed DB reading loop)
+- Renabled backup conduit (was patch 12), applying two patches by Mark G Adams (#161799; patch 18 and patch 19)
+- Applied patch by Mark G Adams to fix some issues identified using valgrind in the backup conduit (gnome bug 209130, patch 17)
+- Applied patch by Mark G Adams to fix some cleanup of XML handling (gnome bug 309077, patch 16)
+- Patched to fix a missing #include <pi-error.h> (patch 20)
+- Remove test conduit
+
* Fri Apr 29 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-2
- move .desktop file from /usr/share/control-center-2.0/capplets to
/usr/share/applications (#149228)
More information about the fedora-cvs-commits
mailing list