[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2020-05-27 Thread Sergej Pupykin via arch-commits 
Date: Wednesday, May 27, 2020 @ 21:53:42
  Author: spupykin
Revision: 636090

upgpkg: squashfs-tools 4.4-2

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-27 21:47:04 UTC (rev 636089)
+++ PKGBUILD2020-05-27 21:53:42 UTC (rev 636090)
@@ -5,8 +5,8 @@
 
 pkgname=squashfs-tools
 pkgver=4.4
-pkgrel=1
-_commit=52eb4c279cd283ed9802dd1ceb686560b22ffb67
+pkgrel=2
+_commit=c570c6188811088b12ffdd9665487a2960c997a0
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for 
Linux."
 url="https://github.com/plougher/squashfs-tools;
 license=("GPL")

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2019-09-02 Thread Sergej Pupykin via arch-commits 
Date: Monday, September 2, 2019 @ 11:21:34
  Author: spupykin
Revision: 507029

upgpkg: squashfs-tools 4.4-1

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-02 11:21:29 UTC (rev 507028)
+++ PKGBUILD2019-09-02 11:21:34 UTC (rev 507029)
@@ -4,9 +4,9 @@
 # Contributor: ciccio.a
 
 pkgname=squashfs-tools
-pkgver=4.3
-pkgrel=8
-_commit=6e242dc95485ada8d1d0b3dd9346c5243d4a517f
+pkgver=4.4
+pkgrel=1
+_commit=52eb4c279cd283ed9802dd1ceb686560b22ffb67
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for 
Linux."
 url="https://github.com/plougher/squashfs-tools;
 license=("GPL")

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2018-12-10 Thread Sergej Pupykin via arch-commits 
Date: Monday, December 10, 2018 @ 08:51:23
  Author: spupykin
Revision: 413876

upgpkg: squashfs-tools 4.3-8

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |   26 +++---
 1 file changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-10 08:50:14 UTC (rev 413875)
+++ PKGBUILD2018-12-10 08:51:23 UTC (rev 413876)
@@ -5,27 +5,24 @@
 
 pkgname=squashfs-tools
 pkgver=4.3
-pkgrel=7
+pkgrel=8
+_commit=6e242dc95485ada8d1d0b3dd9346c5243d4a517f
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for 
Linux."
-url="http://squashfs.sourceforge.net;
+url="https://github.com/plougher/squashfs-tools;
 license=("GPL")
 arch=('x86_64')
 depends=('zlib' 'lzo' 'xz' 'lz4' 'zstd')
-source=("http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz;
-   
"https://sources.debian.org/data/main/s/squashfs-tools/1:4.3-6/debian/patches/0003-CVE-2015-4645_and_CVE-2015-4646.patch;
-   
"https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch;)
-sha512sums=('854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79'
-
'84bf4dc961387fd72a97229eda5432c2ba97211541131cb5a5032d7a807a675d5423473b9df2ad5341514dcb864daaeadca8ae9c8543eb3efb499f5baf838bb0'
-
'c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a')
+makedepends=('git')
+source=("git+https://github.com/plougher/squashfs-tools#commit=${_commit};)
+sha256sums=('SKIP')
 
 prepare() {
-cd "$srcdir"/squashfs${pkgver}/${pkgname}
-patch -p2 -i ../../squashfs-tools-4.3-sysmacros.patch
-patch -p2 -i ../../0003-CVE-2015-4645_and_CVE-2015-4646.patch
+cd "$srcdir"/${pkgname}/${pkgname}
+sed -i '1,1i#include ' mksquashfs.c unsquashfs.c
 }
 
 build() {
-cd "$srcdir"/squashfs${pkgver}/${pkgname}
+cd "$srcdir"/${pkgname}/${pkgname}
 make \
 GZIP_SUPPORT=1 \
 XZ_SUPPORT=1 \
@@ -37,7 +34,6 @@
 }
 
 package() {
-cd "$srcdir"/squashfs${pkgver}/${pkgname}
-install -Dm755 mksquashfs "$pkgdir"/usr/bin/mksquashfs
-install -m755 unsquashfs "$pkgdir"/usr/bin/unsquashfs
+cd "$srcdir"/${pkgname}/${pkgname}
+make install INSTALL_DIR="${pkgdir}"/usr/bin
 }

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2018-12-09 Thread Sergej Pupykin via arch-commits 
Date: Monday, December 10, 2018 @ 07:42:37
  Author: spupykin
Revision: 413772

upgpkg: squashfs-tools 4.3-7

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-10 07:42:27 UTC (rev 413771)
+++ PKGBUILD2018-12-10 07:42:37 UTC (rev 413772)
@@ -5,12 +5,12 @@
 
 pkgname=squashfs-tools
 pkgver=4.3
-pkgrel=6
+pkgrel=7
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for 
Linux."
 url="http://squashfs.sourceforge.net;
 license=("GPL")
 arch=('x86_64')
-depends=('zlib' 'lzo' 'xz' 'lz4')
+depends=('zlib' 'lzo' 'xz' 'lz4' 'zstd')
 
source=("http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz;

"https://sources.debian.org/data/main/s/squashfs-tools/1:4.3-6/debian/patches/0003-CVE-2015-4645_and_CVE-2015-4646.patch;

"https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch;)
@@ -26,7 +26,14 @@
 
 build() {
 cd "$srcdir"/squashfs${pkgver}/${pkgname}
-make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1
+make \
+GZIP_SUPPORT=1 \
+XZ_SUPPORT=1 \
+LZO_SUPPORT=1 \
+LZMA_XZ_SUPPORT=1 \
+LZ4_SUPPORT=1 \
+ZSTD_SUPPORT=1 \
+XATTR_SUPPORT=1
 }
 
 package() {

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2018-10-29 Thread Sergej Pupykin via arch-commits 
Date: Monday, October 29, 2018 @ 09:50:23
  Author: spupykin
Revision: 399402

upgpkg: squashfs-tools 4.3-6

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-29 09:42:58 UTC (rev 399401)
+++ PKGBUILD2018-10-29 09:50:23 UTC (rev 399402)
@@ -5,15 +5,25 @@
 
 pkgname=squashfs-tools
 pkgver=4.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for 
Linux."
 url="http://squashfs.sourceforge.net;
 license=("GPL")
 arch=('x86_64')
 depends=('zlib' 'lzo' 'xz' 'lz4')
-source=("http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz;)
-sha512sums=('854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79')
+source=("http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz;
+   
"https://sources.debian.org/data/main/s/squashfs-tools/1:4.3-6/debian/patches/0003-CVE-2015-4645_and_CVE-2015-4646.patch;
+   
"https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch;)
+sha512sums=('854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79'
+
'84bf4dc961387fd72a97229eda5432c2ba97211541131cb5a5032d7a807a675d5423473b9df2ad5341514dcb864daaeadca8ae9c8543eb3efb499f5baf838bb0'
+
'c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a')
 
+prepare() {
+cd "$srcdir"/squashfs${pkgver}/${pkgname}
+patch -p2 -i ../../squashfs-tools-4.3-sysmacros.patch
+patch -p2 -i ../../0003-CVE-2015-4645_and_CVE-2015-4646.patch
+}
+
 build() {
 cd "$srcdir"/squashfs${pkgver}/${pkgname}
 make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2018-06-07 Thread Felix Yan via arch-commits 
Date: Thursday, June 7, 2018 @ 06:10:14
  Author: felixonmars
Revision: 341665

upgpkg: squashfs-tools 4.3-5

BUILDINFO Rebuild

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-07 06:09:31 UTC (rev 341664)
+++ PKGBUILD2018-06-07 06:10:14 UTC (rev 341665)
@@ -6,7 +6,7 @@
 
 pkgname=squashfs-tools
 pkgver=4.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for 
Linux."
 url="http://squashfs.sourceforge.net;
 license=("GPL")
@@ -13,7 +13,7 @@
 arch=('x86_64')
 depends=('zlib' 'lzo' 'xz' 'lz4')
 
source=("http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz;)
-md5sums=('d92ab59aabf5173f2a59089531e30dbf')
+sha512sums=('854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79')
 
 build() {
 cd "$srcdir"/squashfs${pkgver}/${pkgname}

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2014-11-28 Thread Evangelos Foutras 
Date: Friday, November 28, 2014 @ 20:26:59
  Author: foutrelis
Revision: 123265

upgpkg: squashfs-tools 4.3-4

lz4 124 rebuild.

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-28 18:42:47 UTC (rev 123264)
+++ PKGBUILD2014-11-28 19:26:59 UTC (rev 123265)
@@ -6,7 +6,7 @@
 
 pkgname=squashfs-tools
 pkgver=4.3
-pkgrel=3
+pkgrel=4
 pkgdesc=Tools for squashfs, a highly compressed read-only filesystem for 
Linux.
 url=http://squashfs.sourceforge.net;
 license=(GPL)

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2014-08-05 Thread Sergej Pupykin 
Date: Tuesday, August 5, 2014 @ 12:09:56
  Author: spupykin
Revision: 116890

upgpkg: squashfs-tools 4.3-3

upd

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-05 10:09:51 UTC (rev 116889)
+++ PKGBUILD2014-08-05 10:09:56 UTC (rev 116890)
@@ -6,7 +6,7 @@
 
 pkgname=squashfs-tools
 pkgver=4.3
-pkgrel=2
+pkgrel=3
 pkgdesc=Tools for squashfs, a highly compressed read-only filesystem for 
Linux.
 url=http://squashfs.sourceforge.net;
 license=(GPL)

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2014-08-01 Thread Sergej Pupykin 
Date: Friday, August 1, 2014 @ 13:49:36
  Author: spupykin
Revision: 116700

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-01 11:49:22 UTC (rev 116699)
+++ PKGBUILD2014-08-01 11:49:36 UTC (rev 116700)
@@ -11,7 +11,7 @@
 url=http://squashfs.sourceforge.net;
 license=(GPL)
 arch=('i686' 'x86_64')
-depends=('zlib' 'lzo2' 'xz' 'lz4')
+depends=('zlib' 'lzo' 'xz' 'lz4')
 
source=(http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz;)
 md5sums=('d92ab59aabf5173f2a59089531e30dbf')

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2014-05-20 Thread Sergej Pupykin 
Date: Tuesday, May 20, 2014 @ 19:53:43
  Author: spupykin
Revision: 111583

upgpkg: squashfs-tools 4.3-2

upd

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-20 17:26:05 UTC (rev 111582)
+++ PKGBUILD2014-05-20 17:53:43 UTC (rev 111583)
@@ -6,18 +6,18 @@
 
 pkgname=squashfs-tools
 pkgver=4.3
-pkgrel=1
+pkgrel=2
 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' 'lzo2' 'xz')
+depends=('zlib' 'lzo2' 'xz' 'lz4')
 
source=(http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz;)
 md5sums=('d92ab59aabf5173f2a59089531e30dbf')
 
 build() {
 cd ${srcdir}/squashfs${pkgver}/${pkgname}
-make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1
+make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1
 }
 
 package() {

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2014-05-15 Thread Sergej Pupykin 
Date: Thursday, May 15, 2014 @ 16:18:19
  Author: spupykin
Revision: 111214

upgpkg: squashfs-tools 4.3-1

upd

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-15 14:18:14 UTC (rev 111213)
+++ PKGBUILD2014-05-15 14:18:19 UTC (rev 111214)
@@ -5,8 +5,8 @@
 # Contributor: ciccio.a
 
 pkgname=squashfs-tools
-pkgver=4.2
-pkgrel=4
+pkgver=4.3
+pkgrel=1
 pkgdesc=Tools for squashfs, a highly compressed read-only filesystem for 
Linux.
 url=http://squashfs.sourceforge.net;
 license=(GPL)
@@ -13,7 +13,7 @@
 arch=('i686' 'x86_64')
 depends=('zlib' 'lzo2' 'xz')
 
source=(http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz;)
-md5sums=('1b7a781fb4cf8938842279bd3e8ee852')
+md5sums=('d92ab59aabf5173f2a59089531e30dbf')
 
 build() {
 cd ${srcdir}/squashfs${pkgver}/${pkgname}

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2013-05-30 Thread Sergej Pupykin 
Date: Thursday, May 30, 2013 @ 11:44:20
  Author: spupykin
Revision: 91958

upgpkg: squashfs-tools 4.2-4

upd

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-30 09:44:15 UTC (rev 91957)
+++ PKGBUILD2013-05-30 09:44:20 UTC (rev 91958)
@@ -6,7 +6,7 @@
 
 pkgname=squashfs-tools
 pkgver=4.2
-pkgrel=3
+pkgrel=4
 pkgdesc=Tools for squashfs, a highly compressed read-only filesystem for 
Linux.
 url=http://squashfs.sourceforge.net;
 license=(GPL)
@@ -17,13 +17,11 @@
 
 build() {
 cd ${srcdir}/squashfs${pkgver}/${pkgname}
-sed -i 's|^#XZ_SUPPORT = 1|XZ_SUPPORT = 1|' Makefile
-sed -i 's|^#LZO_SUPPORT = 1|LZO_SUPPORT = 1|' Makefile
-make
+make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1
 }
 
 package() {
 cd ${srcdir}/squashfs${pkgver}/${pkgname}
-install -Dm755 mksquashfs ${pkgdir}/bin/mksquashfs
-install -m755 unsquashfs ${pkgdir}/bin/unsquashfs
+install -Dm755 mksquashfs ${pkgdir}/usr/bin/mksquashfs
+install -m755 unsquashfs ${pkgdir}/usr/bin/unsquashfs
 }

[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

2010-10-25 Thread Pierre Schmitz 
Date: Monday, October 25, 2010 @ 11:28:14
  Author: pierre
Revision: 96914

upgpkg: squashfs-tools 4.1-2
xz 5.0.0 rebuild

Modified:
  squashfs-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-25 15:25:45 UTC (rev 96913)
+++ PKGBUILD2010-10-25 15:28:14 UTC (rev 96914)
@@ -5,13 +5,13 @@
 
 pkgname=squashfs-tools
 pkgver=4.1
-pkgrel=1
+pkgrel=2
 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' 'lzo2' 'xz')
-source=(http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz;)
 md5sums=('8e1b2b96f5d5f3fe48fef226ae8cd341')
 
 build() {

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

2010-10-16 Thread 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
===
--- PKGBUILD2010-10-16 23:03:30 UTC (rev 95190)
+++ PKGBUILD2010-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.c2009-04-05 18:22:48.0 -0300
-+++ squashfs-tools/mksquashfs.c2010-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);
-

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

2010-02-25 Thread Daniel Griffiths 
Date: Thursday, February 25, 2010 @ 22:04:37
  Author: dgriffiths
Revision: 70328

FS#18277

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

---+
 PKGBUILD  |   14 --
 mksquashfs-fix-race.patch |   26 ++
 2 files changed, 34 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-26 02:53:01 UTC (rev 70327)
+++ PKGBUILD2010-02-26 03:04:37 UTC (rev 70328)
@@ -5,19 +5,21 @@
 
 pkgname=squashfs-tools
 pkgver=4.0
-pkgrel=1
+pkgrel=2
 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)
+source=(http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz
 mksquashfs-fix-race.patch)
 
 build()
 {
-cd $startdir/src/squashfs$pkgver/$pkgname
+cd ${srcdir}/squashfs${pkgver}/${pkgname}
+patch  ${srcdir}/mksquashfs-fix-race.patch || return 1
 make || return 1
-mkdir -p $startdir/pkg/sbin
-cp -a mksquashfs unsquashfs $startdir/pkg/sbin
+install -Dm755 mksquashfs ${pkgdir}/sbin/mksquashfs || return 1
+install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs || return 1
 }
-md5sums=('a3c23391da4ebab0ac4a75021ddabf96')
+md5sums=('a3c23391da4ebab0ac4a75021ddabf96'
+'39644a122e5a2cd44817ea6d24d0c8a0')

Added: mksquashfs-fix-race.patch
===
--- mksquashfs-fix-race.patch   (rev 0)
+++ mksquashfs-fix-race.patch   2010-02-26 03:04:37 UTC (rev 70328)
@@ -0,0 +1,26 @@
+--- 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.0 -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);
+

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

2010-02-25 Thread 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
===
--- PKGBUILD2010-02-26 03:26:08 UTC (rev 70338)
+++ PKGBUILD2010-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.0 -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.c2009-04-05 18:22:48.0 -0300
 squashfs-tools/mksquashfs.c2010-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);