[gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/files/, sys-fs/squashfs-tools/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/files/, sys-fs/squashfs-tools/
@ 2016-04-13 18:41 Mike Frysinger
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-04-13 18:41 UTC (permalink / raw
  To: gentoo-commits

commit:     fce1098ddbdcbbcb84bd34430de4bcad597cd8fc
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 18:29:58 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 18:40:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce1098d

sys-fs/squashfs-tools: fix building w/newer glibc

 .../files/squashfs-tools-4.3-sysmacros.patch       | 25 ++++++++++++++++++++++
 sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild    |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch
new file mode 100644
index 0000000..1430b1a
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch
@@ -0,0 +1,25 @@
+sys/types.h might not always include sys/sysmacros.h for major/minor/makedev
+
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -59,6 +59,7 @@
+ #else
+ #include <endian.h>
+ #include <sys/sysinfo.h>
++#include <sys/sysmacros.h>
+ #endif
+ 
+ #include "squashfs_fs.h"
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -38,6 +38,10 @@
+ #include <limits.h>
+ #include <ctype.h>
+ 
++#ifdef linux
++#include <sys/sysmacros.h>
++#endif
++
+ struct cache *fragment_cache, *data_cache;
+ struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
+ pthread_t *thread, *inflator_thread;

diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
index ae89fac..fb5398a 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/squashfs${PV}/${PN}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sysmacros.patch
+}
+
 use10() { usex $1 1 2 ; }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/files/, sys-fs/squashfs-tools/
@ 2016-04-13 18:56 Mike Frysinger
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-04-13 18:56 UTC (permalink / raw
  To: gentoo-commits

commit:     3b8c17be3cf2049b43b29a6c001b5b7598b1af9b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 18:55:14 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 18:55:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b8c17be

sys-fs/squashfs-tools: apply debian patchset #576314

This gets us a few fixes and some man pages.

Also fix some unaligned issues when running mksquashfs.

 sys-fs/squashfs-tools/Manifest                     |  1 +
 .../files/squashfs-tools-4.3-aligned-data.patch    | 15 +++++
 sys-fs/squashfs-tools/squashfs-tools-4.3-r1.ebuild | 64 ++++++++++++++++++++++
 3 files changed, 80 insertions(+)

diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 89f24ed..b76fa6f 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,4 @@
+DIST squashfs-tools_4.3-3.debian.tar.xz 15252 SHA256 1c296cc147e322e7124bf23a3c242ac83f6a986e6d6f64829ad2424b33914fc4 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae WHIRLPOOL 4f5a12a3371f2adced8f3a50b1d25db4420c2ff63856bbe74489e945c4698eb0e327ce677e442678849118f45351d01b14aef075ed78e6c09acb83ce56c99c3d
 DIST squashfs3.2-r2.tar.gz 314764 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7 SHA512 983f1fa966c15fb4929eaaf2d88401aac72f6d04e8c5523bd46397bc28928ff13b638e0e96bc09650627449c37f6a654ffa727445f1e9ca13cdc9de4fc43012f WHIRLPOOL 14b22cfc16e5c9bc91a5e02b9d4b64589339162d59613b12c2344acbed34690616a7a0254d9a63f839e96ff4b850f30fd7e1e855aecb76423356f4b1d8582129
 DIST squashfs3.4.tar.gz 352660 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339 SHA512 5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe WHIRLPOOL 7c113f3a66d0d28310302017e5f317d14bb5576e680a8f94e687193a376db92c54920be7d1121637f860cafa802d665ba419115e976b07029ca1f0c51953972d
 DIST squashfs4.3.tar.gz 182550 SHA256 0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6 SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 WHIRLPOOL c819f416b34cc46a232b8bc385017774603f81b4a865e6b97208004c183ebad5de7d0f726be444f8cb4e1d450abed9340dab730aec0762407f034e99b39bdc06

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch
new file mode 100644
index 0000000..024129f
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch
@@ -0,0 +1,15 @@
+the mksquashfs code has an all_zeros func that does:
+	long *p = (long *) file_buffer->data;
+
+make sure we force the data field to be aligned so that still works.
+
+--- a/squashfs-tools/caches-queues-lists.h
++++ b/squashfs-tools/caches-queues-lists.h
+@@ -123,6 +123,7 @@ struct file_buffer {
+ 	char locked;
+ 	char wait_on_unlock;
+ 	char noD;
++	long _pad;
+ 	char data[0];
+ };
+ 

diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r1.ebuild
new file mode 100644
index 0000000..9a3ccd0
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DEB_VER="3"
+
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net"
+SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="lz4 lzma lzo xattr +xz"
+
+RDEPEND="
+	sys-libs/zlib
+	!xz? ( !lzo? ( sys-libs/zlib ) )
+	lz4? ( app-arch/lz4 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )
+	xz? ( app-arch/xz-utils )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/squashfs${PV}/${PN}"
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/*.patch
+	epatch "${FILESDIR}"/${P}-sysmacros.patch
+	epatch "${FILESDIR}"/${P}-aligned-data.patch
+}
+
+use10() { usex $1 1 0 ; }
+
+src_configure() {
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		LZMA_XZ_SUPPORT=$(use10 lzma)
+		LZO_SUPPORT=$(use10 lzo)
+		LZ4_SUPPORT=$(use10 lz4)
+		XATTR_SUPPORT=$(use10 xattr)
+		XZ_SUPPORT=$(use10 xz)
+	)
+
+	tc-export CC
+}
+
+src_compile() {
+	emake "${EMAKE_SQUASHFS_CONF[@]}"
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs
+	cd ..
+	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
+	doman "${WORKDIR}"/debian/manpages/*.[0-9]
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/files/, sys-fs/squashfs-tools/
@ 2019-03-14 15:15 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2019-03-14 15:15 UTC (permalink / raw
  To: gentoo-commits

commit:     3dd88b674ce2c8519c1452ea0eddd181036d84b6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 15:13:48 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 15:15:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dd88b67

sys-fs/squashfs-tools: Fix includes

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Bug: https://bugs.gentoo.org/show_bug.cgi?id=575232
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../files/squashfs-tools-3.2-makedev.patch         | 20 +++++++++++
 .../files/squashfs-tools-3.4-makedev.patch         | 20 +++++++++++
 .../squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild | 42 ++++++++++++++++++++++
 sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild | 42 ++++++++++++++++++++++
 4 files changed, 124 insertions(+)

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch
new file mode 100644
index 00000000000..b7bffe01af9
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch
@@ -0,0 +1,20 @@
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -34,6 +34,7 @@
+ #include <zlib.h>
+ #include <sys/mman.h>
+ #include <utime.h>
++#include <sys/sysmacros.h> /* makedev */
+ 
+ #ifndef linux
+ #define __BYTE_ORDER BYTE_ORDER
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -44,6 +44,7 @@
+ #include <sys/mman.h>
+ #include <pthread.h>
+ #include <math.h>
++#include <sys/sysmacros.h> /* makedev */
+ 
+ #ifndef linux
+ #define __BYTE_ORDER BYTE_ORDER

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch
new file mode 100644
index 00000000000..17eb3ffaac2
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch
@@ -0,0 +1,20 @@
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -47,6 +47,7 @@
+ #include <math.h>
+ #include <regex.h>
+ #include <fnmatch.h>
++#include <sys/sysmacros.h> /* makedev */
+ 
+ #ifndef linux
+ #define __BYTE_ORDER BYTE_ORDER
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -47,6 +47,7 @@
+ #include <math.h>
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
++#include <sys/sysmacros.h> /* makedev */
+ 
+ #ifndef linux
+ #define __BYTE_ORDER BYTE_ORDER

diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild
new file mode 100644
index 00000000000..969a1b0ad8d
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+MY_PV=${PV/_p/-r}
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3.0" # squashfs filesystem version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2-makedev.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:-O2:$(CFLAGS):' \
+		-e '/-lz/s:$: $(LDFLAGS):' \
+		Makefile || die
+
+	echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	newbin mksquashfs mksquashfs-${SLOT}
+	newbin unsquashfs unsquashfs-${SLOT}
+	cd ..
+	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2
+}

diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild
new file mode 100644
index 00000000000..4b252ea0438
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+MY_PV=${PV/_p/-r}
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3.1" # squashfs filesystem version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-makedev.patch
+)
+S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:-O2:$(CFLAGS):' \
+		-e '/-lz/s:$: $(LDFLAGS):' \
+		Makefile || die
+
+	sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	newbin mksquashfs mksquashfs-${SLOT}
+	newbin unsquashfs unsquashfs-${SLOT}
+	cd ..
+	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/files/, sys-fs/squashfs-tools/
@ 2019-03-24 17:09 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2019-03-24 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     d82977346f4dfe0084ef74037fef2e38a3e130c6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 17:09:34 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 17:09:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8297734

sys-fs/squashfs-tools: Also remove newly-added vulnerable ebuilds

Fixes: d4600db3d6bf1b83fe97517caec6c8f57d150db7
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/squashfs-tools-3.2-makedev.patch         | 20 -----------
 .../files/squashfs-tools-3.4-makedev.patch         | 20 -----------
 .../squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild | 42 ----------------------
 sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild | 42 ----------------------
 4 files changed, 124 deletions(-)

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch
deleted file mode 100644
index c55d905dae1..00000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/unsquashfs.c
-+++ b/unsquashfs.c
-@@ -34,6 +34,7 @@
- #include <zlib.h>
- #include <sys/mman.h>
- #include <utime.h>
-+#include <sys/sysmacros.h> /* makedev */
- 
- #ifndef linux
- #define __BYTE_ORDER BYTE_ORDER
---- a/mksquashfs.c
-+++ b/mksquashfs.c
-@@ -44,6 +44,7 @@
- #include <sys/mman.h>
- #include <pthread.h>
- #include <math.h>
-+#include <sys/sysmacros.h> /* makedev */
- 
- #ifndef linux
- #define __BYTE_ORDER BYTE_ORDER

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch
deleted file mode 100644
index da9d6bed456..00000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/mksquashfs.c
-+++ b/mksquashfs.c
-@@ -47,6 +47,7 @@
- #include <math.h>
- #include <regex.h>
- #include <fnmatch.h>
-+#include <sys/sysmacros.h> /* makedev */
- 
- #ifndef linux
- #define __BYTE_ORDER BYTE_ORDER
---- a/unsquashfs.c
-+++ b/unsquashfs.c
-@@ -47,6 +47,7 @@
- #include <math.h>
- #include <sys/ioctl.h>
- #include <sys/time.h>
-+#include <sys/sysmacros.h> /* makedev */
- 
- #ifndef linux
- #define __BYTE_ORDER BYTE_ORDER

diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild
deleted file mode 100644
index 969a1b0ad8d..00000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-MY_PV=${PV/_p/-r}
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3.0" # squashfs filesystem version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-makedev.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:-O2:$(CFLAGS):' \
-		-e '/-lz/s:$: $(LDFLAGS):' \
-		Makefile || die
-
-	echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	newbin mksquashfs mksquashfs-${SLOT}
-	newbin unsquashfs unsquashfs-${SLOT}
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2
-}

diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild
deleted file mode 100644
index 4b252ea0438..00000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-MY_PV=${PV/_p/-r}
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3.1" # squashfs filesystem version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4-makedev.patch
-)
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:-O2:$(CFLAGS):' \
-		-e '/-lz/s:$: $(LDFLAGS):' \
-		Makefile || die
-
-	sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	newbin mksquashfs mksquashfs-${SLOT}
-	newbin unsquashfs unsquashfs-${SLOT}
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/files/, sys-fs/squashfs-tools/
@ 2020-05-05  9:56 Matt Turner
  0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2020-05-05  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     713a51583500ffe09d91c167f7dc82dde50d8b3e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 09:55:32 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May  5 09:55:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=713a5158

sys-fs/squashfs-tools: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../files/squashfs-tools-4.3-2gb.patch             |  30 -----
 .../files/squashfs-tools-4.3-aligned-data.patch    |  15 ---
 .../files/squashfs-tools-4.3-extmatch.patch        | 121 ---------------------
 .../files/squashfs-tools-4.3-local-cve-fix.patch   |  19 ----
 .../files/squashfs-tools-4.3-mem-overflow.patch    |  35 ------
 .../files/squashfs-tools-4.3-musl.patch            |  24 ----
 .../files/squashfs-tools-4.3-sysmacros.patch       |  25 -----
 .../files/squashfs-tools-4.3-xattrs.patch          |  34 ------
 sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild |  75 -------------
 .../squashfs-tools/squashfs-tools-4.3_p12.ebuild   |  84 --------------
 sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild |  82 --------------
 sys-fs/squashfs-tools/squashfs-tools-9999.ebuild   |   4 -
 12 files changed, 548 deletions(-)

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-2gb.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-2gb.patch
deleted file mode 100644
index 467448f6263..00000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-2gb.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9c1db6d13a51a2e009f0027ef336ce03624eac0d Mon Sep 17 00:00:00 2001
-From: "Guan, Xin" <guanx.bac@gmail.com>
-Date: Sat, 13 Sep 2014 13:15:26 +0200
-Subject: [PATCH] Fix 2GB-limit of the is_fragment(...) function.
-
-Applies to squashfs-tools 4.3.
-
-Reported-by: Bruno Wolff III <bruno@wolff.to>
-Signed-off-by: Guan, Xin <guanx.bac@gmail.com>
-Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
----
- squashfs-tools/mksquashfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
-index f1fcff1cc284..d221c35865a0 100644
---- a/squashfs-tools/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -2029,7 +2029,7 @@ struct file_info *duplicate(long long file_size, long long bytes,
- 
- inline int is_fragment(struct inode_info *inode)
- {
--	int file_size = inode->buf.st_size;
-+	off_t file_size = inode->buf.st_size;
- 
- 	/*
- 	 * If this block is to be compressed differently to the
--- 
-2.8.2
-

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch
deleted file mode 100644
index 024129ffa95..00000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-the mksquashfs code has an all_zeros func that does:
-	long *p = (long *) file_buffer->data;
-
-make sure we force the data field to be aligned so that still works.
-
---- a/squashfs-tools/caches-queues-lists.h
-+++ b/squashfs-tools/caches-queues-lists.h
-@@ -123,6 +123,7 @@ struct file_buffer {
- 	char locked;
- 	char wait_on_unlock;
- 	char noD;
-+	long _pad;
- 	char data[0];
- };
- 

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch
deleted file mode 100644
index 7ffc062006c..00000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From https://github.com/plougher/squashfs-tools/pull/9
-
-From 4280e74de14070869787a9166242f9ce2dafd82e Mon Sep 17 00:00:00 2001
-From: Alexandru Ardelean <aa@ocedo.com>
-Date: Wed, 6 Jan 2016 15:33:43 +0200
-Subject: [PATCH] squashfs-tools: with fnmatch.h compatibility with musl
-
-musl does not define FNM_EXTMATCH
-
-Signed-off-by: Alexandru Ardelean <aa@ocedo.com>
----
- squashfs-tools/action.c         |  2 +-
- squashfs-tools/fnmatch_compat.h | 32 ++++++++++++++++++++++++++++++++
- squashfs-tools/mksquashfs.c     |  2 +-
- squashfs-tools/unsquashfs.c     |  1 +
- squashfs-tools/unsquashfs.h     |  1 -
- 5 files changed, 35 insertions(+), 3 deletions(-)
- create mode 100644 squashfs-tools/fnmatch_compat.h
-
-diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c
-index 35889a4..4b06ccb 100644
---- a/squashfs-tools/action.c
-+++ b/squashfs-tools/action.c
-@@ -31,7 +31,6 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
--#include <fnmatch.h>
- #include <pwd.h>
- #include <grp.h>
- #include <sys/wait.h>
-@@ -43,6 +42,7 @@
- #include "mksquashfs.h"
- #include "action.h"
- #include "error.h"
-+#include "fnmatch_compat.h"
- 
- /*
-  * code to parse actions
-diff --git a/squashfs-tools/fnmatch_compat.h b/squashfs-tools/fnmatch_compat.h
-new file mode 100644
-index 0000000..7b4afd8
---- /dev/null
-+++ b/squashfs-tools/fnmatch_compat.h
-@@ -0,0 +1,32 @@
-+#ifndef FNMATCH_COMPAT
-+#define FNMATCH_COMPAT
-+/*
-+ * Squashfs
-+ *
-+ * Copyright (c) 2015
-+ * Phillip Lougher <phillip@squashfs.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * fnmatch_compat.h
-+ */
-+
-+#include <fnmatch.h>
-+
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH	0
-+#endif
-+
-+#endif
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
-index d221c35..4e7cbdd 100644
---- a/squashfs-tools/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -46,7 +46,6 @@
- #include <sys/mman.h>
- #include <pthread.h>
- #include <regex.h>
--#include <fnmatch.h>
- #include <sys/wait.h>
- #include <limits.h>
- #include <ctype.h>
-@@ -76,6 +75,7 @@
- #include "read_fs.h"
- #include "restore.h"
- #include "process_fragments.h"
-+#include "fnmatch_compat.h"
- 
- int delete = FALSE;
- int fd;
-diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
-index 1323dd6..2428baa 100644
---- a/squashfs-tools/unsquashfs.c
-+++ b/squashfs-tools/unsquashfs.c
-@@ -30,6 +30,7 @@
- #include "xattr.h"
- #include "unsquashfs_info.h"
- #include "stdarg.h"
-+#include "fnmatch_compat.h"
- 
- #include <sys/sysinfo.h>
- #include <sys/types.h>
-diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h
-index ecd0bb4..0edbd25 100644
---- a/squashfs-tools/unsquashfs.h
-+++ b/squashfs-tools/unsquashfs.h
-@@ -40,7 +40,6 @@
- #include <grp.h>
- #include <time.h>
- #include <regex.h>
--#include <fnmatch.h>
- #include <signal.h>
- #include <pthread.h>
- #include <math.h>

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch
deleted file mode 100644
index dca6ab68e67..00000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-taken from Fedora
-
-commit af393379e34c5677f95bbec11645b6c3028195b4
-Author: Bruno Wolff III <bruno@wolff.to>
-Date:   Wed Jun 24 14:27:31 2015 -0500
-
-Update printf formats to match datatypes after CVE patch
-
---- a/squashfs-tools/unsquash-4.c
-+++ b/squashfs-tools/unsquash-4.c
-@@ -35,7 +35,7 @@
- 	size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments);
- 	long long *fragment_table_index;
- 
--	TRACE("read_fragment_table: %d fragments, reading %d fragment indexes "
-+	TRACE("read_fragment_table: %u fragments, reading %zu fragment indexes "
- 		"from 0x%llx\n", sBlk.s.fragments, indexes,
- 		sBlk.s.fragment_table_start);
- 

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch
deleted file mode 100644
index a9b000149e4..00000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-taken from Fedora
-
-From 604b607d8ac91eb8afc0b6e3d917d5c073096103 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@squashfs.org.uk>
-Date: Wed, 11 Jun 2014 04:51:37 +0100
-Subject: mksquashfs: ensure value does not overflow a signed int in -mem
- option
-
-Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
-
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
-index 5370ecf..9676dc8 100644
---- a/squashfs-tools/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -5193,7 +5193,16 @@ print_compressor_options:
- 					 argv[0]);
- 				exit(1);
- 			}
--			/* convert from bytes to Mbytes */
-+
-+			/*
-+			 * convert from bytes to Mbytes, ensuring the value
-+			 * does not overflow a signed int
-+			 */
-+			if(number >= (1LL << 51)) {
-+				ERROR("%s: -mem invalid mem size\n", argv[0]);
-+				exit(1);
-+			}
-+
- 			total_mem = number / 1048576;
- 			if(total_mem < (SQUASHFS_LOWMEM / SQUASHFS_TAKE)) {
- 				ERROR("%s: -mem should be %d Mbytes or "
--- 
-cgit v0.10.1
-

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch
deleted file mode 100644
index 52b7f48c8ea..00000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From https://github.com/plougher/squashfs-tools/pull/9
-
-From b0ca8a5c98ff73e70b2ab1bc24aa824aa2458287 Mon Sep 17 00:00:00 2001
-From: Alexandru Ardelean <aa@ocedo.com>
-Date: Wed, 6 Jan 2016 15:36:48 +0200
-Subject: [PATCH] pseudo.c: add explicit <sys/stat.h> include
-
-Signed-off-by: Alexandru Ardelean <aa@ocedo.com>
----
- squashfs-tools/pseudo.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c
-index f85fe60..83bfc97 100644
---- a/squashfs-tools/pseudo.c
-+++ b/squashfs-tools/pseudo.c
-@@ -32,6 +32,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/stat.h>
- #include <ctype.h>
- 
- #include "pseudo.h"

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch
deleted file mode 100644
index 1430b1a2ee0..00000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-sys/types.h might not always include sys/sysmacros.h for major/minor/makedev
-
---- a/squashfs-tools/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -59,6 +59,7 @@
- #else
- #include <endian.h>
- #include <sys/sysinfo.h>
-+#include <sys/sysmacros.h>
- #endif
- 
- #include "squashfs_fs.h"
---- a/squashfs-tools/unsquashfs.c
-+++ b/squashfs-tools/unsquashfs.c
-@@ -38,6 +38,10 @@
- #include <limits.h>
- #include <ctype.h>
- 
-+#ifdef linux
-+#include <sys/sysmacros.h>
-+#endif
-+
- struct cache *fragment_cache, *data_cache;
- struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
- pthread_t *thread, *inflator_thread;

diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-xattrs.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-xattrs.patch
deleted file mode 100644
index 47b0ea5c985..00000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-xattrs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ffe9e55c4993422ce36213fa86d4fc29c22646ea Mon Sep 17 00:00:00 2001
-From: Wessel Dankers <wsl-debian-804194@fruit.je>
-Date: Fri, 17 Jun 2016 09:46:42 +0800
-Subject: [PATCH] unsquashfs: Correctly set file capabilities
-
-As posted on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804194.
----
- squashfs-tools/unsquashfs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
-index 1323dd6..a5f0117 100644
---- a/squashfs-tools/unsquashfs.c
-+++ b/squashfs-tools/unsquashfs.c
-@@ -821,8 +821,6 @@ int set_attributes(char *pathname, int mode, uid_t uid, gid_t guid, time_t time,
- {
- 	struct utimbuf times = { time, time };
- 
--	write_xattr(pathname, xattr);
--
- 	if(utime(pathname, &times) == -1) {
- 		ERROR("set_attributes: failed to set time on %s, because %s\n",
- 			pathname, strerror(errno));
-@@ -845,6 +843,8 @@ int set_attributes(char *pathname, int mode, uid_t uid, gid_t guid, time_t time,
- 		return FALSE;
- 	}
- 
-+	write_xattr(pathname, xattr);
-+
- 	return TRUE;
- }
- 
--- 
-2.8.0.rc3.226.g39d4020

diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
deleted file mode 100644
index 815ea61e692..00000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DEB_VER="3"
-
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="debug lz4 lzma lzo static xattr +xz"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]
-	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
-	lz4? ( app-arch/lz4[static-libs(+)] )
-	lzma? ( app-arch/xz-utils[static-libs(+)] )
-	lzo? ( dev-libs/lzo[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xz? ( app-arch/xz-utils[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/squashfs${PV}/${PN}"
-
-src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/*.patch
-	epatch "${FILESDIR}"/${P}-sysmacros.patch
-	epatch "${FILESDIR}"/${P}-aligned-data.patch
-	epatch "${FILESDIR}"/${P}-2gb.patch
-	epatch "${FILESDIR}"/${P}-local-cve-fix.patch
-	epatch "${FILESDIR}"/${P}-mem-overflow.patch
-	epatch "${FILESDIR}"/${P}-xattrs.patch
-	epatch "${FILESDIR}"/${P}-extmatch.patch
-	epatch "${FILESDIR}"/${P}-musl.patch
-}
-
-use10() { usex $1 1 0 ; }
-
-src_configure() {
-	# restore GNU89 inline semantics to
-	# emit function symbols, bug 595290
-	append-cflags -std=gnu89
-
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 xz)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}"
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs
-	cd ..
-	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
-	doman "${WORKDIR}"/debian/manpages/*.[0-9]
-}

diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild
deleted file mode 100644
index a27640c99e3..00000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="
-	mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug lz4 lzma lzo static xattr +xz zstd"
-
-LIB_DEPEND="
-	sys-libs/zlib[static-libs(+)]
-	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
-	lz4? ( app-arch/lz4[static-libs(+)] )
-	lzma? ( app-arch/xz-utils[static-libs(+)] )
-	lzo? ( dev-libs/lzo[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xz? ( app-arch/xz-utils[static-libs(+)] )
-	zstd? ( app-arch/zstd[static-libs(+)] )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*}-sysmacros.patch
-	"${FILESDIR}"/${P/_p*}-aligned-data.patch
-	"${FILESDIR}"/${P/_p*}-local-cve-fix.patch
-	"${FILESDIR}"/${P/_p*}-mem-overflow.patch
-	"${FILESDIR}"/${P/_p*}-extmatch.patch
-	"${FILESDIR}"/${P/_p*}-musl.patch
-)
-
-S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
-
-src_prepare() {
-	eapply -p2 "${WORKDIR}"/debian/patches/*.patch
-	eapply -p2 ${PATCHES[@]}
-	eapply_user
-}
-
-use10() { usex $1 1 0 ; }
-
-src_configure() {
-	# restore GNU89 inline semantics to
-	# emit function symbols, bug 595290
-	append-cflags -std=gnu89
-
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 xz)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}"
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs
-	cd ..
-	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
-	doman "${WORKDIR}"/debian/manpages/*.[0-9]
-}

diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
deleted file mode 100644
index fb773fd1d5f..00000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="
-	mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="debug lz4 lzma lzo static xattr +xz"
-
-LIB_DEPEND="
-	sys-libs/zlib[static-libs(+)]
-	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
-	lz4? ( app-arch/lz4[static-libs(+)] )
-	lzma? ( app-arch/xz-utils[static-libs(+)] )
-	lzo? ( dev-libs/lzo[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xz? ( app-arch/xz-utils[static-libs(+)] )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*}-sysmacros.patch
-	"${FILESDIR}"/${P/_p*}-aligned-data.patch
-	"${FILESDIR}"/${P/_p*}-local-cve-fix.patch
-	"${FILESDIR}"/${P/_p*}-mem-overflow.patch
-	"${FILESDIR}"/${P/_p*}-extmatch.patch
-	"${FILESDIR}"/${P/_p*}-musl.patch
-)
-
-S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
-
-src_prepare() {
-	eapply -p2 "${WORKDIR}"/debian/patches/*.patch
-	eapply -p2 ${PATCHES[@]}
-	eapply_user
-}
-
-use10() { usex $1 1 0 ; }
-
-src_configure() {
-	# restore GNU89 inline semantics to
-	# emit function symbols, bug 595290
-	append-cflags -std=gnu89
-
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 xz)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}"
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs
-	cd ..
-	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
-	doman "${WORKDIR}"/debian/manpages/*.[0-9]
-}

diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index 1234cc3f4c5..cb91a13dd1e 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
@@ -32,10 +32,6 @@ DEPEND="
 	${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3-sysmacros.patch
-)
-
 use10() { usex $1 1 0 ; }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-05-05  9:56 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-14 15:15 [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/files/, sys-fs/squashfs-tools/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2020-05-05  9:56 Matt Turner
2019-03-24 17:09 Michał Górny
2016-04-13 18:56 Mike Frysinger
2016-04-13 18:41 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox