rpms/libtevent/devel tevent_signal_segfault.patch, NONE, 1.1 libtevent.spec, 1.4, 1.5 0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch, 1.1, NONE

[Simo Sorce]

Author: simo

Update of /cvs/pkgs/rpms/libtevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30943

Modified Files:
	libtevent.spec 
Added Files:
	tevent_signal_segfault.patch 
Removed Files:
	0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch 
Log Message:
Sigh committed the original patch instead of the right one.
(The original didn't apply because rawhide has fuzz=0)


tevent_signal_segfault.patch:
 tevent_signal.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE tevent_signal_segfault.patch ---
diff -uPr tevent-0.9.8.orig/tevent_signal.c tevent-0.9.8/tevent_signal.c
--- tevent-0.9.8.orig/tevent_signal.c	2009-09-23 12:41:48.000000000 -0400
+++ tevent-0.9.8/tevent_signal.c	2009-09-23 12:42:25.000000000 -0400
@@ -89,18 +89,12 @@
 	SIG_INCREMENT(sig_state->signal_count[signum]);
 	SIG_INCREMENT(sig_state->got_signal);
 
-	if (sig_state->sig_handlers[signum] != NULL) {
-		ev = sig_state->sig_handlers[signum]->se->event_ctx;
-		/* doesn't matter if this pipe overflows */
-		res = write(ev->pipe_fds[1], &c, 1);
-	}
-
 	/* Write to each unique event context. */
 	for (sl = sig_state->sig_handlers[signum]; sl; sl = sl->next) {
 		if (sl->se->event_ctx != ev) {
+			ev = sl->se->event_ctx;
 			/* doesn't matter if this pipe overflows */
 			res = write(ev->pipe_fds[1], &c, 1);
-			ev = sl->se->event_ctx;
 		}
 	}
 }


Index: libtevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtevent/devel/libtevent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libtevent.spec	23 Sep 2009 16:32:00 -0000	1.4
+++ libtevent.spec	23 Sep 2009 16:59:09 -0000	1.5
@@ -1,6 +1,6 @@
 Name: libtevent
 Version: 0.9.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Daemons
 Summary: The tevent library
 License: LGPLv3+
@@ -10,7 +10,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 Patch1: tevent-098-add_abi_scripts_and_fix_exports.patch
 Patch2: tevent-098-abi-compat.patch
-Patch3: 0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch
+Patch3: tevent_signal_segfault.patch
 
 BuildRequires: libtalloc-devel >= 2.0.0
 
@@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
-* Wed Sep 23 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-4
+* Wed Sep 23 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-5
 - Add patch to fix a segfault case
 
 * Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-2


--- 0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch DELETED ---