rpms/avahi/FC-6 avahi-0.6.16-register-time-event.patch, NONE, 1.1 avahi.spec, 1.73, 1.74

[fedora-cvs-commits at redhat.com]

Author: dcbw

Update of /cvs/dist/rpms/avahi/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8387

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.16-register-time-event.patch 
Log Message:
* Fri Mar 30 2007 Dan Williams <dcbw at redhat.com> - 0.6.16-3.fc6
- Fix race condition during conflict state that triggers an assertion
    http://www.avahi.org/changeset/1400


avahi-0.6.16-register-time-event.patch:
 entry.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE avahi-0.6.16-register-time-event.patch ---
Index: avahi-core/entry.c
===================================================================
--- avahi-core/entry.c	(revision 1397)
+++ avahi-core/entry.c	(working copy)
@@ -1014,6 +1014,11 @@
         
         if (avahi_age(&g->established_at) > 5000000)
             g->n_register_try = 0;
+    } else if (g->state == AVAHI_ENTRY_GROUP_REGISTERING) {
+        if (g->register_time_event) {
+            avahi_time_event_free(g->register_time_event);
+            g->register_time_event = NULL;
+        }
     }
     
     if (state == AVAHI_ENTRY_GROUP_ESTABLISHED)
@@ -1153,15 +1158,8 @@
     }
     g->server->need_entry_cleanup = 1;
 
-    if (g->register_time_event) {
-        avahi_time_event_free(g->register_time_event);
-        g->register_time_event = NULL;
-    }
-    
     g->n_probing = 0;
 
-    gettimeofday(&g->register_time, NULL);
-
     avahi_s_entry_group_change_state(g, AVAHI_ENTRY_GROUP_UNCOMMITED);
 }
 


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-6/avahi.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- avahi.spec	16 Jan 2007 15:58:15 -0000	1.73
+++ avahi.spec	30 Mar 2007 20:00:42 -0000	1.74
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.16
-Release: 	    2%{?dist}
+Release: 	    3%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -44,6 +44,7 @@
 Patch20: 	avahi-0.6.15-initscript.patch
 Patch21: 	avahi-0.6.11-align.patch
 Patch23:    avahi-0.6.15-netdev.patch
+Patch24: 	avahi-0.6.16-register-time-event.patch
 
 
 %description
@@ -170,6 +171,7 @@
 %patch20 -p1 -b .initscript
 %patch21 -p1 -b .align
 %patch23 -p1 -b .netdev
+%patch24 -p0 -b .register-time-event
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -383,6 +385,10 @@
 %endif
 
 %changelog
+* Fri Mar 30 2007 Dan Williams <dcbw at redhat.com> - 0.6.16-3.fc6
+- Fix race condition during conflict state that triggers an assertion
+    http://www.avahi.org/changeset/1400
+
 * Tue Jan 16 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-2.fc6
 - Resolves: #219218 - avahi package does not create group "netdev"