From e57c9170bb19b47df7724857d69957a3189f577d Mon Sep 17 00:00:00 2001 From: Jay Fenlason Date: Mon, 13 Dec 2010 16:26:40 -0500 Subject: [PATCH] Upgrade to 2.0.6 --- .gitignore | 1 + libraw1394-fix-missed-hup-signal.patch | 36 -------------------------- libraw1394.spec | 11 ++++---- sources | 2 +- 4 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 libraw1394-fix-missed-hup-signal.patch diff --git a/.gitignore b/.gitignore index 499fdc7..a71f00a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libraw1394-2.0.0-20080430_git.tar.bz2 libraw1394-2.0.0.tar.gz libraw1394-2.0.1.tar.gz libraw1394-2.0.4.tar.bz2 +/libraw1394-2.0.6.tar.bz2 diff --git a/libraw1394-fix-missed-hup-signal.patch b/libraw1394-fix-missed-hup-signal.patch deleted file mode 100644 index ab63f8e..0000000 --- a/libraw1394-fix-missed-hup-signal.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b15039ceb814ee4c685deec554f342480391b775 Mon Sep 17 00:00:00 2001 -From: Peter Hurley -Date: Fri, 16 Apr 2010 14:15:40 -0400 -Subject: [PATCH] Fix for overlooked device HUP with 'firewire' stack - -When EPOLLHUP event is received in fw_loop_iterate(), it is or'd -with EPOLLERR. The EPOLLHUP event was then overlooked in -handle_device_event() with unpredictable-but-generally bad results. - -This problem has been rediscovered several times. -http://thread.gmane.org/gmane.linux.kernel.firewire.devel/13330 -http://thread.gmane.org/gmane.linux.kernel.firewire.devel/13779 - -Reported-by: B.J. Buchalter -Reported-by: Michael Thireos -Signed-off-by: Stefan Richter ---- - src/fw.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/fw.c b/src/fw.c -index 7277253..d525ac9 100644 ---- a/src/fw.c -+++ b/src/fw.c -@@ -262,7 +262,7 @@ handle_device_event(raw1394handle_t handle, - int i; - - i = device - fwhandle->devices; -- if (events == EPOLLHUP) -+ if (events & EPOLLHUP) - return handle_lost_device(fwhandle, i); - - len = read(fwhandle->devices[i].fd, --- -1.7.0.5 - diff --git a/libraw1394.spec b/libraw1394.spec index 4cf9263..be822a4 100644 --- a/libraw1394.spec +++ b/libraw1394.spec @@ -1,12 +1,11 @@ Summary: Library providing low-level IEEE-1394 access Name: libraw1394 -Version: 2.0.5 -Release: 2%{?dist} +Version: 2.0.6 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries -Source: http://www.kernel.org/pub/linux/libs/ieee1394/%{name}-%{version}.tar.gz +Source: http://www.kernel.org/pub/linux/libs/ieee1394/%{name}-%{version}.tar.bz2 URL: http://www.dennedy.org/libraw1394/ -Patch: libraw1394-fix-missed-hup-signal.patch ExcludeArch: s390 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake libtool kernel-headers @@ -28,7 +27,6 @@ Development libraries needed to build applications against libraw1394. %prep %setup -q -%patch -p1 %build %configure --disable-static @@ -67,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 13 2010 Jay Fenlason 2.0.6-1 +- Upgrade to new upstream, which obsoletes the HUP patch. + * Mon Apr 19 2010 Jarod Wilson 2.0.5-2 - Fix overlooked device HUP using firewire driver stack diff --git a/sources b/sources index fd25d58..dbbcfb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1db64231c78540c32859b591cb8b40cf libraw1394-2.0.5.tar.gz +cdc5b66c300058a1b776ed83397a7291 libraw1394-2.0.6.tar.bz2