rpms/pulseaudio/F-8 pulseaudio-0.9.7-eof-fix-r1964.patch, NONE, 1.1 pulseaudio.spec, 1.23, 1.24

Lennart Poettering (lennart) fedora-extras-commits at redhat.com
Wed Oct 31 00:43:13 UTC 2007


Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8911

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.7-eof-fix-r1964.patch 
Log Message:
fix #322481


pulseaudio-0.9.7-eof-fix-r1964.patch:

--- NEW FILE pulseaudio-0.9.7-eof-fix-r1964.patch ---
Index: /branches/lennart/src/pulsecore/protocol-esound.c
===================================================================
--- /branches/lennart/src/pulsecore/protocol-esound.c (revision 1884)
+++ /branches/lennart/src/pulsecore/protocol-esound.c (revision 1964)
@@ -949,5 +949,5 @@
 
         if ((r = pa_iochannel_read(c->io, (uint8_t*) c->read_data + c->read_data_length, handler->data_length - c->read_data_length)) <= 0) {
-            if (errno == EINTR || errno == EAGAIN)
+            if (r < 0 && (errno == EINTR || errno == EAGAIN))
                 return 0;
 
@@ -979,5 +979,5 @@
 
         if (r <= 0) {
-            if (errno == EINTR || errno == EAGAIN)
+            if (r < 0 && (errno == EINTR || errno == EAGAIN))
                 return 0;
 
@@ -1042,5 +1042,5 @@
         if (r <= 0) {
 
-            if (errno == EINTR || errno == EAGAIN)
+            if (r < 0 && (errno == EINTR || errno == EAGAIN))
                 return 0;
 
@@ -1073,5 +1073,5 @@
         if ((r = pa_iochannel_write(c->io, (uint8_t*) c->write_data+c->write_data_index, c->write_data_length-c->write_data_index)) < 0) {
 
-            if (errno == EINTR || errno == EAGAIN)
+            if (r < 0 && (errno == EINTR || errno == EAGAIN))
                 return 0;
 
@@ -1102,5 +1102,5 @@
         if (r < 0) {
 
-            if (errno == EINTR || errno == EAGAIN)
+            if (r < 0 && (errno == EINTR || errno == EAGAIN))
                 return 0;
 


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-8/pulseaudio.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pulseaudio.spec	17 Oct 2007 21:20:15 -0000	1.23
+++ pulseaudio.spec	31 Oct 2007 00:42:40 -0000	1.24
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.16.svn20071017%{?dist}
+Release:	0.17.svn20071017%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -24,6 +24,7 @@
 Requires:	%{name}-core-libs = %{version}-%{release}
 Obsoletes:	pulseaudio-devel
 Patch1: 	pulseaudio-0.9.6-nochown.patch
+Patch2:		pulseaudio-0.9.7-eof-fix-r1964.patch
 
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
@@ -150,6 +151,7 @@
 %prep
 %setup -q -T -b0
 %patch1 -p1
+%patch2 -p3
 
 %build
 %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -344,6 +346,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Tue Oct 30 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.17.svn20071017
+- fix #322481
+
 * Wed Oct 17 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.16.svn20071017
 - Another SVN snapshot, fixing another round of bugs (#330541)
 - Split libpulscore into a seperate package to work around multilib limitation (#335011)




More information about the fedora-extras-commits mailing list