summaryrefslogtreecommitdiff
path: root/media-sound/vorbis-tools/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-06-16 05:02:38 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-06-16 05:02:38 +0100
commitf1bc537f089cc8477a9a18db597cb349e1b00e91 (patch)
treec48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /media-sound/vorbis-tools/files
parentcb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff)
gentoo resync : 16.06.2018
Diffstat (limited to 'media-sound/vorbis-tools/files')
-rw-r--r--media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch8
-rw-r--r--media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch14
-rw-r--r--media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch8
3 files changed, 22 insertions, 8 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 79859df0274f..a643f1cb82f6 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-docdir.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch
new file mode 100644
index 000000000000..d3fdde0e11d7
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch
@@ -0,0 +1,14 @@
+Thanks-to: Chris Mayo
+https://bugs.gentoo.org/533774
+
+--- a/ogg123/Makefile.am
++++ b/ogg123/Makefile.am
+@@ -19,7 +19,7 @@
+ localedir = $(datadir)/locale
+ DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
+
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ mandir = @MANDIR@
+
+ bin_PROGRAMS = ogg123
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 aaa10fbb54f9..9aee38e0b19e 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@ \