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

[Thomas Bächler]

    Date: Saturday, October 16, 2010 @ 19:12:13
  Author: thomas
Revision: 95191

Upstream update, enable lzo and lzma. Also see FS#20986

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

---------------------------+
 PKGBUILD                  |   27 +++++++++++++++------------
 mksquashfs-fix-race.patch |   23 -----------------------
 2 files changed, 15 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-16 23:03:30 UTC (rev 95190)
+++ PKGBUILD	2010-10-16 23:12:13 UTC (rev 95191)
@@ -4,22 +4,25 @@
 # Contributor: ciccio.a
 
 pkgname=squashfs-tools
-pkgver=4.0
-pkgrel=3
+pkgver=4.1
+pkgrel=1
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
 url="http://squashfs.sourceforge.net"
 license=("GPL")
 arch=('i686' 'x86_64')
-depends=('zlib' 'glibc')
-source=(http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz mksquashfs-fix-race.patch)
+depends=('zlib' 'glibc' 'lzo2' 'xz')
+source=(http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz)
+md5sums=('8e1b2b96f5d5f3fe48fef226ae8cd341')
 
-build()
-{
+build() {
     cd ${srcdir}/squashfs${pkgver}/${pkgname}
-    patch < ${srcdir}/mksquashfs-fix-race.patch || return 1
-    make || return 1
-    install -Dm755 mksquashfs ${pkgdir}/sbin/mksquashfs || return 1
-    install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs || return 1
+    sed -i 's|^#XZ_SUPPORT = 1|XZ_SUPPORT = 1|' Makefile
+    sed -i 's|^#LZO_SUPPORT = 1|LZO_SUPPORT = 1|' Makefile
+    make
 }
-md5sums=('a3c23391da4ebab0ac4a75021ddabf96'
-	 '116b8a285ff8d61d59c48eb80c0ff564')
+
+package() {
+    cd ${srcdir}/squashfs${pkgver}/${pkgname}
+    install -Dm755 mksquashfs ${pkgdir}/sbin/mksquashfs
+    install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs
+}

Deleted: mksquashfs-fix-race.patch
===================================================================
--- mksquashfs-fix-race.patch	2010-10-16 23:03:30 UTC (rev 95190)
+++ mksquashfs-fix-race.patch	2010-10-16 23:12:13 UTC (rev 95191)
@@ -1,23 +0,0 @@
---- 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);
-