rpms/libraw1394/F-8 libraw1394-juju-munmap-correct-max_packet_size.patch, NONE, 1.1 libraw1394-juju-no-double-free-on-shutdown.patch, 1.1, 1.2 libraw1394.spec, 1.38, 1.39

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	libraw1394-juju-no-double-free-on-shutdown.patch 
	libraw1394.spec 
Added Files:
	libraw1394-juju-munmap-correct-max_packet_size.patch 
Log Message:
* Mon Apr 28 2008 Jarod Wilson <jwilson at redhat.com> - 1.3.0-6
- Unmap the correct memory range on iso receive teardown, fixes
  segfault on exit from dvgrab (Mladen Kuntner, #444354)
- Update license and kill an errant tab (#226039)
- Use firewire-cdev.h provided by kernel-headers


libraw1394-juju-munmap-correct-max_packet_size.patch:

--- NEW FILE libraw1394-juju-munmap-correct-max_packet_size.patch ---
diff -Naurp libraw1394-1.3.0/juju/raw1394-iso.c libraw1394-1.3.0.fix/juju/raw1394-iso.c
--- libraw1394-1.3.0/juju/raw1394-iso.c	2008-04-28 13:57:30.000000000 -0400
+++ libraw1394-1.3.0.fix/juju/raw1394-iso.c	2008-04-28 14:06:21.000000000 -0400
@@ -421,7 +421,7 @@ iso_init(raw1394handle_t handle, int typ
 	}
 
 	handle->iso.buffer =
-		mmap(NULL, buf_packets * max_packet_size,
+		mmap(NULL, buf_packets * handle->iso.max_packet_size,
 		     prot, MAP_SHARED, handle->iso.fd, 0);
 
 	if (handle->iso.buffer == MAP_FAILED) {
@@ -432,7 +432,7 @@ iso_init(raw1394handle_t handle, int typ
 	}
 
 	handle->iso.buffer_end = handle->iso.buffer + 
-		buf_packets * max_packet_size;
+		buf_packets * handle->iso.max_packet_size;
 	handle->iso.head = handle->iso.buffer;
 	handle->iso.tail = handle->iso.buffer;
 	handle->iso.first_payload = handle->iso.buffer;

libraw1394-juju-no-double-free-on-shutdown.patch:

Index: libraw1394-juju-no-double-free-on-shutdown.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/F-8/libraw1394-juju-no-double-free-on-shutdown.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libraw1394-juju-no-double-free-on-shutdown.patch	21 Oct 2007 20:16:40 -0000	1.1
+++ libraw1394-juju-no-double-free-on-shutdown.patch	28 Apr 2008 22:12:54 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naurp libraw1394-1.3.0/juju/raw1394-iso.c libraw1394-1.3.0.fix/juju/raw1394-iso.c
---- libraw1394-1.3.0/juju/raw1394-iso.c	2007-10-19 16:05:09.000000000 -0400
-+++ libraw1394-1.3.0.fix/juju/raw1394-iso.c	2007-10-19 17:14:40.000000000 -0400
+--- libraw1394-1.3.0/juju/raw1394-iso.c	2007-10-22 13:55:58.000000000 -0400
++++ libraw1394-1.3.0.fix/juju/raw1394-iso.c	2007-10-22 15:27:54.000000000 -0400
 @@ -394,6 +394,7 @@ iso_init(raw1394handle_t handle, int typ
  	handle->iso.fd = open(handle->local_filename, O_RDWR);
  	if (handle->iso.fd < 0) {
@@ -34,3 +34,18 @@
  		return -1;
  	}
  
+@@ -515,8 +520,12 @@ void raw1394_iso_stop(raw1394handle_t ha
+ 
+ void raw1394_iso_shutdown(raw1394handle_t handle)
+ {
+-	munmap(handle->iso.buffer,
+-	       handle->iso.buf_packets * handle->iso.max_packet_size);
++	if (handle->iso.buffer) {
++		munmap(handle->iso.buffer,
++		       handle->iso.buf_packets * handle->iso.max_packet_size);
++		handle->iso.buffer = NULL;
++	}
+ 	close(handle->iso.fd);
+ 	free(handle->iso.packets);
++	handle->iso.packets = NULL;
+ }


Index: libraw1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/F-8/libraw1394.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libraw1394.spec	24 Oct 2007 21:07:37 -0000	1.38
+++ libraw1394.spec	28 Apr 2008 22:12:54 -0000	1.39
@@ -1,19 +1,19 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
 Version:        1.3.0
-Release:        3%{?dist}
-License:        LGPL
+Release:        6%{?dist}
+License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
 URL:            http://www.linux1394.org/
 ExcludeArch:    s390 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	autoconf automake libtool
+BuildRequires:  autoconf automake libtool kernel-headers
 
-Source1:        firewire-cdev.h
 Patch0:         libraw1394-juju.patch
 Patch1:         libraw1394-juju-no-double-free-on-shutdown.patch
 Patch2:         libraw1394-juju-bitfield-update.patch
+Patch3:         libraw1394-juju-munmap-correct-max_packet_size.patch
 
 %description
 The libraw1394 library provides direct access to the IEEE-1394 bus through
@@ -30,17 +30,12 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .juju
+%patch0 -p1
 %patch1 -p1 -b .free
 %patch2 -p1 -b .bitf
+%patch3 -p1 -b .munmap
 
 %build
-
-if test ! -e %{_builddir}/linux/firewire-cdev.h; then
-	mkdir %{_builddir}/linux
-	cp %{_sourcedir}/firewire-cdev.h %{_builddir}/linux
-fi
-
 aclocal
 autoheader
 autoconf
@@ -81,6 +76,16 @@
 
 
 %changelog
+* Mon Apr 28 2008 Jarod Wilson <jwilson at redhat.com> - 1.3.0-6
+- Unmap the correct memory range on iso receive teardown, fixes
+  segfault on exit from dvgrab (Mladen Kuntner, #444354)
+
+* Tue Feb 26 2008 Jarod Wilson <jwilson at redhat.com> - 1.3.0-5
+- Update license and kill an errant tab (#226039)
+
+* Wed Jan 30 2008 Jarod Wilson <jwilson at redhat.com> - 1.3.0-4
+- Use firewire-cdev.h provided by kernel-headers
+
 * Wed Oct 24 2007 Jarod Wilson <jwilson at redhat.com> - 1.3.0-3
 - Update firewire-cdev.h to match kernel and eliminate
   bitfield usage, fixes capture on big-endian systems (#345221)