commit: a5f94c4d90095df4ec012acc6ca25e5fc0e7101a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 10 10:28:25 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 10 10:42:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f94c4d
media-sound/vorbis-tools: EAPI-6 bump Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../files/vorbis-tools-1.4.0-CVE-2014-9638.patch | 8 +++--- .../files/vorbis-tools-1.4.0-underlinking.patch | 8 +++--- .../vorbis-tools/vorbis-tools-1.4.0-r4.ebuild | 30 +++++++++++++--------- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch index 79859df0274..a643f1cb82f 100644 --- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch +++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch @@ -5,8 +5,8 @@ To fix bug report: http://www.openwall.com/lists/oss-security/2015/08/29/1 https://bugs.gentoo.org/show_bug.cgi?id=559170 https://bugs.gentoo.org/show_bug.cgi?id=537422 ---- oggenc/audio.h -+++ oggenc/audio.h +--- a/oggenc/audio.h ++++ b/oggenc/audio.h @@ -25,7 +25,7 @@ typedef struct { @@ -25,8 +25,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=537422 int totalframes; short samplesize; int rate; ---- oggenc/audio.c -+++ oggenc/audio.c +--- a/oggenc/audio.c ++++ b/oggenc/audio.c @@ -245,8 +245,8 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) { diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch index aaa10fbb54f..9aee38e0b19 100644 --- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch +++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch @@ -23,8 +23,8 @@ using functions from the mathlib. Therefore, always link to mathlib: ---- ogg123/Makefile.am -+++ ogg123/Makefile.am +--- a/ogg123/Makefile.am ++++ b/ogg123/Makefile.am @@ -30,7 +30,7 @@ ogg123_LDADD = @SHARE_LIBS@ \ @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \ @@ -34,8 +34,8 @@ Therefore, always link to mathlib: ogg123_DEPENDENCIES = @SHARE_LIBS@ ogg123_SOURCES = audio.c buffer.c callbacks.c \ ---- oggenc/Makefile.am -+++ oggenc/Makefile.am +--- a/oggenc/Makefile.am ++++ b/oggenc/Makefile.am @@ -23,7 +23,7 @@ oggenc_LDADD = @SHARE_LIBS@ \ diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild index 7f85f35db51..54d3541a0b8 100644 --- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild +++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=6 -DESCRIPTION="tools for using the Ogg Vorbis sound file format" +inherit autotools + +DESCRIPTION="Tools for using the Ogg Vorbis sound file format" HOMEPAGE="http://www.vorbis.com"; SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"; @@ -13,25 +14,30 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="flac kate nls +ogg123 speex" -RDEPEND=">=media-libs/libvorbis-1.3.0 +RDEPEND=" + >=media-libs/libvorbis-1.3.0 flac? ( media-libs/flac ) kate? ( media-libs/libkate ) ogg123? ( >=media-libs/libao-1.0.0 net-misc/curl ) - speex? ( media-libs/speex )" + speex? ( media-libs/speex ) +" DEPEND="${RDEPEND} + virtual/pkgconfig nls? ( sys-devel/gettext ) - virtual/pkgconfig" +" -DOCS="AUTHORS CHANGES README" +PATCHES=( + "${FILESDIR}"/${P}-underlinking.patch + "${FILESDIR}"/${P}-format-security.patch + "${FILESDIR}"/${P}-CVE-2014-9640.patch + "${FILESDIR}"/${P}-CVE-2014-9638.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-underlinking.patch - epatch "${FILESDIR}"/${P}-format-security.patch - epatch "${FILESDIR}"/${P}-CVE-2014-9640.patch - epatch "${FILESDIR}"/${P}-CVE-2014-9638.patch + default sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220 eautoreconf }
