diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
| commit | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch) | |
| tree | b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /media-libs/audiofile/files | |
| parent | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff) | |
gentoo resync : 20.02.2019
Diffstat (limited to 'media-libs/audiofile/files')
| -rw-r--r-- | media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch | 7 | ||||
| -rw-r--r-- | media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch | 35 |
2 files changed, 38 insertions, 4 deletions
diff --git a/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch b/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch index 332563959106..4f1a0d95beca 100644 --- a/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch +++ b/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch @@ -35,7 +35,7 @@ Bug-Debian: https://bugs.debian.org/801102 --- /dev/null +++ b/test/sixteen-stereo-to-eight-mono.c -@@ -0,0 +1,118 @@ +@@ -0,0 +1,117 @@ +/* + Audio File Library + @@ -95,8 +95,8 @@ Bug-Debian: https://bugs.debian.org/801102 + afInitSampleFormat(setup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16); + afInitChannels(setup, AF_DEFAULT_TRACK, 2); + -+ char *testFileName; -+ if (!createTemporaryFile("sixteen-to-eight", &testFileName)) ++ char testFileName[PATH_MAX]; ++ if (!createTemporaryFile("sixteen-to-eight", testFileName)) + { + fprintf(stderr, "Could not create temporary file.\n"); + exit(EXIT_FAILURE); @@ -150,7 +150,6 @@ Bug-Debian: https://bugs.debian.org/801102 + + afCloseFile(file); + unlink(testFileName); -+ free(testFileName); + + exit(EXIT_SUCCESS); +} diff --git a/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch b/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch index 31e77e11271d..f2421bdfcac3 100644 --- a/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch +++ b/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch @@ -1,3 +1,38 @@ +--- audiofile-0.3.6/configure.ac ++++ audiofile-0.3.6/configure.ac +@@ -160,7 +160,6 @@ + audiofile-uninstalled.pc + sfcommands/Makefile + test/Makefile +- gtest/Makefile + examples/Makefile + libaudiofile/Makefile + libaudiofile/alac/Makefile +--- audiofile-0.3.6/libaudiofile/Makefile.am ++++ audiofile-0.3.6/libaudiofile/Makefile.am +@@ -108,10 +108,9 @@ + TESTS_ENVIRONMENT = $(top_builddir)/libtool --mode=execute $(VALGRIND) $(VALGRIND_FLAGS) + endif + +-LIBGTEST = ../gtest/libgtest.la + +-UnitTests_SOURCES = modules/UT_RebufferModule.cpp +-UnitTests_LDADD = libaudiofile.la $(LIBGTEST) ++UnitTests_SOURCES = modules/UT_RebufferModule.cpp $(libaudiofile_la_SOURCES) ++UnitTests_LDADD = $(libaudiofile_la_LIBADD) -lgtest + UnitTests_CPPFLAGS = -I$(top_srcdir) + UnitTests_CXXFLAGS = -fno-rtti -fno-exceptions -DGTEST_HAS_RTTI=0 -DGTEST_HAS_EXCEPTIONS=0 + UnitTests_LDFLAGS = -static +--- audiofile-0.3.6/Makefile.am ++++ audiofile-0.3.6/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-SUBDIRS = gtest libaudiofile sfcommands test examples docs ++SUBDIRS = libaudiofile sfcommands test examples docs + + EXTRA_DIST = \ + ACKNOWLEDGEMENTS \ --- audiofile-0.3.6/test/Makefile.am +++ audiofile-0.3.6/test/Makefile.am @@ -59,79 +59,77 @@ |