From ca7877387809d2a7263555eb471126e126bedef1 Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Sun, 4 May 2014 23:56:48 +0200 Subject: Bump squashfs-tools --- profiles/use.local.desc | 1 + sys-fs/squashfs-tools/ChangeLog | 5 +- sys-fs/squashfs-tools/Manifest | 2 +- ...ashfs-tools-4.2_p20140119-progress-stderr.patch | 60 ++++++++++++++++++++ sys-fs/squashfs-tools/metadata.xml | 3 +- .../squashfs-tools-4.2_p20121216.ebuild | 64 ---------------------- .../squashfs-tools-4.2_p20140119-r1.ebuild | 62 +++++++++++++++++++++ 7 files changed, 130 insertions(+), 67 deletions(-) create mode 100644 sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20140119-progress-stderr.patch delete mode 100644 sys-fs/squashfs-tools/squashfs-tools-4.2_p20121216.ebuild create mode 100644 sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119-r1.ebuild diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 1dfe35ba..37904197 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -110,5 +110,6 @@ sys-fs/squash_dir:aufs - Prefer aufs sys-fs/squash_dir:bundled-openrc-wrapper - Install the bundled openrc-wrapper sys-fs/squash_dir:overlayfs - Prefer overlayfs sys-fs/squash_dir:unionfs-fuse - Prefer unionfs-fuse +sys-fs/squashfs-tools:lz4 - Enable support for LZ4 compression using app-arch/lz4 sys-fs/squashfs-tools:progress-redirect - Redirect printing of progress bar to stderr. This gives a nicer output if used from scripts like sys-fs/squash_dir sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog index 1de9f40a..c77269fc 100644 --- a/sys-fs/squashfs-tools/ChangeLog +++ b/sys-fs/squashfs-tools/ChangeLog @@ -2,7 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ - 31 Mar 2011; Martin Väth : + 04 May 2014; Martin Väth : + Bump 4.2_p20140119 from tree; update patch; filter -fno-common + + 31 Mar 2013; Martin Väth : Bump 4.2_p20121216 from tree; update patch 21 Sep 2012; Martin Väth : diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index 9b3d7ee3..5768bc55 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -1,4 +1,4 @@ -DIST squashfs-tools-4.2_p20121216.patch.bz2 36444 SHA256 1c5b9e1e6662e9c4fa08aaa990263003f1bf32d5a5656a341ed4d642a0c01fe5 SHA512 e5d9df92631ac58228673d76e7ec062aaff9af61574aff0d29d4c30cf025239685fac045b5ea60dbfb7a68e822dc075e1eae6f3c3ed40a522c5955999f652994 WHIRLPOOL c5ef44d0ee2becdfeb76767b7bc230be68b75454db632257b2d93f7a247e169173ddfd03f66404caf51b66abbddb6bb9e3cfce80c3f873ac8d4ed625e27b620f +DIST squashfs-tools-4.2_p20140119.tar.xz 119496 SHA256 007382c4be734f923b7a0964c378b665d924adfd5537922452c455c0a2d4d20a SHA512 016c79000bb775c3ffb0a8eb9eefe11f9a82a0cd40be44b42c0c16f4184c4113538947d3677956f97313797ed9a7645380d05586afb0f6bd392cb4652e9fbe14 WHIRLPOOL 12ebdbb78053f0cc6863d1801ab964c0460966667a24f0eca39a63d73a5a313291981a39c5b6f539c33f0eb65ff34d7bbc00a06ae256173f9c4177fbfa3aacab DIST squashfs3.2-r2.tar.gz 314764 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7 DIST squashfs3.4.tar.gz 352660 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339 DIST squashfs4.2.tar.gz 133173 SHA256 d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96 SHA512 4b69c5d3008803347d0ce7628957e3873c9ebd799662b25dfb739afb6a1ce97bdd02b0465ac4d949bc38af2155880ac068209dc638b94e5c86a8011ec3a00de0 WHIRLPOOL c69d403b9775ecebfba02c2ae395b3e5ed8f832caf80417863e5df861b60462b97ac3d10ee027cc96c6f8146450bd8fe8cf715574d41ed47abcc7abc9423ce52 diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20140119-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20140119-progress-stderr.patch new file mode 100644 index 00000000..5ab05bda --- /dev/null +++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20140119-progress-stderr.patch @@ -0,0 +1,60 @@ +--- progressbar.c.bak/progressbar.c.bak ++++ progressbar.c.bak/progressbar.c +@@ -56,8 +56,8 @@ + { + struct winsize winsize; + +- if(ioctl(1, TIOCGWINSZ, &winsize) == -1) { +- if(isatty(STDOUT_FILENO)) ++ if(ioctl(2, TIOCGWINSZ, &winsize) == -1) { ++ if(isatty(STDERR_FILENO)) + ERROR("TIOCGWINSZ ioctl failed, defaulting to 80 " + "columns\n"); + columns = 80; +@@ -108,7 +108,7 @@ + return; + + if(tty == -1) +- tty = isatty(STDOUT_FILENO); ++ tty = isatty(STDERR_FILENO); + if(!tty) { + static long long previous = -1; + +@@ -122,19 +122,19 @@ + previous = current; + } + +- printf("\r["); ++ fprintf(stderr, "\r["); + + while (hashes --) +- putchar('='); ++ putc('=', stderr); + +- putchar(rotate_list[rotate]); ++ putc(rotate_list[rotate], stderr); + + while(spaces --) +- putchar(' '); ++ putc(' ', stderr); + +- printf("] %*lld/%*lld", max_digits, current, max_digits, max); +- printf(" %3lld%%", current * 100 / max); +- fflush(stdout); ++ fprintf(stderr, "] %*lld/%*lld", max_digits, current, max_digits, max); ++ fprintf(stderr, " %3lld%%", current * 100 / max); ++ fflush(stderr); + } + + +@@ -180,8 +180,8 @@ + struct itimerval itimerval; + struct winsize winsize; + +- if(ioctl(1, TIOCGWINSZ, &winsize) == -1) { +- if(isatty(STDOUT_FILENO)) ++ if(ioctl(2, TIOCGWINSZ, &winsize) == -1) { ++ if(isatty(STDERR_FILENO)) + ERROR("TIOCGWINSZ ioctl failed, defaulting to 80 " + "columns\n"); + columns = 80; diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml index b9386077..9b164e24 100644 --- a/sys-fs/squashfs-tools/metadata.xml +++ b/sys-fs/squashfs-tools/metadata.xml @@ -7,7 +7,8 @@ Martin Väth - Redirect printing of progress bar to stderr. This gives a nicer output if used from scripts like sys-fs/squash_dir Enable support for XZ ("LZMA2") compression using app-arch/xz-utils + Enable support for LZ4 compression using app-arch/lz4 + Redirect printing of progress bar to stderr. This gives a nicer output if used from scripts like sys-fs/squash_dir diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2_p20121216.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20121216.ebuild deleted file mode 100644 index a51b1957..00000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.2_p20121216.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net" -SRC_URI=" - mirror://sourceforge/squashfs/squashfs/squashfs${PV/_p*/}.tar.gz - http://dev.gentoo.org/~jer/${P}.patch.bz2 -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" -IUSE="lzma lzo +progress-redirect xattr +xz" - -RDEPEND=" - sys-libs/zlib - xz? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo ) - lzma? ( app-arch/xz-utils ) - !xz? ( !lzo? ( sys-libs/zlib ) ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/squashfs${PV/_p*/}/squashfs-tools" - -use_sed() { - local u=$1 s="${2:-`echo $1 | tr '[:lower:]' '[:upper:]'`}_SUPPORT" - printf '/^#?%s =/%s\n' "${s}" \ - "$( use $u && echo s:.*:${s} = 1: || echo d )" -} - -src_prepare() { - epatch "${WORKDIR}"/${P}.patch - use progress-redirect && \ - epatch "${FILESDIR}/${PN}-4.2_p20121216-progress-stderr.patch" - epatch_user -} - -src_configure() { - tc-export CC - sed -i -r \ - -e "$(use_sed xz XZ)" \ - -e "$(use_sed lzo)" \ - -e "$(use_sed xattr)" \ - -e "$(use_sed lzma LZMA_XZ)" \ - Makefile || die -} - -src_install() { - dobin mksquashfs unsquashfs - cd .. || die - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README -} - -pkg_postinst() { - ewarn "This version of mksquashfs requires a 2.6.29 kernel or better" - use xz && - ewarn "XZ support requires a 2.6.38 kernel or better" -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119-r1.ebuild new file mode 100644 index 00000000..1dbb2726 --- /dev/null +++ b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Tool for creating compressed filesystem type squashfs" +HOMEPAGE="http://squashfs.sourceforge.net" +SRC_URI="http://dev.gentoo.org/~jer/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86" +IUSE="+xz lzma lz4 lzo xattr +progress-redirect" + +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}/${P}/squashfs-tools" + +src_prepare() { + use progress-redirect && \ + epatch "${FILESDIR}/${P}-progress-stderr.patch" + epatch_user +} + +src_configure() { + # set up make command line variables in EMAKE_SQUASHFS_CONF + EMAKE_SQUASHFS_CONF=( + $(usex lzma LZMA_XZ_SUPPORT=1 LZMA_XS_SUPPORT=0) + $(usex lzo LZO_SUPPORT=1 LZO_SUPPORT=0) + $(usex lz4 LZ4_SUPPORT=1 LZ4_SUPPORT=0) + $(usex xattr XATTR_SUPPORT=1 XATTR_SUPPORT=0) + $(usex xz XZ_SUPPORT=1 XZ_SUPPORT=0) + ) + filter-flags -fno-common + + tc-export CC +} + +src_compile() { + emake ${EMAKE_SQUASHFS_CONF[@]} +} + +src_install() { + dobin mksquashfs unsquashfs +} + +pkg_postinst() { + ewarn "This version of mksquashfs requires a 2.6.29 kernel or better" + use xz && + ewarn "XZ support requires a 2.6.38 kernel or better" +} -- cgit v1.2.3-65-gdbad