Skip to content

Commit 363a3f6

Browse files
CBL-Mariner-BotKanishk Bansaljslobodzian
authored
Merge PR "[AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade freeipmi to 1.6.17 for CVE-2026-33554 - branch 3.0-dev" #16685
Signed-off-by: Kanishk Bansal <kanbansal@microsoft.com> Co-authored-by: Kanishk Bansal <kanbansal@microsoft.com> Co-authored-by: jslobodzian <joslobo@microsoft.com>
1 parent 44267ca commit 363a3f6

File tree

3 files changed

+28
-22
lines changed

3 files changed

+28
-22
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"Signatures": {
3-
"bmc-watchdog.service": "8fe627d5fe40ae7dee4437c9f136e76397166ebdd90487eb8a4852ce1d22bf12",
4-
"freeipmi-1.6.11.tar.gz": "65fbd6910fc010457748695414f27c5755b4e8d75734221221f3858c6230a897",
5-
"ipmidetectd.service": "a0d9af1447e72c449bbec5cc1fedd447673eaf6cca93e5c4644517d853b39e20",
6-
"ipmiseld.service": "58b467e507eb805414697180dc94f7bb128bd61d520f3b4cb36e084dbdd5835c"
7-
}
2+
"Signatures": {
3+
"bmc-watchdog.service": "8fe627d5fe40ae7dee4437c9f136e76397166ebdd90487eb8a4852ce1d22bf12",
4+
"ipmidetectd.service": "a0d9af1447e72c449bbec5cc1fedd447673eaf6cca93e5c4644517d853b39e20",
5+
"ipmiseld.service": "58b467e507eb805414697180dc94f7bb128bd61d520f3b4cb36e084dbdd5835c",
6+
"freeipmi-1.6.17.tar.gz": "16783d10faa28847a795cce0bf86deeaa72b8fbe71d1f0dc1101d13a6b501ec1"
7+
}
88
}

SPECS/freeipmi/freeipmi.spec

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Distribution: Azure Linux
44
# Copyright (c) 2003 FreeIPMI Core Team
55

66
Name: freeipmi
7-
Version: 1.6.11
7+
Version: 1.6.17
88
Release: 1%{?dist}
99
Summary: IPMI remote console and system management software
1010
License: GPLv3+
@@ -78,6 +78,9 @@ install -pm644 %SOURCE1 %SOURCE2 %SOURCE3 %{buildroot}%{_unitdir}/
7878
# Remove initscripts
7979
rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d
8080

81+
# Remove COPYING files from doc dir; they will be installed via %%license
82+
rm -f %{buildroot}%{_datadir}/doc/%{name}/COPYING*
83+
8184
%post bmc-watchdog
8285
%systemd_post bmc-watchdog.service
8386

@@ -133,7 +136,7 @@ rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d
133136
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/freeipmi_interpret_sensor.conf
134137
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/libipmiconsole.conf
135138
%doc %{_datadir}/doc/%{name}/AUTHORS
136-
%doc %{_datadir}/doc/%{name}/COPYING
139+
%license COPYING
137140
%doc %{_datadir}/doc/%{name}/ChangeLog
138141
%doc %{_datadir}/doc/%{name}/ChangeLog.0
139142
%doc %{_datadir}/doc/%{name}/INSTALL
@@ -144,16 +147,16 @@ rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d
144147
%doc %{_datadir}/doc/%{name}/README.openipmi
145148
%doc %{_datadir}/doc/%{name}/TODO
146149
%doc %{_infodir}/*
147-
%doc %{_datadir}/doc/%{name}/COPYING.ipmiping
148-
%doc %{_datadir}/doc/%{name}/COPYING.ipmipower
149-
%doc %{_datadir}/doc/%{name}/COPYING.ipmiconsole
150-
%doc %{_datadir}/doc/%{name}/COPYING.ipmimonitoring
151-
%doc %{_datadir}/doc/%{name}/COPYING.pstdout
152-
%doc %{_datadir}/doc/%{name}/COPYING.ipmidetect
153-
%doc %{_datadir}/doc/%{name}/COPYING.ipmi-fru
154-
%doc %{_datadir}/doc/%{name}/COPYING.ipmi-dcmi
155-
%doc %{_datadir}/doc/%{name}/COPYING.sunbmc
156-
%doc %{_datadir}/doc/%{name}/COPYING.ZRESEARCH
150+
%license COPYING.ipmiping
151+
%license COPYING.ipmipower
152+
%license COPYING.ipmiconsole
153+
%license COPYING.ipmimonitoring
154+
%license COPYING.pstdout
155+
%license COPYING.ipmidetect
156+
%license COPYING.ipmi-fru
157+
%license COPYING.ipmi-dcmi
158+
%license COPYING.sunbmc
159+
%license COPYING.ZRESEARCH
157160
%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiping
158161
%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmipower
159162
%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiconsole
@@ -319,7 +322,7 @@ rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d
319322
%{_libdir}/pkgconfig/*
320323

321324
%files bmc-watchdog
322-
%doc %{_datadir}/doc/%{name}/COPYING.bmc-watchdog
325+
%license COPYING.bmc-watchdog
323326
%doc %{_datadir}/doc/%{name}/DISCLAIMER.bmc-watchdog
324327
%doc %{_datadir}/doc/%{name}/DISCLAIMER.bmc-watchdog.UC
325328
%config(noreplace) %{_sysconfdir}/sysconfig/bmc-watchdog
@@ -335,7 +338,7 @@ rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d
335338
%{_unitdir}/ipmidetectd.service
336339

337340
%files ipmiseld
338-
%doc %{_datadir}/doc/%{name}/COPYING.ipmiseld
341+
%license COPYING.ipmiseld
339342
%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiseld
340343
%{_unitdir}/ipmiseld.service
341344
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/ipmiseld.conf
@@ -345,6 +348,9 @@ rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d
345348
%dir %{_localstatedir}/cache/ipmiseld
346349

347350
%changelog
351+
* Thu Apr 02 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.6.17-1
352+
- Auto-upgrade to 1.6.17 - for CVE-2026-33554
353+
348354
* Thu Jan 11 2024 Xiaohong Deng <xiaohongdeng@microsoft.com> 1.6.11-1
349355
- Upgrade for Mariner 3.0
350356

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3930,8 +3930,8 @@
39303930
"type": "other",
39313931
"other": {
39323932
"name": "freeipmi",
3933-
"version": "1.6.11",
3934-
"downloadUrl": "http://ftp.gnu.org/gnu/freeipmi/freeipmi-1.6.11.tar.gz"
3933+
"version": "1.6.17",
3934+
"downloadUrl": "https://ftp.gnu.org/gnu/freeipmi/freeipmi-1.6.17.tar.gz"
39353935
}
39363936
}
39373937
},

0 commit comments

Comments
 (0)