summaryrefslogtreecommitdiff
path: root/media-sound/alsa-utils
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
commitd18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /media-sound/alsa-utils
parente748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
gentoo resync : 15.06.2021
Diffstat (limited to 'media-sound/alsa-utils')
-rw-r--r--media-sound/alsa-utils/Manifest10
-rw-r--r--media-sound/alsa-utils/alsa-utils-1.2.2.ebuild2
-rw-r--r--media-sound/alsa-utils/alsa-utils-1.2.3.ebuild2
-rw-r--r--media-sound/alsa-utils/alsa-utils-1.2.4.ebuild4
-rw-r--r--media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild (renamed from media-sound/alsa-utils/alsa-utils-1.2.5.ebuild)4
-rw-r--r--media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch49
-rw-r--r--media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch28
7 files changed, 90 insertions, 9 deletions
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 880f5a74f6d5..9fe73fb22571 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,13 +1,15 @@
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.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
DIST alsa-utils-1.2.3.tar.bz2 1277105 BLAKE2B 70037123de16d4d267fbe862acba31144e1f060cb01c294cf0691d9378e1f04b108c9f3a5e071979abe9b5c1c15a49facc9e0be73122caaf812047a514e4de4d SHA512 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012
DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
DIST alsa-utils-1.2.5.tar.bz2 1326676 BLAKE2B 52cbe978390e1b5600bf7422e67ece1d24a946d99acddbc059bf6eb3a0b8dfe37cc573167013296e923bf1597973eb55b2580eaf849e088822ba7b2afc14279f SHA512 0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1
-EBUILD alsa-utils-1.2.2.ebuild 2334 BLAKE2B e8dceb69a7dde34306d35baaa15b8e986a3b0d9099fc110e2ebcb05f6961e63b643ba80026f35477cc15368f31f7d36eb55f4233b10d194471024a45978170a1 SHA512 a28f3b896110d432768193b5122feff2190334ef0ffdf6f48f393a57b29b4edc289a97ccd8d3e851aa970a72788ea309c5c95331bb38253f95b5221a719a0835
-EBUILD alsa-utils-1.2.3.ebuild 2334 BLAKE2B e8dceb69a7dde34306d35baaa15b8e986a3b0d9099fc110e2ebcb05f6961e63b643ba80026f35477cc15368f31f7d36eb55f4233b10d194471024a45978170a1 SHA512 a28f3b896110d432768193b5122feff2190334ef0ffdf6f48f393a57b29b4edc289a97ccd8d3e851aa970a72788ea309c5c95331bb38253f95b5221a719a0835
-EBUILD alsa-utils-1.2.4.ebuild 2335 BLAKE2B 001e48c41114d82be491c59c42f04d351bc2949498e4bcb6c29cd9697206ff76c93c76bda22528f6c7745eae05f5190d7b3c6ec2472b2e6506a4e829261ead57 SHA512 4e47c7a7db56f528aa524376dc365a9daf076f65629262d962ebe6878bafa8b6cc5a3975792fde7a71a9c456001ed3e9836a9026bcb935b8e1deb7748770c27f
-EBUILD alsa-utils-1.2.5.ebuild 2341 BLAKE2B f1d3124447c60c824dac7c2e9b4007ba93e5eeaf558dacedb344a4a6d0b18d3e7be5bf7cb2b8f99f1f6d07e62da85cbfcf416a049030d3edc2c74b62b5185546 SHA512 2dfcf714a7d865085086b742914c2faeb036825273bef722351ed9219ca074612e7745afd8b11a20a58e1e8999f71d28744992d98b4c3bc9cb9df438d5c66b49
+EBUILD alsa-utils-1.2.2.ebuild 2348 BLAKE2B 572712ba71f0ae8cc2b63064e1c63deb4380dfa33eb9a60103c12bdd7ddc66541529c819883af1238e42d41f2631e9097bc743cf1adf1e6f87503939c1dddef9 SHA512 12ff0f279cbcb7c8d1fb3d45abc3a8e5eb4dc8ddf65faf90d10f5d4c7d791cf2cbfb436ff91470860b1157d3caa166b21d5989346526936f14fb0b2c5c70b008
+EBUILD alsa-utils-1.2.3.ebuild 2348 BLAKE2B 572712ba71f0ae8cc2b63064e1c63deb4380dfa33eb9a60103c12bdd7ddc66541529c819883af1238e42d41f2631e9097bc743cf1adf1e6f87503939c1dddef9 SHA512 12ff0f279cbcb7c8d1fb3d45abc3a8e5eb4dc8ddf65faf90d10f5d4c7d791cf2cbfb436ff91470860b1157d3caa166b21d5989346526936f14fb0b2c5c70b008
+EBUILD alsa-utils-1.2.4.ebuild 2348 BLAKE2B 0b51fb69c74f99f97c623fd16bed5cbe310aa16a3e1801206b2fb4ee1b66aaa67e9cfa5fd23457b700adc2eb7d337f429007ab9166db0a63f39a8916baf99d37 SHA512 ab75b6e5a55e3488bc436d293354edbd6f135047be7871123ab408f0fabdbd46bb0e0c60594e55bec69b914bb26d1805a7174e1891c530dc63a7a8f04a4eb0d8
+EBUILD alsa-utils-1.2.5-r1.ebuild 2513 BLAKE2B 8ed803654a0a5918ae83774e65f07159ff0ea14324c937c3f6452ab526241db10dc5c5c3486b9ad9f33b765fcebea6eaeb9324f5f0d5fe14be30677969322250 SHA512 ac76c3dbef7dca7fb2da0ad8c93a862393712bb5ce638083adb7c2eea9e63167981117f5a91193b0b6cc5aeb66590ddf9b0d91b752e3792812608f2cb18a001f
MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
index 0ec8d4c4e195..05318d998ea3 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit systemd udev
DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
index 0ec8d4c4e195..05318d998ea3 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit systemd udev
DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
index e88a3ec3ab73..41322ff53b32 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
@@ -5,12 +5,12 @@ EAPI=7
inherit systemd udev
DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="bat doc +libsamplerate +ncurses nls selinux"
CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.5.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
index 507876a36c16..2c95a68cb144 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.5.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit systemd udev
DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
LICENSE="GPL-2"
@@ -24,6 +24,8 @@ RDEPEND="${CDEPEND}
BDEPEND="virtual/pkgconfig"
PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.5-fix-the-nested-iteration.patch # bug #793410
+ "${FILESDIR}"/${PN}-1.2.5-fix-potential-null-pointer-from-strchr.patch # bug #793410
"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
)
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
new file mode 100644
index 000000000000..f06756a8af96
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 000000000000..e175287a5598
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
@@ -0,0 +1,28 @@
+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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 17:52:47 +0000