Skip to content

Commit 722e30a

Browse files
CBL-Mariner-BotKanishk BansalKanishk-Bansaljslobodzian
authored
Merge PR "[AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade munge to 0.5.18 for CVE-2026-25506 - branch main" #15927
Signed-off-by: Kanishk Bansal <kanbansal@microsoft.com> Co-authored-by: Kanishk Bansal <kanbansal@microsoft.com> Co-authored-by: Kanishk Bansal <103916909+Kanishk-Bansal@users.noreply.github.com> Co-authored-by: jslobodzian <joslobo@microsoft.com>
1 parent 29227c6 commit 722e30a

3 files changed

Lines changed: 20 additions & 20 deletions

File tree

SPECS/munge/munge.signatures.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"Signatures": {
3-
"create-munge-key": "faf294f275027c9165524daa17e862ae7e28cb32aed5f9c452d9bd37065ccebe",
4-
"munge-0.5.13.tar.xz": "99753dfd06a4f063c36f3fb0eb1964f394feb649937d94c4734d85b7964144da",
5-
"munge.logrotate": "f8443edd07c98e0e3c9178c93a0a35e1c690cf3b6fbdb33508b34871657a9879"
6-
}
7-
}
2+
"Signatures": {
3+
"create-munge-key": "faf294f275027c9165524daa17e862ae7e28cb32aed5f9c452d9bd37065ccebe",
4+
"munge.logrotate": "f8443edd07c98e0e3c9178c93a0a35e1c690cf3b6fbdb33508b34871657a9879",
5+
"munge-0.5.18.tar.xz": "39c3ec6ef5604bfa206e8aa10fc05d5119040f6de4a554bc0fb98ca1aed838dc"
6+
}
7+
}

SPECS/munge/munge.spec

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: Enables uid & gid authentication across a host cluster
22
Name: munge
3-
Version: 0.5.13
4-
Release: 9%{?dist}
3+
Version: 0.5.18
4+
Release: 1%{?dist}
55
# The libs and devel package is GPLv3+ and LGPLv3+ where as the main package is GPLv3 only.
66
License: GPLv3+ AND LGPLv3+
77
Vendor: Microsoft Corporation
@@ -53,7 +53,6 @@ cp -p %{SOURCE2} munge.logrotate
5353

5454
%build
5555
%configure --disable-static --with-crypto-lib=openssl
56-
echo "d /run/munge 0755 munge munge -" > src/etc/munge.tmpfiles.conf.in
5756
# Get rid of some rpaths for /usr/sbin
5857
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
5958
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -68,21 +67,17 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
6867
install -p -m 755 create-munge-key %{buildroot}/%{_sbindir}/create-munge-key
6968
install -p -D -m 644 munge.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/munge
7069

71-
# rm unneeded files.
72-
rm %{buildroot}/%{_sysconfdir}/sysconfig/munge
73-
rm %{buildroot}/%{_initddir}/munge
74-
7570
# Exclude .la files
7671
rm %{buildroot}/%{_libdir}/libmunge.la
7772

78-
7973
# Fix a few permissions
8074
chmod 700 %{buildroot}%{_sharedstatedir}/munge %{buildroot}%{_var}/log/munge
8175
chmod 700 %{buildroot}%{_sysconfdir}/munge
8276

8377
# Create and empty key file and pid file to be marked as a ghost file below.
8478
# i.e it is not actually included in the rpm, only the record
8579
# of it is.
80+
mkdir -p %{buildroot}%{_var}/run/munge/
8681
touch %{buildroot}%{_var}/run/munge/munged.pid
8782
mv %{buildroot}%{_var}/run %{buildroot}
8883

@@ -110,30 +105,32 @@ exit 0
110105
%{_bindir}/unmunge
111106
%{_sbindir}/munged
112107
%{_sbindir}/create-munge-key
108+
%{_sbindir}/mungekey
113109
%{_mandir}/man1/munge.1.gz
114110
%{_mandir}/man1/remunge.1.gz
115111
%{_mandir}/man1/unmunge.1.gz
116112
%{_mandir}/man7/munge.7.gz
117113
%{_mandir}/man8/munged.8.gz
114+
%{_mandir}/man8/mungekey.8.gz
118115
%{_unitdir}/munge.service
119116

120117
%attr(0700,munge,munge) %dir %{_var}/log/munge
121118
%attr(0700,munge,munge) %dir %{_sharedstatedir}/munge
122119
%attr(0700,munge,munge) %dir %{_sysconfdir}/munge
123120
%attr(0755,munge,munge) %dir /run/munge/
124121
%attr(0644,munge,munge) %ghost /run/munge/munged.pid
125-
126-
%config(noreplace) %{_tmpfilesdir}/munge.conf
122+
%config(noreplace) %{_sysconfdir}/sysconfig/munge
127123
%config(noreplace) %{_sysconfdir}/logrotate.d/munge
124+
%{_sysusersdir}/munge.conf
128125

129126
%license COPYING COPYING.LESSER
130127
%doc AUTHORS
131-
%doc JARGON META NEWS QUICKSTART README
128+
%doc JARGON NEWS QUICKSTART README
132129
%doc doc
133130

134131
%files libs
135132
%{_libdir}/libmunge.so.2
136-
%{_libdir}/libmunge.so.2.0.0
133+
%{_libdir}/libmunge.so.2.0.1
137134

138135
%files devel
139136
%{_includedir}/munge.h
@@ -156,6 +153,9 @@ exit 0
156153
%{_mandir}/man3/munge_strerror.3.gz
157154

158155
%changelog
156+
* Fri Feb 13 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 0.5.18-1
157+
- Auto-upgrade to 0.5.18 - for CVE-2026-25506
158+
159159
* Mon Feb 06 2023 Riken Maharjan <rmaharjan@microsoft.com> - 0.5.13-9
160160
- Move from Extended to Core.
161161
- License verified.

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13773,8 +13773,8 @@
1377313773
"type": "other",
1377413774
"other": {
1377513775
"name": "munge",
13776-
"version": "0.5.13",
13777-
"downloadUrl": "https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz"
13776+
"version": "0.5.18",
13777+
"downloadUrl": "https://github.com/dun/munge/releases/download/munge-0.5.18/munge-0.5.18.tar.xz"
1377813778
}
1377913779
}
1378013780
},

0 commit comments

Comments
 (0)