Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

0001-topology-decoder-add-boundary-check-for-channel-mixe.patch

@@ -1,34 +0,0 @@
-From 5f7fe33002d2d98d84f72e381ec2cccc0d5d3d40 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Thu, 29 Jan 2026 16:51:09 +0100
-Subject: [PATCH] topology: decoder - add boundary check for channel mixer
- count
-
-Malicious binary topology file may cause heap corruption.
-
-CVE: CVE-2026-25068
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/topology/ctl.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/topology/ctl.c b/src/topology/ctl.c
-index a0c24518..322c461c 100644
---- a/src/topology/ctl.c
-+++ b/src/topology/ctl.c
-@@ -1250,6 +1250,11 @@ int tplg_decode_control_mixer1(snd_tplg_t *tplg,
- 	if (mc->num_channels > 0) {
- 		map = tplg_calloc(heap, sizeof(*map));
- 		map->num_channels = mc->num_channels;
-+		if (map->num_channels > SND_TPLG_MAX_CHAN ||
-+		    map->num_channels > SND_SOC_TPLG_MAX_CHAN) {
-+			snd_error(TOPOLOGY, "mixer: unexpected channel count %d", map->num_channels);
-+			return -EINVAL;
-+		}
- 		for (i = 0; i < map->num_channels; i++) {
- 			map->channel[i].reg = mc->channel[i].reg;
- 			map->channel[i].shift = mc->channel[i].shift;
--- 
-2.54.0
-

alsa-lib.spec

@@ -2,17 +2,17 @@
 #define  prever_dot .rc3
 #define  postver    a
 
-%define version_alsa_lib  1.2.15.3
-%define version_alsa_ucm  1.2.15.3
+%define version_alsa_lib  1.2.16.1
+%define version_alsa_ucm  1.2.16.1
 %define version_alsa_tplg 1.2.5
 
 %global lib_patch         0
-%global ucm_patch         1
+%global ucm_patch         0
 
 Summary:  The Advanced Linux Sound Architecture (ALSA) library
 Name:     alsa-lib
 Version:  %{version_alsa_lib}
-Release:  4%{?prever_dot}%{?dist}
+Release:  2%{?prever_dot}%{?dist}
 License:  LGPL-2.1-or-later
 URL:      http://www.alsa-project.org/
 
@@ -33,10 +33,6 @@ Patch0:   alsa-git.patch
 %endif
 Patch1:   alsa-lib-1.2.3.1-config.patch
 Patch2:   alsa-lib-1.2.10-glibc-open.patch
-# https://github.com/alsa-project/alsa-lib/commit/5f7fe33002d2d98d84f72e381ec2cccc0d5d3d40
-# https://bugzilla.redhat.com/show_bug.cgi?id=2435423
-# fixes CVE-2026-25068 buffer overflow
-Patch3:   0001-topology-decoder-add-boundary-check-for-channel-mixe.patch
 
 BuildRequires:  doxygen
 BuildRequires:  autoconf automake libtool
@@ -89,7 +85,6 @@ contains alsa-lib configuration of SoC topology
 %endif
 %patch -P1 -p1 -b .config
 %patch -P2 -p1 -b .glibc-open
-%patch -P3 -p1 -b .CVE-2026-25068
 
 %build
 # This package uses top level ASM constructs which are incompatible with LTO.
@@ -186,6 +181,15 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
 %{_datadir}/alsa/topology
 
 %changelog
+* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.16.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jun 13 2026 Jaroslav Kysela <perex@perex.cz> - 1.2.16.1-1
+- update to 1.2.16.1
+
+* Mon Jun  1 2026 Jaroslav Kysela <perex@perex.cz> - 1.2.16-2
+- update to 1.2.16
+
 * Fri May 22 2026 Adam Williamson <awilliam@redhat.com> - 1.2.15.3-4
 - Backport fix for CVE-2026-25068 (buffer overflow) (#2435423)
 - Backports to support new Lenovo laptop models (#2480230)

alsa-ucm-conf.patch

@@ -1,401 +0,0 @@
-From 3ac622e6ace8fe856037d3af1ef7af4eb8963550 Mon Sep 17 00:00:00 2001
-From: "Chaitanya Krishna.J" <ChaitanyaKrishna.J@amd.com>
-Date: Mon, 23 Mar 2026 18:17:59 +0530
-Subject: [PATCH 1/5] ucm2: sof-soundwire: add ACP DMIC configuration
-
-add acp-dmic.conf to the sof-soundwire configuration tree to enable
-the ACP digital microphone (DMIC) endpoint for AMD SoundWire platforms.
-
-Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/732
-Suggested-by: Jaroslav Kysela <perex@perex.cz>
-Signed-off-by: Chaitanya Krishna.J <ChaitanyaKrishna.J@amd.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/sof-soundwire/acp-dmic.conf | 8 ++++++++
- 1 file changed, 8 insertions(+)
- create mode 100644 ucm2/sof-soundwire/acp-dmic.conf
-
-diff --git a/ucm2/sof-soundwire/acp-dmic.conf b/ucm2/sof-soundwire/acp-dmic.conf
-new file mode 100644
-index 0000000..342fff0
---- /dev/null
-+++ b/ucm2/sof-soundwire/acp-dmic.conf
-@@ -0,0 +1,8 @@
-+SectionDevice."Mic" {
-+	Comment "Digital Microphone"
-+
-+	Value {
-+		CapturePriority 100
-+		CapturePCM "hw:${CardId},4"
-+	}
-+}
--- 
-2.54.0
-
-
-From cc175604e9149f59bdbb606cf9aae9fa14aea2c8 Mon Sep 17 00:00:00 2001
-From: derek fang <derek.fang@realtek.com>
-Date: Fri, 13 Mar 2026 11:11:34 +0800
-Subject: [PATCH 2/5] sof-soundwire: rt1320: add playback control switch
-
-This patch defines 'rt1320 OT23' as PlaybackMixerElem and
-a remapped one 'rt1320 OT23 Playback Switch' when using one
-or two amps.
-
-And also attach rt1320 OT23 controls to speaker LED.
-
-Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/743
-Signed-off-by: derek fang <derek.fang@realtek.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/codecs/rt1320/init.conf          | 67 +++++++++++++++++++++++++++
- ucm2/sof-soundwire/rt1320.conf        |  7 ++-
- ucm2/sof-soundwire/sof-soundwire.conf |  2 +-
- 3 files changed, 73 insertions(+), 3 deletions(-)
- create mode 100644 ucm2/codecs/rt1320/init.conf
-
-diff --git a/ucm2/codecs/rt1320/init.conf b/ucm2/codecs/rt1320/init.conf
-new file mode 100644
-index 0000000..f8f80c5
---- /dev/null
-+++ b/ucm2/codecs/rt1320/init.conf
-@@ -0,0 +1,67 @@
-+# RT1320 amp specific switch control settings
-+
-+DefineMacro.rt1320spkled.If.0 {
-+	Condition {
-+		Type RegexMatch
-+		Regex "${var:__ForAmps}"
-+		String "${var:SpeakerAmps}"
-+	}
-+	True.Macro [
-+		{ SetLED { LED="speaker" Action="attach" CtlId="rt1320-${var:__Amp} OT23 L Switch" } }
-+		{ SetLED { LED="speaker" Action="attach" CtlId="rt1320-${var:__Amp} OT23 R Switch" } }
-+	]
-+}
-+
-+If.spk_init_rt1320 {
-+	Condition {
-+		Type String
-+		Needle "rt1320"
-+		Haystack "${var:MultiSpeakerShadow}"
-+	}
-+	True {
-+		Macro.num1.rt1320spkled { ForAmps "[12]" Amp 1 }
-+		Macro.num2.rt1320spkled { ForAmps "2" Amp 2 }
-+	}
-+}
-+
-+Define.SpeakerMixerElem "rt1320-1 OT23"
-+
-+If.oneAmp {
-+	Condition {
-+		Type RegexMatch
-+		Regex "1"
-+		String "${var:SpeakerAmps}"
-+	}
-+	True {
-+		Define.SpeakerMixerElem "rt1320 OT23"
-+		LibraryConfig.remap.Config {
-+			ctl.default.map {
-+				"name='rt1320 OT23 Playback Switch'" {
-+					"name='rt1320-1 OT23 L Switch'".vindex.0 0
-+					"name='rt1320-1 OT23 R Switch'".vindex.1 0
-+				}
-+			}
-+		}
-+	}
-+}
-+
-+If.twoAmps {
-+	Condition {
-+		Type RegexMatch
-+		Regex "2"
-+		String "${var:SpeakerAmps}"
-+	}
-+	True {
-+		Define.SpeakerMixerElem "rt1320 OT23"
-+		LibraryConfig.remap.Config {
-+			ctl.default.map {
-+				"name='rt1320 OT23 Playback Switch'" {
-+					"name='rt1320-1 OT23 L Switch'".vindex.0 0
-+					"name='rt1320-1 OT23 R Switch'".vindex.0 0
-+					"name='rt1320-2 OT23 L Switch'".vindex.1 0
-+					"name='rt1320-2 OT23 R Switch'".vindex.1 0
-+				}
-+			}
-+		}
-+	}
-+}
-diff --git a/ucm2/sof-soundwire/rt1320.conf b/ucm2/sof-soundwire/rt1320.conf
-index 6d3ddc8..2d5d1e8 100644
---- a/ucm2/sof-soundwire/rt1320.conf
-+++ b/ucm2/sof-soundwire/rt1320.conf
-@@ -41,7 +41,10 @@ SectionDevice."Speaker" {
- 	]
- 
- 	Value {
--	      PlaybackPriority 100
--	      PlaybackPCM "hw:${CardId},2"
-+		PlaybackPriority 100
-+		PlaybackPCM "hw:${CardId},2"
-+		PlaybackMixer "default:${CardId}"
-+		PlaybackMixerElem "${var:SpeakerMixerElem}"
-+		PlaybackSwitch "${var:SpeakerMixerElem} Playback Switch"
- 	}
- }
-diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
-index 7a00209..e4cec0d 100644
---- a/ucm2/sof-soundwire/sof-soundwire.conf
-+++ b/ucm2/sof-soundwire/sof-soundwire.conf
-@@ -50,7 +50,7 @@ DefineRegex {
- 		String "${CardComponents}"
- 	}
- 	MultiCodec {
--		Regex "(rt712|rt713|rt721|rt722)"
-+		Regex "(rt712|rt713|rt721|rt722|rt1320)"
- 		String "${var:SpeakerCodec1} ${var:HeadsetCodec1} ${var:MicCodec1}"
- 	}
- }
--- 
-2.54.0
-
-
-From e29b39c32ce232b93d1341cbcfe12bbd161d8981 Mon Sep 17 00:00:00 2001
-From: derek fang <derek.fang@realtek.com>
-Date: Fri, 10 Apr 2026 15:47:25 +0800
-Subject: [PATCH 3/5] sof-soundwire: rt1320: add rt1320 dmic config
-
-This patch adds configs for rt1320 dmic function.
-It defines the MicMixerElem, a remapped control for the two rt1320-dmic
-case, and also attaches rt1320 FU capture controls to the mic LED.
-
-Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/743
-Signed-off-by: derek fang <derek.fang@realtek.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/codecs/rt1320/init.conf   | 50 ++++++++++++++++++++++++++++++++++
- ucm2/sof-soundwire/rt1320.conf | 41 ++++++++++++++++++++++++++++
- 2 files changed, 91 insertions(+)
-
-diff --git a/ucm2/codecs/rt1320/init.conf b/ucm2/codecs/rt1320/init.conf
-index f8f80c5..7ad37d7 100644
---- a/ucm2/codecs/rt1320/init.conf
-+++ b/ucm2/codecs/rt1320/init.conf
-@@ -65,3 +65,53 @@ If.twoAmps {
- 		}
- 	}
- }
-+
-+# RT1320 DMIC specific switch control settings
-+
-+Define.MicMixerElem "rt1320-1 FU"
-+
-+DefineMacro.rt1320micled.If.0 {
-+	Condition {
-+		Type RegexMatch
-+		Regex "${var:__ForMics}"
-+		String "${var:Mics}"
-+	}
-+	True.Macro [{ SetLED { LED="mic" Action="attach" CtlId="rt1320-${var:__Mic} FU Capture Switch" } }]
-+}
-+
-+If.mic_init_rt1320 {
-+	Condition {
-+		Type String
-+		Needle "rt1320"
-+		Haystack "${var:MultiMicShadow}"
-+	}
-+	True {
-+		Macro.num1.rt1320micled { ForMics "[12]" Mic 1 }
-+		Macro.num2.rt1320micled { ForMics "2" Mic 2 }
-+
-+		If.twoMics {
-+			Condition {
-+				Type RegexMatch
-+				Regex "2"
-+				String "${var:Mics}"
-+			}
-+			True {
-+				Define.MicMixerElem "rt1320 FU"
-+				LibraryConfig.remap.Config {
-+					ctl.default.map {
-+						"name='rt1320 FU Capture Switch'" {
-+							"name='rt1320-1 FU Capture Switch'".vindex.0 0
-+							"name='rt1320-1 FU Capture Switch'".vindex.1 1
-+							"name='rt1320-1 FU Capture Switch'".vindex.2 2
-+							"name='rt1320-1 FU Capture Switch'".vindex.3 3
-+							"name='rt1320-2 FU Capture Switch'".vindex.4 0
-+							"name='rt1320-2 FU Capture Switch'".vindex.5 1
-+							"name='rt1320-2 FU Capture Switch'".vindex.6 2
-+							"name='rt1320-2 FU Capture Switch'".vindex.7 3
-+						}
-+					}
-+				}
-+			}
-+		}
-+	}
-+}
-diff --git a/ucm2/sof-soundwire/rt1320.conf b/ucm2/sof-soundwire/rt1320.conf
-index 2d5d1e8..e3c4395 100644
---- a/ucm2/sof-soundwire/rt1320.conf
-+++ b/ucm2/sof-soundwire/rt1320.conf
-@@ -48,3 +48,44 @@ SectionDevice."Speaker" {
- 		PlaybackSwitch "${var:SpeakerMixerElem} Playback Switch"
- 	}
- }
-+
-+# Use case Configuration for RT1320 SoundWire DMIC (microphone function)
-+
-+DefineMacro.rt1320dmic.If.0 {
-+	Condition {
-+		Type RegexMatch
-+		Regex "${var:__ForMics}"
-+		String "${var:Mics}"
-+	}
-+	True {
-+		EnableSequence [
-+			cset "name='rt1320-${var:__Mic} FU Capture Switch' 1"
-+		]
-+		DisableSequence [
-+			cset "name='rt1320-${var:__Mic} FU Capture Switch' 0"
-+		]
-+	}
-+}
-+
-+If.codecmic {
-+	Condition {
-+		Type String
-+		Needle "rt1320"
-+		Haystack "${var:MultiMicShadow}"
-+	}
-+	True {
-+		SectionDevice."Mic" {
-+			Comment	"Microphones"
-+
-+			Macro.num1.rt1320dmic { ForMics "[12]" Mic 1 }
-+			Macro.num2.rt1320dmic { ForMics "2" Mic 2 }
-+
-+			Value {
-+				CapturePriority 100
-+				CapturePCM "hw:${CardId},4"
-+				CaptureMixerElem "${var:MicMixerElem}"
-+				CaptureSwitch "${var:MicMixerElem} Capture Switch"
-+			}
-+		}
-+	}
-+}
--- 
-2.54.0
-
-
-From f0426539611035deba327c7a575f37c562d03b26 Mon Sep 17 00:00:00 2001
-From: Aaron Ma <aaron.ma@canonical.com>
-Date: Thu, 23 Apr 2026 13:00:50 +0800
-Subject: [PATCH 4/5] ucm2: rt722: add speaker mute LED and PlaybackSwitch for
- FU06
-
-Attach rt722 FU06 Playback Switch to the speaker mute LED via SetLED
-in init.conf, and declare PlaybackSwitch in the Speaker device so
-PipeWire can toggle hardware mute.
-
-Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/753
-Link: https://lore.kernel.org/linux-sound/20260423101338.1040131-1-aaron.ma@canonical.com/
-Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/codecs/rt722/init.conf   | 9 +++++++++
- ucm2/sof-soundwire/rt722.conf | 1 +
- 2 files changed, 10 insertions(+)
-
-diff --git a/ucm2/codecs/rt722/init.conf b/ucm2/codecs/rt722/init.conf
-index 40f2458..7275ce5 100644
---- a/ucm2/codecs/rt722/init.conf
-+++ b/ucm2/codecs/rt722/init.conf
-@@ -10,6 +10,15 @@ BootSequence [
- 	cset "name='rt722 FU0F Capture Volume' 63"
- ]
- 
-+If.spk_init_rt722 {
-+	Condition {
-+		Type String
-+		Needle "rt722"
-+		Haystack "${var:SpeakerCodec1}"
-+	}
-+	True.Macro [{ SetLED { LED="speaker" Action="attach" CtlId="rt722 FU06 Playback Switch" } }]
-+}
-+
- If.mic_init_rt722 {
- 	Condition {
- 		Type String
-diff --git a/ucm2/sof-soundwire/rt722.conf b/ucm2/sof-soundwire/rt722.conf
-index a4a431b..00e143c 100644
---- a/ucm2/sof-soundwire/rt722.conf
-+++ b/ucm2/sof-soundwire/rt722.conf
-@@ -51,6 +51,7 @@ If.codecspk {
- 				PlaybackPriority 100
- 				PlaybackPCM "hw:${CardId},2"
- 				PlaybackMixerElem "rt722 FU06"
-+				PlaybackSwitch "rt722 FU06 Playback Switch"
- 				PlaybackVolume "rt722 FU06 Playback Volume"
- 			}
- 		}
--- 
-2.54.0
-
-
-From e5dcddf6a3ead9cc993749a7caee962282ff8431 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 6 May 2026 18:12:47 +0200
-Subject: [PATCH 5/5] ucm2: sof-soundwire: add Mic LED control for ACP PDM DMIC
-
-Like for SOF HDA, add software defined Mic LED switch control with
-Mic LED bindings.
-
-Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/752
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/codecs/acp-dmic/init.conf        | 4 ++++
- ucm2/sof-soundwire/acp-dmic.conf      | 2 ++
- ucm2/sof-soundwire/sof-soundwire.conf | 2 +-
- 3 files changed, 7 insertions(+), 1 deletion(-)
- create mode 100644 ucm2/codecs/acp-dmic/init.conf
-
-diff --git a/ucm2/codecs/acp-dmic/init.conf b/ucm2/codecs/acp-dmic/init.conf
-new file mode 100644
-index 0000000..d2a4867
---- /dev/null
-+++ b/ucm2/codecs/acp-dmic/init.conf
-@@ -0,0 +1,4 @@
-+Macro [
-+	{ CtlNew { Arg="name='Mic ACP LED Capture Switch' type=bool,count=1 off" } }
-+	{ SetLED { LED="mic" Action="attach" CtlId="Mic ACP LED Capture Switch" } }
-+]
-diff --git a/ucm2/sof-soundwire/acp-dmic.conf b/ucm2/sof-soundwire/acp-dmic.conf
-index 342fff0..ebdc302 100644
---- a/ucm2/sof-soundwire/acp-dmic.conf
-+++ b/ucm2/sof-soundwire/acp-dmic.conf
-@@ -4,5 +4,7 @@ SectionDevice."Mic" {
- 	Value {
- 		CapturePriority 100
- 		CapturePCM "hw:${CardId},4"
-+		CaptureMixerElem "Mic ACP LED"
-+		CaptureSwitch "Mic ACP LED Capture Switch"
- 	}
- }
-diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
-index e4cec0d..822ff57 100644
---- a/ucm2/sof-soundwire/sof-soundwire.conf
-+++ b/ucm2/sof-soundwire/sof-soundwire.conf
-@@ -126,7 +126,7 @@ If.hs_init {
- If.mic_init {
- 	Condition {
- 		Type RegexMatch
--		Regex "(cs42l43-dmic|cs42l45-dmic|rt712-dmic|rt713-dmic|rt715(-sdca)?)"
-+		Regex "((acp|cs42l43|cs42l45|rt712|rt713)-dmic|rt715(-sdca)?)"
- 		String "${var:MicCodec1}"
- 	}
- 	True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf"
--- 
-2.54.0
-

sources

@@ -1,3 +1,3 @@
-SHA512 (alsa-lib-1.2.15.3.tar.bz2) = 7fc0fa8a5ae02d3404d2c262c6a14fcbb8b08e25993eac86b9e89b8419ed4d293b422da77b3eb7a1930f26c316b638e5aa7bdba78b0ada9908b0362d132a0cc0
-SHA512 (alsa-ucm-conf-1.2.15.3.tar.bz2) = 079aeb45bc3f98448f6e48a1267db5d3f46a51d7060eb8275d0a084574e23eec34f07108610538e898c397fa24941ccf1bb7722c6b4bb0fa9c48904addc03973
+SHA512 (alsa-lib-1.2.16.1.tar.bz2) = 2ddc5eef7fafe73ba6d8e4f79640a5aaa6e27aac2c77075fda9ee8ae61727bddfcda661e257057d8cf2f1647897d33153703f9ba913574ae7f1fbec53db3fa22
+SHA512 (alsa-ucm-conf-1.2.16.1.tar.bz2) = df25a29afc3b87347fa89f3fe60ebda68068acdaf68e081b58455ebee319c21e82af4076ba1f10781ba620a9e8efa6e65db27c5989d63a429d44a715dbd1d460
 SHA512 (alsa-topology-conf-1.2.5.tar.bz2) = 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51