summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <mvath@google.com>2019-04-28 17:46:49 +0200
committerMartin Väth <mvath@google.com>2019-04-28 17:46:49 +0200
commitf92dc7ab4a40d2b462b93b7be37ea6955f16574a (patch)
tree17d134d3de036d081574a234756dbbc92686e956 /sys-fs/squashfs-tools
parentx11-libs/gtk+: Version bump (diff)
downloadmv-f92dc7ab4a40d2b462b93b7be37ea6955f16574a.tar.gz
mv-f92dc7ab4a40d2b462b93b7be37ea6955f16574a.tar.bz2
mv-f92dc7ab4a40d2b462b93b7be37ea6955f16574a.zip
sys-fs/squashfs-tools: Version bump
Signed-off-by: Martin Väth <mvath@google.com>
Diffstat (limited to 'sys-fs/squashfs-tools')
-rw-r--r--sys-fs/squashfs-tools/Manifest4
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190415.ebuild (renamed from sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20180612.ebuild)12
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild12
3 files changed, 20 insertions, 8 deletions
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 4ec43145..27918177 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,2 +1,2 @@
-DIST squashfs-tools-4.3.1_alpha20180612.tar.gz 230589 SHA512 9ead9d1ebab688f902438bcbc9c2070cc66fcc9af3a45979d3afd42af022319fee347af473f1f6d67183af2281fda97e71c04c5fbb91b5dd8b36b0cecde4be6c
-DIST squashfs-tools_4.3-6.debian.tar.xz 19060 SHA512 e2f64cdcfe01696980a45d4d6ec50e82626cb3e25e8c98d63b68c9754f519171fcfc4586b4ef88104e28275e1daf94a23f5b7dd08d37fe6e8417b054954de1e7
+DIST squashfs-tools-4.3.1_alpha20190415.tar.gz 230631 SHA512 f5530fefc74ff9a09df3fff4854fad40e99371b364debaf57b663a18f5bb15552cd74f5a6f183e812b5ef97b1acb82a5a3497ebd93de00da06815f778a178237
+DIST squashfs-tools_4.3-12.debian.tar.xz 27300 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20180612.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190415.ebuild
index 31850152..48cde20a 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20180612.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190415.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2019 Gentoo Authors and Martin V\"ath
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ case ${PV} in
LIVE=:;;
esac
Pm=${PN}-${PVm}
-DEB_VER="6"
+DEB_VER="12"
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"
@@ -48,7 +48,7 @@ src_unpack() {
}
else
RESTRICT="mirror"
- EGIT_COMMIT="6e242dc95485ada8d1d0b3dd9346c5243d4a517f"
+ EGIT_COMMIT="3197524cb62f705ffd4da9b63b6c22ff7cb3dc77"
SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
${EXTRA_URI}"
S="${WORKDIR}/${P}/${PN}"
@@ -65,6 +65,12 @@ src_prepare() {
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 "${debian}"/0010-fix_FTBFS_with_glibc_2.28.patch
+ eapply -p2 "${debian}"/0013-use-macros-not-raw-octal-with-chmod.patch
+ eapply -p2 "${debian}"/0014-also-set-stickybit-as-non-root.patch
+ eapply -p2 "${debian}"/0015-numeric-uid-gid_to_unsquashfs.patch
+ eapply -p2 "${debian}"/0016-remove-frag_deflator_thread.patch
+ eapply -p2 "${debian}"/0018-mksquashfs-fix-compressor-initialisation-in-frag_def.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.ebuild
index 31850152..48cde20a 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2019 Gentoo Authors and Martin V\"ath
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ case ${PV} in
LIVE=:;;
esac
Pm=${PN}-${PVm}
-DEB_VER="6"
+DEB_VER="12"
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"
@@ -48,7 +48,7 @@ src_unpack() {
}
else
RESTRICT="mirror"
- EGIT_COMMIT="6e242dc95485ada8d1d0b3dd9346c5243d4a517f"
+ EGIT_COMMIT="3197524cb62f705ffd4da9b63b6c22ff7cb3dc77"
SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
${EXTRA_URI}"
S="${WORKDIR}/${P}/${PN}"
@@ -65,6 +65,12 @@ src_prepare() {
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 "${debian}"/0010-fix_FTBFS_with_glibc_2.28.patch
+ eapply -p2 "${debian}"/0013-use-macros-not-raw-octal-with-chmod.patch
+ eapply -p2 "${debian}"/0014-also-set-stickybit-as-non-root.patch
+ eapply -p2 "${debian}"/0015-numeric-uid-gid_to_unsquashfs.patch
+ eapply -p2 "${debian}"/0016-remove-frag_deflator_thread.patch
+ eapply -p2 "${debian}"/0018-mksquashfs-fix-compressor-initialisation-in-frag_def.patch
eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch
eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch