diff options
| -rw-r--r-- | app-arch/libarchive/ChangeLog | 7 | ||||
| -rw-r--r-- | app-arch/libarchive/files/libarchive-3.0.4-handle-unsupported-acl-types.patch | 24 | ||||
| -rw-r--r-- | app-arch/libarchive/libarchive-3.0.4-r1.ebuild | 89 |
3 files changed, 6 insertions, 114 deletions
diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog index 8e36a2245f0b..5ac0c8dbae69 100644 --- a/app-arch/libarchive/ChangeLog +++ b/app-arch/libarchive/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/libarchive # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.154 2013/04/05 18:11:17 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.155 2013/05/07 10:46:23 ssuominen Exp $ + + 07 May 2013; Samuli Suominen <ssuominen@gentoo.org> + -libarchive-3.0.4-r1.ebuild, + -files/libarchive-3.0.4-handle-unsupported-acl-types.patch: + old 05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> libarchive-3.1.2-r1.ebuild: Stable for ppc64, wrt bug #463632 diff --git a/app-arch/libarchive/files/libarchive-3.0.4-handle-unsupported-acl-types.patch b/app-arch/libarchive/files/libarchive-3.0.4-handle-unsupported-acl-types.patch deleted file mode 100644 index 5bbd5d6e5d9e..000000000000 --- a/app-arch/libarchive/files/libarchive-3.0.4-handle-unsupported-acl-types.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d8b9dbd6dac0125957b997c2fe8d246237ec9f94 Mon Sep 17 00:00:00 2001 -From: naota <naota@elisp.net> -Date: Fri, 25 May 2012 13:03:21 +0900 -Subject: [PATCH] Avoid infinite loop when there's unsupported acl type - ---- - libarchive/archive_read_disk_entry_from_file.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c -index 7987fa5..25b1edc 100644 ---- a/libarchive/archive_read_disk_entry_from_file.c -+++ b/libarchive/archive_read_disk_entry_from_file.c -@@ -584,6 +584,7 @@ static int translate_acl(struct archive_read_disk *a, - break; - default: - /* Skip types that libarchive can't support. */ -+ s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry); - continue; - } - --- -1.7.10 - diff --git a/app-arch/libarchive/libarchive-3.0.4-r1.ebuild b/app-arch/libarchive/libarchive-3.0.4-r1.ebuild deleted file mode 100644 index c5295f3e2a2c..000000000000 --- a/app-arch/libarchive/libarchive-3.0.4-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.4-r1.ebuild,v 1.13 2013/01/06 17:00:02 armin76 Exp $ - -EAPI=4 -inherit eutils multilib libtool - -DESCRIPTION="BSD tar command" -HOMEPAGE="http://libarchive.github.com/" -SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux +lzma nettle static-libs xattr +zlib" - -RDEPEND="dev-libs/openssl:0 - acl? ( virtual/acl ) - bzip2? ( app-arch/bzip2 ) - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2 ) - iconv? ( virtual/libiconv ) - kernel_linux? ( - xattr? ( sys-apps/attr ) - ) - lzma? ( app-arch/xz-utils ) - nettle? ( dev-libs/nettle ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - kernel_linux? ( - virtual/os-headers - e2fsprogs? ( sys-fs/e2fsprogs ) - )" - -DOCS="NEWS README" - -src_prepare() { - epatch "${FILESDIR}/${P}-handle-unsupported-acl-types.patch" - elibtoolize # to allow building shared libs on Solaris/x64 -} - -src_configure() { - export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 - - # We disable lzmadec because we support the newer liblzma from xz-utils - # and not liblzmadec with this version. - econf \ - $(use_enable static-libs static) \ - --enable-bsdtar=shared \ - --enable-bsdcpio=shared \ - $(use_enable xattr) \ - $(use_enable acl) \ - $(use_with zlib) \ - $(use_with bzip2 bz2lib) \ - --without-lzmadec \ - $(use_with iconv) \ - $(use_with lzma) \ - $(use_with nettle) \ - $(use_with !expat xml2) \ - $(use_with expat) -} - -src_test() { - # Replace the default src_test so that it builds tests in parallel - emake check -} - -src_install() { - default - - # Libs.private: should be used from libarchive.pc instead - rm -f "${ED}"usr/lib*/lib*.la - - # Create tar symlink for FreeBSD - if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then - dosym bsdtar /usr/bin/tar - echo '.so bsdtar.1' > "${T}"/tar.1 - doman "${T}"/tar.1 - # We may wish to switch to symlink bsdcpio to cpio too one day - fi -} - -pkg_preinst() { - preserve_old_lib /{,usr/}$(get_libdir)/${PN}$(get_libname 2) -} - -pkg_postinst() { - preserve_old_lib_notify /{,usr/}$(get_libdir)/${PN}$(get_libname 2) -} |