sys-fs/squashfs-tools: Debian patches version bump

3 files changed, 17 insertions, 23 deletions

diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 8190b395..85565f24 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,2 +1,2 @@
 DIST squashfs-tools-4.3.1_alpha20171129.tar.gz 230533 SHA512 309794f0a9a71d09e10cfa7383680a2b3f9559d0ed36d0d37d1f0f3b354d547c86639ac3f400b79d658db440bba891210645f697662b44a6949e152eb7012ef3
-DIST squashfs-tools_4.3-3.debian.tar.xz 15252 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae
+DIST squashfs-tools_4.3-6.debian.tar.xz 19060 SHA512 e2f64cdcfe01696980a45d4d6ec50e82626cb3e25e8c98d63b68c9754f519171fcfc4586b4ef88104e28275e1daf94a23f5b7dd08d37fe6e8417b054954de1e7
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171129.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171129-r1.ebuild
index 93ecc80a..81dc0801 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171129.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171129-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ case ${PV} in
 	LIVE=:;;
 esac
 Pm=${PN}-${PVm}
-DEB_VER="3"
+DEB_VER="6"
 
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
 HOMEPAGE="https://github.com/plougher/squashfs-tools/ https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git http://squashfs.sourceforge.net"
@@ -59,15 +59,12 @@ src_unpack() {
 fi
 
 src_prepare() {
-	local i j
-	for i in "${WORKDIR}"/debian/patches/*.patch; do
-		j=${i##*/}
-		case ${j%.*} in
-		0002-fix_phys_mem_calculation)
-			continue;;
-		esac
-		eapply -p2 "${i}"
-	done
+	local debian
+	debian="${WORKDIR}"/debian/patches
+	eapply -p2 "${debian}"/0001-kfreebsd.patch
+	eapply -p2 "${debian}"/0003-CVE-2015-4645_and_CVE-2015-4646.patch
+	eapply -p2 "${debian}"/0004-unsquashfs-add-support-for-LZMA-magics.patch
+	eapply -p2 "${debian}"/0009-unsquashfs-preserve-symlink-times.patch
 	eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
 	eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch
 	eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
diff --git a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-99999999-r1.ebuild
index 93ecc80a..f628b34e 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-99999999-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ case ${PV} in
 	LIVE=:;;
 esac
 Pm=${PN}-${PVm}
-DEB_VER="3"
+DEB_VER="6"
 
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
 HOMEPAGE="https://github.com/plougher/squashfs-tools/ https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git http://squashfs.sourceforge.net"
@@ -59,15 +59,12 @@ src_unpack() {
 fi
 
 src_prepare() {
-	local i j
-	for i in "${WORKDIR}"/debian/patches/*.patch; do
-		j=${i##*/}
-		case ${j%.*} in
-		0002-fix_phys_mem_calculation)
-			continue;;
-		esac
-		eapply -p2 "${i}"
-	done
+	local debian
+	debian="${WORKDIR}"/debian/patches/
+	eapply -p2 "${debian}"/0001-kfreebsd.patch
+	eapply -p2 "${debian}"/0003-CVE-2015-4645_and_CVE-2015-4646.patch
+	eapply -p2 "${debian}"/0004-unsquashfs-add-support-for-LZMA-magics.patch
+	eapply -p2 "${debian}"/0009-unsquashfs-preserve-symlink-times.patch
 	eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
 	eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch
 	eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch