gentoo resync : 07.07.2018

4 files changed, 94 insertions, 18 deletions

diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 47d89f7403d5..9c037cdc6828 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,17 +1,19 @@
 AUX squashfs-tools-4.3-2gb.patch 961 BLAKE2B b178c5e225be9f1b74c8c28bce5f516d1195e9b6bb8f029c34efc6bee62deca5c0173afeadd930f09a8a2304f57223c0d78d24bee6a9d98d07825e748929b0cb SHA512 c45cad7822964ad4c74ea36fdd833fbfaf9e8e047726fa7a9517392bfa0b04a4de348bf3a511b071ac36d045c40cab0d8efeff054ebcd90b94f8508516b7dd71
 AUX squashfs-tools-4.3-aligned-data.patch 375 BLAKE2B e4964cd55bfa3f6026f6090c9e5fe97ddce2ad6efaf99920aa329a42f8cd54217bb918cc1e6678359ff0dd6d7d58361f5fe63cd2aa3254602878cae2e1673c5e SHA512 566e2ada5e86afc799cb0c52396179bedfbcc49349bc6eb43c048b96215b1638c3765f7c75c6fa35593d5a95a1111df7c29a143ee4a55eaf33a6663e9bfe1b25
 AUX squashfs-tools-4.3-extmatch.patch 3487 BLAKE2B df11e9bc8b991e50a94b4c8f8ffa3ddf25db0e2f911db3d4d2fbcbfec793f3d946eac8f4343a113ff6239454b280615e67f93f995c06af6cfe415f3ea330b124 SHA512 e034320ace6b992968d3f6776aeb0b94237619585e7fac195e917622b941bbfbddc62b625409f79fe7a1853ab58f76d6679c28320646b6883eb58183a3adfdea
-AUX squashfs-tools-4.3-local-cve-fix.patch 620 BLAKE2B 166fb66c8a7ed78f50092483c662adaee27b16535f0a2904c2614affabfda2796d8b72ce71aa67c804deb7802a43583ebdae9506b97f79b85c294261eb09adae SHA512 8e308217136f8b50bc89b49017ae706978d5c8a42a74deeef268e9aaaf6ae5785926da99711462374dfc98f2f193840b0e016b1845be1f9bad168047e4574367
+AUX squashfs-tools-4.3-local-cve-fix.patch 624 BLAKE2B 0f41cc2cbbbe7164a930f3f8a77d83f71bb9e10b6f279bb17c8c7c37313bdbbaafd687b02fc4c44788ac37326645f26291007efef6e8eedaaf1254afe10ba83a SHA512 bc61023a492d1440b184dff1a70ee6454ffd1b5e712b48efba7dd0763bd5e9c285e138f74b9cf7f9c038787bb133a14007a5b56ce4501e66dc7bee746c900a77
 AUX squashfs-tools-4.3-mem-overflow.patch 981 BLAKE2B 135d7a985ae0e795e2d24640599dbd1b32c66a1b851690b7960d0647ce624733113167b4290b6035bb9a459c19dc9bd25a9a3f1709062b7542184385fb43479c SHA512 00db6700ab7fbf7f71aa97b45ac9c629dc5e7b1731c3e3eb5c93a0891c1b0f79884df7b6a8672facd9104e9442448ba9657dd10b64d47d89abd1b9ae1969dc2e
 AUX squashfs-tools-4.3-musl.patch 688 BLAKE2B c5c7dc479fe50e581c7546265be622a88cca5973a56efc1ad2896034d5fe071461da2d947a1d9009fa354e49f668ee56b4cb900af1842be8dad34a51bdb4c8e9 SHA512 61fb8eaedc4e649eb8fb362150cf5faef2289cb42514300f63448d164a12c9b21539ae49f6dc0d78fa1e4a3be01b26cb9084cec7f0159fe026fc1caa19df18dd
 AUX squashfs-tools-4.3-sysmacros.patch 611 BLAKE2B eb4a634987a902329d1debcb992b5ed60e1b70feae03860b09267d76abfb19c817887e613b0cedc9d02e265c10f34f8b697e9f390fdb011d2931f13705b30804 SHA512 c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a
 AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec531c0165041af2777d914039671d228d426a2576ae06f6edf86886bd59e7a76fc3a6443337976d7c96b40a1c5dbd7ea8be SHA512 3899bb72cabeb296eb12fdd1c2e77e82a4354e58c91c69be918950c7fc88f56fbc0265c915b7363704579b710a69a35312fa9ab3d43236900774ae97efd473a8
 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae
+DIST squashfs-tools_4.3-6.debian.tar.xz 19060 BLAKE2B 4fc28fae1da2bd1bfbf774acd4f4b29e382760078efd16c655a9178633a58e1ab15fb0203a626dc6353df8ff6860f7da5f9369fd920cf773dd53f8b90cffe13c SHA512 e2f64cdcfe01696980a45d4d6ec50e82626cb3e25e8c98d63b68c9754f519171fcfc4586b4ef88104e28275e1daf94a23f5b7dd08d37fe6e8417b054954de1e7
 DIST squashfs3.2-r2.tar.gz 314764 BLAKE2B 55d2f38572263c4b1ec704ed7a07794400e904e260e316e399511851d35ab0f7e1834eba605e8739d1b8f6b5a56512570d36196d21743d05842e958b3d80e368 SHA512 983f1fa966c15fb4929eaaf2d88401aac72f6d04e8c5523bd46397bc28928ff13b638e0e96bc09650627449c37f6a654ffa727445f1e9ca13cdc9de4fc43012f
 DIST squashfs3.4.tar.gz 352660 BLAKE2B f48b1f0399d3fde75b8f625fa4130d04772ed9e6d8dc179e7105a7770a5bd211a7aa5c7d5d621efedc54707b37a622351efa65291c03cd84d049ec4a1094773a SHA512 5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe
 DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc06184ad7e8cb9cd08b14854164da8d2ecc64694d44085c46bcfa3aaa85939c97820415345053f7956af04066fdb SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79
 EBUILD squashfs-tools-3.2_p2.ebuild 953 BLAKE2B a4d1a831009bf68138e760847c6e964737db11c64e18e135b5ee5aa0335d8981d72bd2f39740769a847391e1efca36a7f012f07a2ce20deef71daef58bfd0b21 SHA512 989198cdeb688add1cd826743ab55b7ff33f0de87bf8338e4d6d14882dc79452ebf54fc393a41365e10efa22da1e0e0643f2ea50f4c4fabc8ab969517845f129
 EBUILD squashfs-tools-3.4.ebuild 937 BLAKE2B 77ce02b82aae8aae9a5e64b7c4e28e416d70bf92f1ce2d4b017eb3a3a9bd257e7355176c149668a85f757ddb66f017543b55f366782b2ad7c1bd8f01a0921689 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
-EBUILD squashfs-tools-9999.ebuild 1694 BLAKE2B 144090bb2f985e8504d70bac3a4937a428666ba369a65497bba43a7cf52aa09f6fe1b512796b970b736f5928aa406b3106689b5d3c90a70276504493e25bab82 SHA512 b364a908e175482bb48ce6106d706b766aee3d3953e2fffa03b0a83b5ca3098d92e79e2034f31e120b856b99f9d3e1bd98cb50114a50f8cb2cb3502e080e6c10
+EBUILD squashfs-tools-4.3_p6.ebuild 2102 BLAKE2B aff4d868da046f29a32d4a8c3b741bb4a6a443d1c8778e1ea3f0d2f35cd29f47d9f86060d51c8be1b0a34ef386338e958eeb9cd55328c7022559cb50539f755e SHA512 5bbe36316133880a5f4ef71f5edf6b0aa90a61e87f71f227de655a5c261996c6a9760e8672d3a39168a8b9e8f8f95b0fbd127ff30de43c7aad29ebb403fbc586
+EBUILD squashfs-tools-9999.ebuild 1627 BLAKE2B 0110dda14ddddc8ae01127b016df014d10a1fe278a12580469c352b0b7da70ff9a1aee7fbf4906ba6cf1908b7d0a8d0a4566e14a1ea6f540d8f8cb69e3c5d46d SHA512 5b285f492107a3de0302a5ea6c00382c667f0e69429bcd52ec906272c3e6ad1e15db0018b7ef5f3a5317383a0f5209cad59388a9f9eb42a30452e5204a9a7af3
 MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9
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
index 7637f67cd591..dca6ab68e676 100644
--- 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
@@ -6,8 +6,8 @@ Date:   Wed Jun 24 14:27:31 2015 -0500
 
 Update printf formats to match datatypes after CVE patch
 
---- squashfs-tools/unsquash-4.c
-+++ squashfs-tools/unsquash-4.c
+--- 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;
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p6.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p6.ebuild
new file mode 100644
index 000000000000..1209603f28d9
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+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 ~sh ~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 c06d73d05088..11c0570d7f45 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
@@ -1,29 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-inherit eutils git-r3 toolchain-funcs flag-o-matic
-
-DEB_VER="3"
+inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
 HOMEPAGE="http://squashfs.sourceforge.net"
-EGIT_REPO_URI="
-	https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
-"
-
+EGIT_REPO_URI="https://github.com/plougher/squashfs-tools"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug lz4 lzma lzo static xattr +xz zstd"
+KEYWORDS=""
 
 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(+)] )
+	sys-libs/zlib[static-libs(+)]
 	xattr? ( sys-apps/attr[static-libs(+)] )
 	xz? ( app-arch/xz-utils[static-libs(+)] )
 	zstd? ( app-arch/zstd[static-libs(+)] )
@@ -66,8 +60,6 @@ src_compile() {
 }
 
 src_install() {
-	cd "${WORKDIR}"/${P}/${PN} || die
-	dobin mksquashfs unsquashfs
-	cd .. || die
+	dobin "${WORKDIR}"/${P}/${PN}/{mksquashfs,unsquashfs}
 	dodoc CHANGES README RELEASE-README RELEASE-READMEs/*
 }