diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-02-17 11:51:40 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-02-17 14:37:21 +0100 |
commit | d39b56393beb1755e008e5281cf882baeeae7a80 (patch) | |
tree | 42ae7ed31bcdc8952f6cb69ba3347a267030e535 /dev-libs | |
parent | dev-libs/libtar: Security cleanup 2 years after the fact (diff) | |
download | gentoo-d39b56393beb1755e008e5281cf882baeeae7a80.tar.gz gentoo-d39b56393beb1755e008e5281cf882baeeae7a80.tar.bz2 gentoo-d39b56393beb1755e008e5281cf882baeeae7a80.zip |
dev-libs/libtar: EAPI 6 bump
Add sys-libs/zlib slot op, drop inaccessible homepage.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/libtar/files/CVE-2013-4420.patch | 12 | ||||
-rw-r--r-- | dev-libs/libtar/files/libtar-1.2.11-free.patch | 8 | ||||
-rw-r--r-- | dev-libs/libtar/libtar-1.2.20-r4.ebuild | 67 |
3 files changed, 77 insertions, 10 deletions
diff --git a/dev-libs/libtar/files/CVE-2013-4420.patch b/dev-libs/libtar/files/CVE-2013-4420.patch index d6e24860c929..833ff7b1dbb3 100644 --- a/dev-libs/libtar/files/CVE-2013-4420.patch +++ b/dev-libs/libtar/files/CVE-2013-4420.patch @@ -1,5 +1,5 @@ ---- a/libtar/lib/decode.c 2013-10-09 09:59:44.000000000 -0700 -+++ b/libtar/lib/decode.c 2015-07-20 20:57:58.331945962 -0700 +--- a/lib/decode.c 2013-10-09 09:59:44.000000000 -0700 ++++ b/lib/decode.c 2015-07-20 20:57:58.331945962 -0700 @@ -21,24 +21,55 @@ # include <string.h> #endif @@ -59,8 +59,8 @@ return filename; } ---- a/libtar/lib/extract.c 2013-10-09 09:59:44.000000000 -0700 -+++ b/libtar/lib/extract.c 2015-07-20 21:00:16.560956122 -0700 +--- a/lib/extract.c 2013-10-09 09:59:44.000000000 -0700 ++++ b/lib/extract.c 2015-07-20 21:00:16.560956122 -0700 @@ -305,7 +305,7 @@ linktgt = &lnp[strlen(lnp) + 1]; } @@ -82,8 +82,8 @@ { #ifdef DEBUG perror("symlink()"); ---- a/libtar/lib/internal.h 2013-10-09 09:59:44.000000000 -0700 -+++ b/libtar/lib/internal.h 2015-07-20 21:00:51.258958673 -0700 +--- a/lib/internal.h 2013-10-09 09:59:44.000000000 -0700 ++++ b/lib/internal.h 2015-07-20 21:00:51.258958673 -0700 @@ -15,6 +15,7 @@ #include <libtar.h> diff --git a/dev-libs/libtar/files/libtar-1.2.11-free.patch b/dev-libs/libtar/files/libtar-1.2.11-free.patch index 3a7b028d5d2d..cb6524e5e5a0 100644 --- a/dev-libs/libtar/files/libtar-1.2.11-free.patch +++ b/dev-libs/libtar/files/libtar-1.2.11-free.patch @@ -1,7 +1,7 @@ stdlib.h is required for free() ---- lib/output.c -+++ lib/output.c +--- a/lib/output.c ++++ b/lib/output.c @@ -20,6 +20,7 @@ #include <sys/param.h> @@ -10,8 +10,8 @@ stdlib.h is required for free() # include <string.h> #endif ---- lib/wrapper.c -+++ lib/wrapper.c +--- a/lib/wrapper.c ++++ b/lib/wrapper.c @@ -18,6 +18,7 @@ #include <errno.h> diff --git a/dev-libs/libtar/libtar-1.2.20-r4.ebuild b/dev-libs/libtar/libtar-1.2.20-r4.ebuild new file mode 100644 index 000000000000..5f441bbfa570 --- /dev/null +++ b/dev-libs/libtar/libtar-1.2.20-r4.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="C library for manipulating tar archives" +HOMEPAGE="http://repo.or.cz/w/libtar.git/" +SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="static-libs zlib" + +RDEPEND=" + zlib? ( sys-libs/zlib:= ) + !zlib? ( app-arch/gzip ) +" +DEPEND="${RDEPEND}" + +DOCS=( ChangeLog{,-1.0.x} README TODO ) + +S="${WORKDIR}/${PN}" + +# There is no test and 'check' target errors out due to mixing of automake & +# non-automake makefiles. +# https://bugs.gentoo.org/show_bug.cgi?id=526436 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.11-free.patch + "${FILESDIR}"/${PN}-1.2.11-impl-dec.patch + "${FILESDIR}"/CVE-2013-4420.patch +) + +src_prepare() { + default + + sed -e '/INSTALL_PROGRAM/s:-s::' \ + -i {doc,lib{,tar}}/Makefile.in || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-shared + --disable-encap + --disable-epkg-install + $(use_enable static-libs static) + $(use_with zlib) + ) + + econf ${myeconfargs[@]} +} + +src_install() { + default + + newdoc compat/README README.compat + newdoc compat/TODO TODO.compat + newdoc listhash/TODO TODO.listhash + + find "${D}" -name '*.la' -delete || die +} |