gentoo resync : 13.11.2021

3 files changed, 0 insertions, 79 deletions

diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index b2ed075b3b97..bbdc11ed4651 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,7 +1,5 @@
 AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b2bf10e6e321375f40d4177d6eb563a189829ab49d6a3c71b3ad48cb3e52a343ad780a9f067b6bd3e42e628 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757
 AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
-AUX alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch 1663 BLAKE2B 15f3778401410039d30aa93c12f17a7b9581474a7b1f2cf9cad743992b3b7ae9df65810af842d5a00f36d62e53cde51cf2c6ba8d41e1aab7e0a089a4396fe841 SHA512 2b6f0e6c6e68adff98911547d6b5372493d313ba1f7ff16f845ebf58d584a83916b213c3aeaef1198f09808851b01dd533b2d85fc7b72032843319ab60a707e2
-AUX alsa-utils-1.2.5-fix-the-nested-iteration.patch 989 BLAKE2B 5f5956c72a0e9605011b953f98ae29803f50e0c427c794331d1b99e7c1a4dc81379a074a1403ba71737cf8de03c0d749e4544a22a8e2f39984ed9dd6482b40dd SHA512 0cdc8c41b70be714515f355a630fc28b68b95cb7b5a5cbb58c1b288ee0edf3128eb8f80bb874844cf11268c89bb04e82f1fe8c4c1ebb7cd7334d28f2896d5a85
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
deleted file mode 100644
index f06756a8af96..000000000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3d7a6facd9e1f962eef6c4ba3aa4cdc22477a6ac Mon Sep 17 00:00:00 2001
-From: Chao Song <chao.song@linux.intel.com>
-Date: Mon, 31 May 2021 10:29:57 +0800
-Subject: [PATCH] topology: fix potential null pointer from strchr
-
-This patch adds check to the return pointer from strchr,
-because it may be null and cause segment fault, if component
-is not properly constructed.
-
-Fixes: https://github.com/alsa-project/alsa-utils/pull/91
-Signed-off-by: Chao Song <chao.song@linux.intel.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- topology/pre-process-dapm.c   | 5 +++++
- topology/pre-process-object.c | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/topology/pre-process-dapm.c b/topology/pre-process-dapm.c
-index 450ca717..dbaf2f11 100644
---- a/topology/pre-process-dapm.c
-+++ b/topology/pre-process-dapm.c
-@@ -146,6 +146,11 @@ static int tplg_pp_get_widget_name(struct tplg_pre_processor *tplg_pp,
-
- 	/* get class name */
- 	args = strchr(string, '.');
-+	if (!args) {
-+		SNDERR("Error getting class name for %s\n", string);
-+		return -EINVAL;
-+	}
-+
- 	class_name = calloc(1, strlen(string) - strlen(args) + 1);
- 	if (!class_name)
- 		return -ENOMEM;
-diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c
-index 09aa3758..ac8caeca 100644
---- a/topology/pre-process-object.c
-+++ b/topology/pre-process-object.c
-@@ -492,6 +492,11 @@ static int tplg_pp_add_object_tuple_section(struct tplg_pre_processor *tplg_pp,
- 	}
-
- 	type = strchr(token_ref, '.');
-+	if(!type) {
-+		SNDERR("Error getting type for %s\n", token_ref);
-+		return -EINVAL;
-+	}
-+
- 	token = calloc(1, strlen(token_ref) - strlen(type) + 1);
- 	if (!token)
- 		return -ENOMEM;
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
deleted file mode 100644
index e175287a5598..000000000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 78212445de4c8e07873cbc7dff2abcacd031f151 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 1 Jun 2021 17:47:42 +0200
-Subject: [PATCH] alsactl: fix the nested iteration
-
-There may be nested iterations for hw: card names.
-Handle this card name in snd_card_iterator_sinit().
-
-BugLink: https://github.com/alsa-project/alsa-lib/issues/142
-Fixes: eefc2c6 ("alsactl: use card iterator functions for all card loops")
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- alsactl/utils.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/alsactl/utils.c b/alsactl/utils.c
-index c79fd951..881b5053 100644
---- a/alsactl/utils.c
-+++ b/alsactl/utils.c
-@@ -247,6 +247,8 @@ int snd_card_iterator_sinit(struct snd_card_iterator *iter, const char *cardname
- 	int cardno = -1;
- 
- 	if (cardname) {
-+		if (strncmp(cardname, "hw:", 3) == 0)
-+			cardname += 3;
- 		cardno = snd_card_get_index(cardname);
- 		if (cardno < 0) {
- 			error("Cannot find soundcard '%s'...", cardname);