mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-29 09:31:06 +02:00
sys-fs/avfs: Upgrade to avfs 1.0.1
This CL imports avfs 1.0.1 from upstream Gentoo and modifies the ebuild to unmask amd64, arm, and x86. BUG=none TEST=Tested the following: 1. `emerge-{x86,amd64,arm}-generic avfs` and verify that avfs 1.0.1 is built. 2. Run platform_CrosDisksArchive tests. 3. Open Zip, RAR, Gzip/Bzip2 compressed tar files via CrOS File Manager. Change-Id: Ic0d23f8c08dc851b831a4f9c3513579d39e92fc2 Reviewed-on: https://gerrit.chromium.org/gerrit/27549 Reviewed-by: Mike Frysinger <vapier@chromium.org> Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org>
This commit is contained in:
parent
c81fe355d5
commit
e37bc07e61
@ -1 +1 @@
|
||||
DIST avfs-1.0.0.tar.bz2 678756 RMD160 cea0918d684a4fe73b9501d889dd89e27118ee72 SHA1 2c26f6d20125b5de98ecea6c851d64dd2b51f85d SHA256 9305146b8693d0c9ad662682eb2009ecc1342a4254b0984e9c597776d2aaf0d9
|
||||
DIST avfs-1.0.1.tar.bz2 678562 RMD160 cde880066b13c77156ac9112ca56557a2aef53e0 SHA1 caf8a7259b026066afb35ef13f717d988adeb3ab SHA256 6c6558c35864660e6d26e67f42caeb2bc8f9ef2ad0c502fd659fb7d94724aaf1
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-1.0.0.ebuild,v 1.1 2011/07/12 00:31:58 radhermit Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-1.0.1.ebuild,v 1.1 2012/06/13 07:58:44 radhermit Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit eutils
|
||||
@ -11,19 +11,15 @@ SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
|
||||
KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 x86"
|
||||
IUSE="static-libs +lzma"
|
||||
|
||||
DEPEND=">=sys-fs/fuse-2.4
|
||||
RDEPEND=">=sys-fs/fuse-2.4
|
||||
sys-libs/zlib
|
||||
app-arch/bzip2
|
||||
lzma? ( app-arch/xz-utils )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
# Fixes bug #258295
|
||||
epatch "${FILESDIR}/${PN}-0.9.8-gcc43_fix_open_missing_mode.patch"
|
||||
}
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
@ -40,7 +36,7 @@ src_install() {
|
||||
default
|
||||
|
||||
# remove cruft
|
||||
rm "${D}"/usr/bin/{davpass,ftppass} || die "rm failed"
|
||||
rm "${D}"/usr/bin/{davpass,ftppass} || die
|
||||
|
||||
# install docs
|
||||
dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse}
|
||||
@ -49,7 +45,7 @@ src_install() {
|
||||
docinto scripts
|
||||
dodoc scripts/{avfscoda*,*pass}
|
||||
|
||||
use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
|
||||
prune_libtool_files
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
@ -60,6 +56,6 @@ pkg_postinst() {
|
||||
einfo " modprobe fuse or add to startup."
|
||||
einfo "3) run mountavfs"
|
||||
einfo "To unload daemon, type umountavfs"
|
||||
echo
|
||||
einfo
|
||||
einfo "READ the documentation! Enjoy :)"
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
--- ../avfs-0.9.8_orig/modules/urar.c 2007-05-14 20:21:23.000000000 +0200
|
||||
+++ modules/urar.c 2009-02-09 13:48:56.780225932 +0100
|
||||
@@ -587,7 +587,7 @@
|
||||
if(res < 0)
|
||||
return res;
|
||||
|
||||
- fd = open(tmpfile, O_RDWR | O_CREAT | O_TRUNC);
|
||||
+ fd = open(tmpfile, O_RDWR | O_CREAT | O_TRUNC, 0644);
|
||||
if(fd == -1) {
|
||||
res = -errno;
|
||||
av_log(AVLOG_ERROR, "RAR: Could not open %s: %s", tmpfile,
|
Loading…
x
Reference in New Issue
Block a user