Skip to content

Commit a3f147d

Browse files
committed
Merge branch 'main' into 2.0
2 parents 484520a + b577c76 commit a3f147d

File tree

101 files changed

+8643
-254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+8643
-254
lines changed

.github/workflows/go-test-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
permissions: read-all
1313

1414
env:
15-
EXPECTED_GO_VERSION: "1.21"
15+
EXPECTED_GO_VERSION: "1.23"
1616

1717
jobs:
1818
build:

SPECS-EXTENDED/buildah/buildah.spec

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Summary: A command line tool used for creating OCI Images
2222
Name: buildah
2323
Version: 1.18.0
24-
Release: 26%{?dist}
24+
Release: 28%{?dist}
2525
License: ASL 2.0
2626
Vendor: Microsoft Corporation
2727
Distribution: Mariner
@@ -32,7 +32,7 @@ BuildRequires: btrfs-progs-devel
3232
BuildRequires: device-mapper-devel
3333
BuildRequires: git
3434
BuildRequires: glib2-devel
35-
BuildRequires: glibc-static >= 2.35-7%{?dist}
35+
BuildRequires: glibc-static >= 2.35-9%{?dist}
3636
BuildRequires: go-md2man
3737
BuildRequires: go-rpm-macros
3838
BuildRequires: golang
@@ -123,6 +123,12 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
123123
%{_datadir}/%{name}/test
124124

125125
%changelog
126+
* Wed Jan 28 2026 Kanishk Bansal <[email protected]> - 1.18.0-28
127+
- Bump to rebuild with updated glibc
128+
129+
* Mon Jan 19 2026 Kanishk Bansal <[email protected]> - 1.18.0-27
130+
- Bump to rebuild with updated glibc
131+
126132
* Thu Sep 04 2025 Akhila Guruju <[email protected]> - 1.18.0-26
127133
- Bump release to rebuild with golang
128134

SPECS-EXTENDED/catatonit/catatonit.spec

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Distribution: Mariner
33

44
Name: catatonit
55
Version: 0.1.7
6-
Release: 10%{?dist}
6+
Release: 12%{?dist}
77
Summary: A signal-forwarding process manager for containers
88
License: GPLv3+
99
URL: https://github.com/openSUSE/catatonit
@@ -13,7 +13,7 @@ BuildRequires: automake
1313
BuildRequires: file
1414
BuildRequires: gcc
1515
BuildRequires: git
16-
BuildRequires: glibc-static >= 2.35-7%{?dist}
16+
BuildRequires: glibc-static >= 2.35-9%{?dist}
1717
BuildRequires: libtool
1818
BuildRequires: make
1919

@@ -61,6 +61,12 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
6161
%{_libexecdir}/podman/%{name}
6262

6363
%changelog
64+
* Wed Jan 28 2026 Kanishk Bansal <[email protected]> - 0.1.7-12
65+
- Bump to rebuild with updated glibc
66+
67+
* Mon Jan 19 2026 Kanishk Bansal <[email protected]> - 0.1.7-11
68+
- Bump to rebuild with updated glibc
69+
6470
* Mon May 06 2024 Rachel Menge <[email protected]> - 0.1.7-10
6571
- Bump release to rebuild against glibc 2.35-7
6672

SPECS-EXTENDED/dyninst/dyninst.spec

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: An API for Run-time Code Generation
22
License: LGPLv2+
33
Name: dyninst
4-
Release: 12%{?dist}
4+
Release: 14%{?dist}
55
Vendor: Microsoft Corporation
66
Distribution: Mariner
77
URL: http://www.dyninst.org
@@ -31,7 +31,7 @@ BuildRequires: tbb tbb-devel
3131

3232
# Extra requires just for the testsuite
3333
BuildRequires: gcc-gfortran libstdc++-static libxml2-devel
34-
BuildRequires: glibc-static >= 2.35-7%{?dist}
34+
BuildRequires: glibc-static >= 2.35-9%{?dist}
3535

3636
# Testsuite files should not provide/require anything
3737
%{?filter_setup:
@@ -194,6 +194,12 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
194194
%attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
195195

196196
%changelog
197+
* Wed Jan 28 2026 Kanishk Bansal <[email protected]> - 10.1.0-14
198+
- Bump to rebuild with updated glibc
199+
200+
* Mon Jan 19 2026 Kanishk Bansal <[email protected]> - 10.1.0-13
201+
- Bump to rebuild with updated glibc
202+
197203
* Mon May 06 2024 Rachel Menge <[email protected]> - 10.1.0-12
198204
- Bump release to rebuild against glibc 2.35-7
199205

SPECS-EXTENDED/podman/podman.spec

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
Name: podman
3838
Version: 4.1.1
39-
Release: 23%{?dist}
39+
Release: 25%{?dist}
4040
License: ASL 2.0 and BSD and ISC and MIT and MPLv2.0
4141
Summary: Manage Pods, Containers and Container Images
4242
Vendor: Microsoft Corporation
@@ -51,7 +51,7 @@ BuildRequires: go-md2man
5151
BuildRequires: golang
5252
BuildRequires: gcc
5353
BuildRequires: glib2-devel
54-
BuildRequires: glibc-static >= 2.35-7%{?dist}
54+
BuildRequires: glibc-static >= 2.35-9%{?dist}
5555
BuildRequires: git
5656
BuildRequires: go-rpm-macros
5757
BuildRequires: gpgme-devel
@@ -387,6 +387,12 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
387387

388388
# rhcontainerbot account currently managed by lsm5
389389
%changelog
390+
* Wed Jan 28 2026 Kanishk Bansal <[email protected]> - 4.1.1-25
391+
- Bump to rebuild with updated glibc
392+
393+
* Mon Jan 19 2026 Kanishk Bansal <[email protected]> - 4.1.1-24
394+
- Bump to rebuild with updated glibc
395+
390396
* Thu Sep 04 2025 Akhila Guruju <[email protected]> - 4.1.1-23
391397
- Bump release to rebuild with golang
392398

SPECS-SIGNED/hvloader-signed/hvloader-signed.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed HvLoader.efi for %{buildarch} systems
77
Name: hvloader-signed-%{buildarch}
88
Version: 1.0.1
9-
Release: 15%{?dist}
9+
Release: 16%{?dist}
1010
License: MIT
1111
Vendor: Microsoft Corporation
1212
Distribution: Mariner
@@ -69,7 +69,10 @@ popd
6969
/boot/efi/HvLoader.efi
7070

7171
%changelog
72-
* Wed Nov 20 2025 Jyoti kanase <[email protected]> - 1.0.1-15
72+
* Tue Jan 06 2026 Azure Linux Security Servicing Account <[email protected]> - 1.0.1-16
73+
- Bump release for consistency with hvloader spec.
74+
75+
* Thu Nov 20 2025 Jyoti kanase <[email protected]> - 1.0.1-15
7376
- Bump release for consistency with hvloader spec.
7477

7578
* Tue Aug 12 2025 Azure Linux Security Servicing Account <[email protected]> - 1.0.1-14

SPECS/avahi/CVE-2025-68276.patch

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
From a4406c7f2e4c522855e5710d55b8778fbcbc2b48 Mon Sep 17 00:00:00 2001
2+
From: Evgeny Vereshchagin <[email protected]>
3+
Date: Wed, 17 Dec 2025 08:11:23 +0000
4+
Subject: [PATCH] core: refuse to create wide-area record browsers when
5+
wide-area is off
6+
7+
It fixes a bug where it was possible for unprivileged local users to
8+
crash avahi-daemon (with wide-area disabled) by creating record browsers
9+
with the AVAHI_LOOKUP_USE_WIDE_AREA flag set via D-Bus (either by calling
10+
the RecordBrowserNew method directly or by creating hostname/address/service
11+
resolvers/browsers that create those browsers internally themselves).
12+
13+
```
14+
$ gdbus call --system --dest org.freedesktop.Avahi --object-path / --method org.freedesktop.Avahi.Server.ResolveHostName -- -1 -1 yo.local -1 1
15+
Error: GDBus.Error:org.freedesktop.DBus.Error.NoReply: Message recipient disconnected from message bus without replying
16+
```
17+
```
18+
dbus-protocol.c: interface=org.freedesktop.Avahi.Server, path=/, member=ResolveHostName
19+
avahi-daemon: wide-area.c:725: avahi_wide_area_scan_cache: Assertion `e' failed.
20+
==307948==
21+
==307948== Process terminating with default action of signal 6 (SIGABRT)
22+
==307948== at 0x4B3630C: __pthread_kill_implementation (pthread_kill.c:44)
23+
==307948== by 0x4ADF921: raise (raise.c:26)
24+
==307948== by 0x4AC74AB: abort (abort.c:77)
25+
==307948== by 0x4AC741F: __assert_fail_base.cold (assert.c:118)
26+
==307948== by 0x48D8B85: avahi_wide_area_scan_cache (wide-area.c:725)
27+
==307948== by 0x48C8953: lookup_scan_cache (browse.c:351)
28+
==307948== by 0x48C8B1B: lookup_go (browse.c:386)
29+
==307948== by 0x48C9148: defer_callback (browse.c:516)
30+
==307948== by 0x48AEA0E: expiration_event (timeeventq.c:94)
31+
==307948== by 0x489D3AE: timeout_callback (simple-watch.c:447)
32+
==307948== by 0x489D787: avahi_simple_poll_dispatch (simple-watch.c:563)
33+
==307948== by 0x489D91E: avahi_simple_poll_iterate (simple-watch.c:605)
34+
==307948==
35+
```
36+
37+
wide-area has been disabled by default since
38+
9c4214146738146e454f098264690e8e884c39bd (v0.9-rc2).
39+
40+
https: //github.com/avahi/avahi/security/advisories/GHSA-mhf3-865v-g5rc
41+
Signed-off-by: Azure Linux Security Servicing Account <[email protected]>
42+
Upstream-reference: https://github.com/avahi/avahi/commit/0c013e2e819be3bda74cecf48b5f64956cf8a760.patch
43+
---
44+
avahi-core/browse.c | 5 +++++
45+
1 file changed, 5 insertions(+)
46+
47+
diff --git a/avahi-core/browse.c b/avahi-core/browse.c
48+
index 0afeba7..d7d541b 100644
49+
--- a/avahi-core/browse.c
50+
+++ b/avahi-core/browse.c
51+
@@ -583,6 +583,11 @@ AvahiSRecordBrowser *avahi_s_record_browser_prepare(
52+
AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
53+
AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !(flags & AVAHI_LOOKUP_USE_WIDE_AREA) || !(flags & AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
54+
55+
+ if ((flags & AVAHI_LOOKUP_USE_WIDE_AREA) && !server->wide_area_lookup_engine) {
56+
+ avahi_server_set_errno(server, AVAHI_ERR_NOT_SUPPORTED);
57+
+ return NULL;
58+
+ }
59+
+
60+
if (!(b = avahi_new(AvahiSRecordBrowser, 1))) {
61+
avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
62+
return NULL;
63+
--
64+
2.45.4
65+

SPECS/avahi/CVE-2025-68468.patch

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 1a249e709eb5dba9de86e1bcd0b4fe69b1f50913 Mon Sep 17 00:00:00 2001
2+
From: Hugo Muis <[email protected]>
3+
Date: Sun, 2 Mar 2025 18:06:24 +0100
4+
Subject: [PATCH] core: fix DoS bug by removing incorrect assertion
5+
6+
Closes https://github.com/avahi/avahi/issues/683
7+
8+
Signed-off-by: Azure Linux Security Servicing Account <[email protected]>
9+
Upstream-reference: https://github.com/avahi/avahi/commit/f66be13d7f31a3ef806d226bf8b67240179d309a.patch
10+
---
11+
avahi-core/browse.c | 1 -
12+
1 file changed, 1 deletion(-)
13+
14+
diff --git a/avahi-core/browse.c b/avahi-core/browse.c
15+
index 20e51fb..0e04ccb 100644
16+
--- a/avahi-core/browse.c
17+
+++ b/avahi-core/browse.c
18+
@@ -295,7 +295,6 @@ static void lookup_multicast_callback(
19+
lookup_drop_cname(l, interface, protocol, 0, r);
20+
else {
21+
/* It's a normal record, so let's call the user callback */
22+
- assert(avahi_key_equal(b->key, l->key));
23+
24+
b->callback(b, interface, protocol, event, r, flags, b->userdata);
25+
}
26+
--
27+
2.45.4
28+

SPECS/avahi/CVE-2025-68471.patch

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 4a9a20db475d2e8d3be3c62d6f7efd84324625b8 Mon Sep 17 00:00:00 2001
2+
From: Hugo Muis <[email protected]>
3+
Date: Sun, 2 Mar 2025 18:06:24 +0100
4+
Subject: [PATCH] core: fix DoS bug by changing assert to return
5+
6+
Closes https://github.com/avahi/avahi/issues/678
7+
8+
Signed-off-by: Azure Linux Security Servicing Account <[email protected]>
9+
Upstream-reference: https://github.com/avahi/avahi/pull/682/commits/9c6eb53bf2e290aed84b1f207e3ce35c54cc0aa1.patch
10+
---
11+
avahi-core/browse.c | 5 ++++-
12+
1 file changed, 4 insertions(+), 1 deletion(-)
13+
14+
diff --git a/avahi-core/browse.c b/avahi-core/browse.c
15+
index 0e04ccb..0afeba7 100644
16+
--- a/avahi-core/browse.c
17+
+++ b/avahi-core/browse.c
18+
@@ -319,7 +319,10 @@ static int lookup_start(AvahiSRBLookup *l) {
19+
assert(l);
20+
21+
assert(!(l->flags & AVAHI_LOOKUP_USE_WIDE_AREA) != !(l->flags & AVAHI_LOOKUP_USE_MULTICAST));
22+
- assert(!l->wide_area && !l->multicast);
23+
+ if (l->wide_area || l->multicast) {
24+
+ /* Avoid starting a duplicate lookup */
25+
+ return 0;
26+
+ }
27+
28+
if (l->flags & AVAHI_LOOKUP_USE_WIDE_AREA) {
29+
30+
--
31+
2.45.4
32+

SPECS/avahi/CVE-2026-24401.patch

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
From f7c38dfd2586dfc560ea26b8b1be7c13867a2c2b Mon Sep 17 00:00:00 2001
2+
From: Hugo Muis <[email protected]>
3+
Date: Sun, 2 Mar 2025 18:06:24 +0100
4+
Subject: [PATCH] core: fix uncontrolled recursion bug using a simple loop
5+
detection algorithm
6+
7+
Closes https://github.com/avahi/avahi/issues/501
8+
9+
Signed-off-by: Azure Linux Security Servicing Account <[email protected]>
10+
Upstream-reference: https://github.com/avahi/avahi/commit/78eab31128479f06e30beb8c1cbf99dd921e2524.patch
11+
---
12+
avahi-core/browse.c | 40 ++++++++++++++++++++++++++++++++++++++++
13+
1 file changed, 40 insertions(+)
14+
15+
diff --git a/avahi-core/browse.c b/avahi-core/browse.c
16+
index e8a915e..20e51fb 100644
17+
--- a/avahi-core/browse.c
18+
+++ b/avahi-core/browse.c
19+
@@ -398,6 +398,40 @@ static int lookup_go(AvahiSRBLookup *l) {
20+
return n;
21+
}
22+
23+
+static int lookup_exists_in_path(AvahiSRBLookup* lookup, AvahiSRBLookup* from, AvahiSRBLookup* to) {
24+
+ AvahiRList* rl;
25+
+ if (from == to)
26+
+ return 0;
27+
+ for (rl = from->cname_lookups; rl; rl = rl->rlist_next) {
28+
+ int r = lookup_exists_in_path(lookup, rl->data, to);
29+
+ if (r == 1) {
30+
+ /* loop detected, propagate result */
31+
+ return r;
32+
+ } else if (r == 0) {
33+
+ /* is loop detected? */
34+
+ return lookup == from;
35+
+ } else {
36+
+ /* `to` not found, continue */
37+
+ continue;
38+
+ }
39+
+ }
40+
+ /* no path found */
41+
+ return -1;
42+
+}
43+
+
44+
+static int cname_would_create_loop(AvahiSRBLookup* l, AvahiSRBLookup* n) {
45+
+ int ret;
46+
+ if (l == n)
47+
+ /* Loop to self */
48+
+ return 1;
49+
+
50+
+ ret = lookup_exists_in_path(n, l->record_browser->root_lookup, l);
51+
+
52+
+ /* Path to n always exists */
53+
+ assert(ret != -1);
54+
+ return ret;
55+
+}
56+
+
57+
static void lookup_handle_cname(AvahiSRBLookup *l, AvahiIfIndex interface, AvahiProtocol protocol, AvahiLookupFlags flags, AvahiRecord *r) {
58+
AvahiKey *k;
59+
AvahiSRBLookup *n;
60+
@@ -417,6 +451,12 @@ static void lookup_handle_cname(AvahiSRBLookup *l, AvahiIfIndex interface, Avahi
61+
return;
62+
}
63+
64+
+ if (cname_would_create_loop(l, n)) {
65+
+ /* CNAME loops are not allowed */
66+
+ lookup_unref(n);
67+
+ return;
68+
+ }
69+
+
70+
l->cname_lookups = avahi_rlist_prepend(l->cname_lookups, lookup_ref(n));
71+
72+
lookup_go(n);
73+
--
74+
2.45.4
75+

0 commit comments

Comments
 (0)