summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--metadata/pkg_desc_index2
-rw-r--r--sys-fs/squashfs-tools/Manifest2
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch19
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch25
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.4_alpha20190823-write_xattr.patch13
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild (renamed from sys-fs/squashfs-tools/squashfs-tools-4.4_alpha20190823.ebuild)60
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild60
7 files changed, 56 insertions, 125 deletions
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 45ab18e9..ffb45c64 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -107,7 +107,7 @@ sys-block/zram-init 9.0: Scripts to support compressed swap devices or ramdisks
sys-boot/grub-cfg-mv 1.7: A grub.cfg library/example for GRUB2
sys-fs/emount 3.0.4: mount/unmount create/remove dm-crypt filesystems according to your /etc/fstab
sys-fs/squash_dir 13.14-r1: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
-sys-fs/squashfs-tools 4.4_alpha20190823 99999999: Tool for creating compressed filesystem type squashfs
+sys-fs/squashfs-tools 4.4 99999999: Tool for creating compressed filesystem type squashfs
sys-fs/squashfuse 0.1.103 0.1.104_alpha20180721: FUSE filesystem to mount squashfs archives
sys-fs/squashmount 16.1.0-r1 20.0: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
sys-kernel/kccmp 0.3-r1: A simple tool for comparing two linux kernel .config files
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 4335ad1a..23f98aa2 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,2 +1,2 @@
-DIST squashfs-tools-4.4_alpha20190823.tar.gz 242804 SHA512 abcc38d542325ffe3d27620d254cbc02d0c9ed9f4e3573d31481038ce99156cf073150f2b5117f366a7151122607207890341486c0b382e8e0df805070f85c40
+DIST squashfs-tools-4.4.tar.gz 241842 SHA512 133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308
DIST squashfs-tools_4.3-12.debian.tar.xz 27300 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
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 7637f67c..00000000
--- 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
-
---- squashfs-tools/unsquash-4.c
-+++ 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-sysmacros.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch
deleted file mode 100644
index 1430b1a2..00000000
--- 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.4_alpha20190823-write_xattr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.4_alpha20190823-write_xattr.patch
deleted file mode 100644
index c59bf39d..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.4_alpha20190823-write_xattr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 1/squashfs-tools/xattr.h
-+++ 1/squashfs-tools/xattr.h
-@@ -110,8 +110,9 @@
- }
-
-
--static inline void write_xattr(char *pathname, unsigned int xattr)
-+static inline int write_xattr(char *pathname, unsigned int xattr)
- {
-+ return 0;
- }
-
-
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4_alpha20190823.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
index 8b902d72..91f6ae3c 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4_alpha20190823.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
@@ -4,67 +4,61 @@
EAPI=7
inherit flag-o-matic toolchain-funcs
-LIVE=false
PVm=4.3
-case ${PV} in
-*9999)
- LIVE=:;;
-esac
-Pm=${PN}-${PVm}
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"
-EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${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="debug lz4 lzma lzo static xattr +xz +zstd"
+EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${DEB_VER}.debian.tar.xz"
-LIB_DEPEND="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-1.0:=[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/squashfs${PV}/${PN}"
-
-if ${LIVE}; then
+case ${PV} in
+*9999)
PROPERTIES="live"
EGIT_REPO_URI="https://github.com/plougher/${PN}"
inherit git-r3
SRC_URI=${EXTRA_URI}
KEYWORDS=""
- S="${WORKDIR}/${P}/${PN}"
src_unpack() {
default
git-r3_src_unpack
-}
-else
+};;
+*alpha*)
RESTRICT="mirror"
- EGIT_COMMIT="c3ab7d1d28c030a5428a6cd565a5af17ecb6498b"
+ EGIT_COMMIT="52eb4c279cd283ed9802dd1ceb686560b22ffb67"
SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
${EXTRA_URI}"
- S="${WORKDIR}/${P}/${PN}"
src_unpack() {
default
mv -- "${WORKDIR}/${PN}-${EGIT_COMMIT}" "${WORKDIR}/${P}"
-}
-fi
+};;
+*)
+ RESTRICT="mirror"
+ SRC_URI="https://github.com/plougher/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+${EXTRA_URI}";;
+esac
+S="${WORKDIR}/${P}/${PN}"
+
+LIB_DEPEND="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-1.0:=[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
src_prepare() {
- local debian
+ local Pm debian
+ Pm=${PN}-${PVm}
debian="${WORKDIR}"/debian/patches
eapply -p2 "${debian}"/0001-kfreebsd.patch
- eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
- eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
- eapply -p2 "${FILESDIR}"/${P}-write_xattr.patch
default
}
@@ -96,6 +90,6 @@ src_compile() {
src_install() {
dobin mksquashfs unsquashfs
cd ..
- dodoc CHANGES README RELEASE-README ACKNOWLEDGEMENTS RELEASE-READMEs/*
+ dodoc CHANGES README README-4.4 ACKNOWLEDGEMENTS USAGE RELEASE-READMEs/*
doman "${WORKDIR}"/debian/manpages/*.[0-9]
}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
index 8b902d72..91f6ae3c 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
@@ -4,67 +4,61 @@
EAPI=7
inherit flag-o-matic toolchain-funcs
-LIVE=false
PVm=4.3
-case ${PV} in
-*9999)
- LIVE=:;;
-esac
-Pm=${PN}-${PVm}
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"
-EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${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="debug lz4 lzma lzo static xattr +xz +zstd"
+EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${DEB_VER}.debian.tar.xz"
-LIB_DEPEND="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-1.0:=[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/squashfs${PV}/${PN}"
-
-if ${LIVE}; then
+case ${PV} in
+*9999)
PROPERTIES="live"
EGIT_REPO_URI="https://github.com/plougher/${PN}"
inherit git-r3
SRC_URI=${EXTRA_URI}
KEYWORDS=""
- S="${WORKDIR}/${P}/${PN}"
src_unpack() {
default
git-r3_src_unpack
-}
-else
+};;
+*alpha*)
RESTRICT="mirror"
- EGIT_COMMIT="c3ab7d1d28c030a5428a6cd565a5af17ecb6498b"
+ EGIT_COMMIT="52eb4c279cd283ed9802dd1ceb686560b22ffb67"
SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
${EXTRA_URI}"
- S="${WORKDIR}/${P}/${PN}"
src_unpack() {
default
mv -- "${WORKDIR}/${PN}-${EGIT_COMMIT}" "${WORKDIR}/${P}"
-}
-fi
+};;
+*)
+ RESTRICT="mirror"
+ SRC_URI="https://github.com/plougher/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+${EXTRA_URI}";;
+esac
+S="${WORKDIR}/${P}/${PN}"
+
+LIB_DEPEND="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-1.0:=[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
src_prepare() {
- local debian
+ local Pm debian
+ Pm=${PN}-${PVm}
debian="${WORKDIR}"/debian/patches
eapply -p2 "${debian}"/0001-kfreebsd.patch
- eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
- eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
- eapply -p2 "${FILESDIR}"/${P}-write_xattr.patch
default
}
@@ -96,6 +90,6 @@ src_compile() {
src_install() {
dobin mksquashfs unsquashfs
cd ..
- dodoc CHANGES README RELEASE-README ACKNOWLEDGEMENTS RELEASE-READMEs/*
+ dodoc CHANGES README README-4.4 ACKNOWLEDGEMENTS USAGE RELEASE-READMEs/*
doman "${WORKDIR}"/debian/manpages/*.[0-9]
}