From 9436c98a66cb9e108ce51ebebef2936d96dc6a02 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 24 May 2021 21:06:03 +0200 Subject: [PATCH 1/6] Drop StandardOutput=syslog from alsa-restore.service Link: https://bugzilla.redhat.com/show_bug.cgi?id=1937450 --- alsa-restore.service | 1 - 1 file changed, 1 deletion(-) diff --git a/alsa-restore.service b/alsa-restore.service index 4a32e11..c97411f 100644 --- a/alsa-restore.service +++ b/alsa-restore.service @@ -12,4 +12,3 @@ Type=oneshot RemainAfterExit=true ExecStart=-/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main restore ExecStop=/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf store -StandardOutput=syslog From ec07a2e945e5a1ca91d6e7fc6c63f61689ae19f2 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 28 May 2021 13:51:40 +0200 Subject: [PATCH 2/6] updated to 1.2.5 --- alsa-utils.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 2d9468e..fbc7704 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,11 +1,11 @@ -%define baseversion 1.2.4 +%define baseversion 1.2.5 #define fixversion .2 %global _hardened_build 1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2+ URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 @@ -30,6 +30,7 @@ Requires(preun): systemd Requires(postun): systemd # use latest alsa-lib - the executables in this package requires latest API Requires: alsa-lib%{?_isa} >= %{baseversion} +Requires: alsa-ucm >= %{baseversion} %description This package contains command line utilities for the Advanced Linux Sound @@ -37,7 +38,6 @@ Architecture (ALSA). %package -n alsa-ucm-utils Summary: Advanced Linux Sound Architecture (ALSA) - Use Case Manager -Requires: alsa-ucm >= %{baseversion} %description -n alsa-ucm-utils This package contains Use Case Manager tools for Advanced Linux Sound @@ -192,6 +192,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Mon May 31 2021 Jaroslav Kysela - 1.2.5-1 +* Updated to 1.2.5 + * Tue Jan 26 2021 Fedora Release Engineering - 1.2.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 34a0d2e..ba34275 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.2.4.tar.bz2) = 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770 +SHA512 (alsa-utils-1.2.5.tar.bz2) = 0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1 From f047e3ccf33c9c7da483a194ee44a3b94549e99e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 3 Jun 2021 13:10:07 +0200 Subject: [PATCH 3/6] fixes for 1.2.5 --- alsa-utils-git.patch | 84 ++++++++++++++++++++++++++++++++++++++++++++ alsa-utils.spec | 5 ++- 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/alsa-utils-git.patch b/alsa-utils-git.patch index e69de29..9851a38 100644 --- a/alsa-utils-git.patch +++ b/alsa-utils-git.patch @@ -0,0 +1,84 @@ +From 78212445de4c8e07873cbc7dff2abcacd031f151 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 1 Jun 2021 17:47:42 +0200 +Subject: [PATCH 1/2] 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 +--- + alsactl/utils.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/alsactl/utils.c b/alsactl/utils.c +index c79fd95..881b505 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); +-- +2.30.2 + + +From 3d7a6facd9e1f962eef6c4ba3aa4cdc22477a6ac Mon Sep 17 00:00:00 2001 +From: Chao Song +Date: Mon, 31 May 2021 10:29:57 +0800 +Subject: [PATCH 2/2] 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 +Signed-off-by: Jaroslav Kysela +--- + 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 450ca71..dbaf2f1 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 09aa375..ac8caec 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; +-- +2.30.2 + diff --git a/alsa-utils.spec b/alsa-utils.spec index fbc7704..8c7c027 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -5,7 +5,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 @@ -192,6 +192,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Thu Jun 3 2021 Jaroslav Kysela - 1.2.5-2 +* Fixes for 1.2.5 (alsactl) + * Mon May 31 2021 Jaroslav Kysela - 1.2.5-1 * Updated to 1.2.5 From 9b7e9c3e2ebffce85155af153a1e38aea46c1ef8 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 14 Jun 2021 14:16:37 +0200 Subject: [PATCH 4/6] updated to 1.2.5.1 --- alsa-utils.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 8c7c027..9072d3e 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,11 +1,11 @@ -%define baseversion 1.2.5 +%define baseversion 1.2.5.1 #define fixversion .2 %global _hardened_build 1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2+ URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 @@ -192,6 +192,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Mon Jun 14 2021 Jaroslav Kysela - 1.2.5.1-1 +* Updated to 1.2.5.1 + * Thu Jun 3 2021 Jaroslav Kysela - 1.2.5-2 * Fixes for 1.2.5 (alsactl) diff --git a/sources b/sources index ba34275..e113470 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.2.5.tar.bz2) = 0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1 +SHA512 (alsa-utils-1.2.5.1.tar.bz2) = bbafeb9189ec5802965c4e69cf6e7cd4c132ffb77b57f164d6585649890f96edd052c72697171fd629b39e12f78648fea634468df34c1a80255227ca397907bf From 6d43765cdf9957f1d88d07dee728d10e487f32b1 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 14 Jun 2021 14:21:47 +0200 Subject: [PATCH 5/6] remove the old patch --- alsa-utils-git.patch | 84 -------------------------------------------- 1 file changed, 84 deletions(-) diff --git a/alsa-utils-git.patch b/alsa-utils-git.patch index 9851a38..e69de29 100644 --- a/alsa-utils-git.patch +++ b/alsa-utils-git.patch @@ -1,84 +0,0 @@ -From 78212445de4c8e07873cbc7dff2abcacd031f151 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 1 Jun 2021 17:47:42 +0200 -Subject: [PATCH 1/2] 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 ---- - alsactl/utils.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/alsactl/utils.c b/alsactl/utils.c -index c79fd95..881b505 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); --- -2.30.2 - - -From 3d7a6facd9e1f962eef6c4ba3aa4cdc22477a6ac Mon Sep 17 00:00:00 2001 -From: Chao Song -Date: Mon, 31 May 2021 10:29:57 +0800 -Subject: [PATCH 2/2] 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 -Signed-off-by: Jaroslav Kysela ---- - 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 450ca71..dbaf2f1 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 09aa375..ac8caec 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; --- -2.30.2 - From 49137146f35b37e6b8bda1f5a8072a8704b9480a Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 6 Dec 2021 13:31:49 +0100 Subject: [PATCH 6/6] updated to 1.2.6 --- alsa-utils.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 9072d3e..9af7aec 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,4 +1,4 @@ -%define baseversion 1.2.5.1 +%define baseversion 1.2.6 #define fixversion .2 %global _hardened_build 1 @@ -192,6 +192,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Mon Dec 6 2021 Jaroslav Kysela - 1.2.6-1 +* Updated to 1.2.6 + * Mon Jun 14 2021 Jaroslav Kysela - 1.2.5.1-1 * Updated to 1.2.5.1 diff --git a/sources b/sources index e113470..d84d8e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.2.5.1.tar.bz2) = bbafeb9189ec5802965c4e69cf6e7cd4c132ffb77b57f164d6585649890f96edd052c72697171fd629b39e12f78648fea634468df34c1a80255227ca397907bf +SHA512 (alsa-utils-1.2.6.tar.bz2) = 6842f0f4c2f7cc5ac3ba94736ee259d9988b5d3e0d2b522f858d712e16938d2845fa9ef64f4aa60222b8ef6738e053f9113a5ea24a197f2c0d6c4dbd70030f5e