1 |
commit: 6c1fb9bc3660d5dd2626f5ca2dadb7539847dfe5 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Fri Nov 5 15:27:58 2021 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 6 09:30:19 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1fb9bc |
7 |
|
8 |
media-sound/alsa-utils: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/22828 |
13 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
14 |
|
15 |
....5-fix-potential-null-pointer-from-strchr.patch | 49 ---------------------- |
16 |
...alsa-utils-1.2.5-fix-the-nested-iteration.patch | 28 ------------- |
17 |
2 files changed, 77 deletions(-) |
18 |
|
19 |
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 |
20 |
deleted file mode 100644 |
21 |
index f06756a8af9..00000000000 |
22 |
--- a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch |
23 |
+++ /dev/null |
24 |
@@ -1,49 +0,0 @@ |
25 |
-From 3d7a6facd9e1f962eef6c4ba3aa4cdc22477a6ac Mon Sep 17 00:00:00 2001 |
26 |
-From: Chao Song <chao.song@×××××××××××.com> |
27 |
-Date: Mon, 31 May 2021 10:29:57 +0800 |
28 |
-Subject: [PATCH] topology: fix potential null pointer from strchr |
29 |
- |
30 |
-This patch adds check to the return pointer from strchr, |
31 |
-because it may be null and cause segment fault, if component |
32 |
-is not properly constructed. |
33 |
- |
34 |
-Fixes: https://github.com/alsa-project/alsa-utils/pull/91 |
35 |
-Signed-off-by: Chao Song <chao.song@×××××××××××.com> |
36 |
-Signed-off-by: Jaroslav Kysela <perex@×××××.cz> |
37 |
---- |
38 |
- topology/pre-process-dapm.c | 5 +++++ |
39 |
- topology/pre-process-object.c | 5 +++++ |
40 |
- 2 files changed, 10 insertions(+) |
41 |
- |
42 |
-diff --git a/topology/pre-process-dapm.c b/topology/pre-process-dapm.c |
43 |
-index 450ca717..dbaf2f11 100644 |
44 |
---- a/topology/pre-process-dapm.c |
45 |
-+++ b/topology/pre-process-dapm.c |
46 |
-@@ -146,6 +146,11 @@ static int tplg_pp_get_widget_name(struct tplg_pre_processor *tplg_pp, |
47 |
- |
48 |
- /* get class name */ |
49 |
- args = strchr(string, '.'); |
50 |
-+ if (!args) { |
51 |
-+ SNDERR("Error getting class name for %s\n", string); |
52 |
-+ return -EINVAL; |
53 |
-+ } |
54 |
-+ |
55 |
- class_name = calloc(1, strlen(string) - strlen(args) + 1); |
56 |
- if (!class_name) |
57 |
- return -ENOMEM; |
58 |
-diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c |
59 |
-index 09aa3758..ac8caeca 100644 |
60 |
---- a/topology/pre-process-object.c |
61 |
-+++ b/topology/pre-process-object.c |
62 |
-@@ -492,6 +492,11 @@ static int tplg_pp_add_object_tuple_section(struct tplg_pre_processor *tplg_pp, |
63 |
- } |
64 |
- |
65 |
- type = strchr(token_ref, '.'); |
66 |
-+ if(!type) { |
67 |
-+ SNDERR("Error getting type for %s\n", token_ref); |
68 |
-+ return -EINVAL; |
69 |
-+ } |
70 |
-+ |
71 |
- token = calloc(1, strlen(token_ref) - strlen(type) + 1); |
72 |
- if (!token) |
73 |
- return -ENOMEM; |
74 |
|
75 |
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 |
76 |
deleted file mode 100644 |
77 |
index e175287a559..00000000000 |
78 |
--- a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch |
79 |
+++ /dev/null |
80 |
@@ -1,28 +0,0 @@ |
81 |
-From 78212445de4c8e07873cbc7dff2abcacd031f151 Mon Sep 17 00:00:00 2001 |
82 |
-From: Jaroslav Kysela <perex@×××××.cz> |
83 |
-Date: Tue, 1 Jun 2021 17:47:42 +0200 |
84 |
-Subject: [PATCH] alsactl: fix the nested iteration |
85 |
- |
86 |
-There may be nested iterations for hw: card names. |
87 |
-Handle this card name in snd_card_iterator_sinit(). |
88 |
- |
89 |
-BugLink: https://github.com/alsa-project/alsa-lib/issues/142 |
90 |
-Fixes: eefc2c6 ("alsactl: use card iterator functions for all card loops") |
91 |
-Signed-off-by: Jaroslav Kysela <perex@×××××.cz> |
92 |
---- |
93 |
- alsactl/utils.c | 2 ++ |
94 |
- 1 file changed, 2 insertions(+) |
95 |
- |
96 |
-diff --git a/alsactl/utils.c b/alsactl/utils.c |
97 |
-index c79fd951..881b5053 100644 |
98 |
---- a/alsactl/utils.c |
99 |
-+++ b/alsactl/utils.c |
100 |
-@@ -247,6 +247,8 @@ int snd_card_iterator_sinit(struct snd_card_iterator *iter, const char *cardname |
101 |
- int cardno = -1; |
102 |
- |
103 |
- if (cardname) { |
104 |
-+ if (strncmp(cardname, "hw:", 3) == 0) |
105 |
-+ cardname += 3; |
106 |
- cardno = snd_card_get_index(cardname); |
107 |
- if (cardno < 0) { |
108 |
- error("Cannot find soundcard '%s'...", cardname); |