gentoo resync : 20.02.2019

4 files changed, 43 insertions, 9 deletions

diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index 574029ee81dd..652ac564737f 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -1,7 +1,7 @@
-AUX audiofile-0.3.6-CVE-2015-7747.patch 4300 BLAKE2B 04ece03009e2f8d2819585c49aa6b55b7da717e5f0ee9de99cfcfc8714a43dd9fc7e317cd366f442f141bc4f84e2343e060e65585d3a8181a3cfa137ce7fd19d SHA512 7673ab3fafdb0dac514a42622f53ea17aa56836c76413e5680c475537e195c53df21f26da1bd4e7941df2dc8b33a471ab52d539dabffbaef8bc95ee59951e7fe
+AUX audiofile-0.3.6-CVE-2015-7747.patch 4286 BLAKE2B 407ed02b63a8164324bbf2bcecc3533b711ebc3ffd44896f26a286496d01490b35efe8a4ea9b00eed69a484deb2516157bb23de94eb00e19f79cb8782f5ba33b SHA512 5def88fec10355224716783c84933c2b3adfc7608635b8d352c0728bf0e7765d146addaecf13a4f650a95f6aeb8f528ee1e8cfa785c1cdae3f6d75552e46faba
 AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc395c654c9bb25a1d914a6b57bc191ad36e55ca191f924d57d48834a05ea30913ddd744056e244654a96529b1c3632ef5b162252c76 SHA512 60837bcc9aa53d546708210e87a4f24db56c8a4b0c6896c8e39e0d213aafa15f59a65a60726e6abbf16681fc1fa6ca59cf1748a63caf5ff2652d55f10f62a976
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
-AUX audiofile-0.3.6-system-gtest.patch 4040 BLAKE2B 8238ae97edad4a9408dc4f5a04264c58941a06e3e5ffd83df8b6c3eff24e7318b989d1301c14b82614615d09a9191ea0ba75bf6b71b8849d0f010917fddc4479 SHA512 e58f033f075e3f6c34e25793353c122e05960ca2ff8aefaca936c7bd683989545d6839ad231136a870a9fc9a515623a056a149128fba7239bb9998c3ea320172
+AUX audiofile-0.3.6-system-gtest.patch 5209 BLAKE2B fa4a40165b37a6d33b929efbd79e20a1a7b953ee6d826dfbe88907255f217dcad1f9f4b14b910abe0d60a5c6b3956c92b3a7d6df76d1a47b7e5853bd7bc1d3a9 SHA512 ae821f7e4ea1684651e430007b2b52b369769d8b60cc7180aee3c80c55c7d01ad9e97792099d2d6694eec2f090552355688e2ee3cc527d7a8989e717d3de5b5d
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
-EBUILD audiofile-0.3.6-r3.ebuild 1259 BLAKE2B de6826e4744746f3e13350d5aee493243d1c0ac33bdbb37039cc83de510ecc143766d85b77fbde46f1c186f11a382978f2ca32dc19b1b87aa60ec52f3e027f1a SHA512 2ed7c34203981dbb4a09f6b88a9868eaa17f04e5355f3d348c9aa9b2373d403fd7c331c49046da213a0b1af37d12eb5ef25572098d287adeed75dfb3db5346a6
+EBUILD audiofile-0.3.6-r3.ebuild 1257 BLAKE2B cbd806bc922f14bb45c0a49899f3307ddc515c4148e63fc28f9472c67a212ba8c96036d86572b294bc9c355e13eda3aa83ba828a56f3d2d62b9e463f5f915374 SHA512 ca67c2e6a5c279f94589a66289b82e44eb21915022946e06e78c7691a27ccabecaa501c0531d6bf9aeaf631561773e3645566051df4aaa29aff97acb5a06a73d
 MISC metadata.xml 359 BLAKE2B 3a6913b1f6e97d45f7d1c415879d82fec86642dc2a187907d1893ff9b81cf7781a5485e5140a901482913713ab4f7a5a8ce62df872fc75bf2f34f80d0dbeef9c SHA512 2f2ae33ca88cb3246c8419b88a800ba405123263a6cf2f94c9478d8303bf036ece9a6781a1fe83d8b1f329071623e76f6e909c0207289d6dad8166b163c3b897
diff --git a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
index c61e55f0a423..ad1115fbc7b1 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,5 +45,5 @@ multilib_src_install_all() {
 	einstalldocs
 
 	# package provides .pc file
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
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 @@