[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD mksquashfs-fix-race.patch)

[Daniel Griffiths]

    Date: Thursday, February 25, 2010 @ 22:50:39
  Author: dgriffiths
Revision: 70339

I failed at patching. herrar es umano.

Modified:
  squashfs-tools/trunk/PKGBUILD
  squashfs-tools/trunk/mksquashfs-fix-race.patch

---------------------------+
 PKGBUILD                  |    4 +--
 mksquashfs-fix-race.patch |   47 ++++++++++++++++++++------------------------
 2 files changed, 24 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-26 03:26:08 UTC (rev 70338)
+++ PKGBUILD	2010-02-26 03:50:39 UTC (rev 70339)
@@ -5,7 +5,7 @@
 
 pkgname=squashfs-tools
 pkgver=4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
 url="http://squashfs.sourceforge.net"
 license=("GPL")
@@ -22,4 +22,4 @@
     install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs || return 1
 }
 md5sums=('a3c23391da4ebab0ac4a75021ddabf96'
-	 '39644a122e5a2cd44817ea6d24d0c8a0')
+	 '116b8a285ff8d61d59c48eb80c0ff564')

Modified: mksquashfs-fix-race.patch
===================================================================
--- mksquashfs-fix-race.patch	2010-02-26 03:26:08 UTC (rev 70338)
+++ mksquashfs-fix-race.patch	2010-02-26 03:50:39 UTC (rev 70339)
@@ -1,26 +1,23 @@
---- squashfs-tools/trunk/mksquashfs-fix-race.patch	(revision 0)
-+++ squashfs-tools/trunk/mksquashfs-fix-race.patch	(revision 0)
-@@ -0,0 +1,22 @@
-+--- squashfs-tools/mksquashfs.c	2009-04-05 18:22:48.000000000 -0300
-++++ squashfs-tools/mksquashfs.c	2010-02-10 17:04:29.303757175 -0300
-+@@ -1733,9 +1733,7 @@
-+ 		entry->buffer->block = bytes;
-+ 		bytes += compressed_size;
-+ 		fragments_outstanding --;
-+-		pthread_mutex_unlock(&fragment_mutex);
-+ 		queue_put(to_writer, entry->buffer);
-+-		pthread_mutex_lock(&fragment_mutex);
-+ 		TRACE("fragment_locked writing fragment %d, compressed size %d"
-+ 			"\n", entry->fragment, compressed_size);
-+ 		free(entry);
-+@@ -2426,8 +2424,8 @@
-+ 			write_buffer->block = bytes;
-+ 			bytes += compressed_size;
-+ 			fragments_outstanding --;
-+-			pthread_mutex_unlock(&fragment_mutex);
-+ 			queue_put(to_writer, write_buffer);
-++			pthread_mutex_unlock(&fragment_mutex);
-+ 			TRACE("Writing fragment %lld, uncompressed size %d, "
-+ 				"compressed size %d\n", file_buffer->block,
-+ 				file_buffer->size, compressed_size);
+--- squashfs-tools/mksquashfs.c	2009-04-05 18:22:48.000000000 -0300
++++ squashfs-tools/mksquashfs.c	2010-02-10 17:04:29.303757175 -0300
+@@ -1733,9 +1733,7 @@
+ 		entry->buffer->block = bytes;
+ 		bytes += compressed_size;
+ 		fragments_outstanding --;
+-		pthread_mutex_unlock(&fragment_mutex);
+ 		queue_put(to_writer, entry->buffer);
+-		pthread_mutex_lock(&fragment_mutex);
+ 		TRACE("fragment_locked writing fragment %d, compressed size %d"
+ 			"\n", entry->fragment, compressed_size);
+ 		free(entry);
+@@ -2426,8 +2424,8 @@
+ 			write_buffer->block = bytes;
+ 			bytes += compressed_size;
+ 			fragments_outstanding --;
+-			pthread_mutex_unlock(&fragment_mutex);
+ 			queue_put(to_writer, write_buffer);
++			pthread_mutex_unlock(&fragment_mutex);
+ 			TRACE("Writing fragment %lld, uncompressed size %d, "
+ 				"compressed size %d\n", file_buffer->block,
+ 				file_buffer->size, compressed_size);