Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SPECS/mariadb/mariadb.signatures.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"README.mariadb-docs": "c3c6584dbdc35445014ac48023da59cafc5abc6996859cebb4e357c2f380990f",
"README.wsrep_sst_rsync_tunnel": "f121b2f6e804a8aaf01e0c835e62b64a0d0bf6cd922cc1a21897f196f8b0714f",
"clustercheck.sh": "4be47a46f99b714bc3681fdf11b09d242dae5e3eb81274b3040a73f9d7800d50",
"mariadb-10.11.15.tar.gz": "6190529d9d047163259967a92095b505df15b39195ea55cdf856314eef4546f5",
"mariadb-10.11.16.tar.gz": "e4f9f2035d38345464ae8abaeaf68380d1ceadbafb4e84744ed2ed5b7aab64e7",
"mariadb-check-socket.sh": "6d04410549275140f07b89a1dcef99f31cd47751ef9142d14e7898e7cbcff023",
"mariadb-check-upgrade.sh": "e49c23e79155d416f7bad292d073213c0beafed99c172a06d909ec3e24ee6e75",
"mariadb-prepare-db-dir.sh": "ff8d2e719f6db158eda0acb58a9d84b43c959baf0d2a8f4d9ce7a62f13af36d0",
Expand Down
18 changes: 10 additions & 8 deletions SPECS/mariadb/mariadb.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Plain package name for cases, where %%{name} differs (e.g. for versioned packages)
%global majorname mariadb
%define package_version 10.11.15
%define majorversion %(echo %{package_version} | cut -d'.' -f1-2 )
%define majorversion 10.11

%define _vpath_builddir .

Expand Down Expand Up @@ -131,7 +130,7 @@
%global sameevr %{epoch}:%{version}-%{release}

Name: %{majorname}
Version: %{package_version}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automation fails to detect the version because of %{package_version}
Hence removing it so that auto upgrade can be utilised

Version: 10.11.16
Release: 1%{?dist}
Epoch: 3

Expand Down Expand Up @@ -1484,7 +1483,7 @@ fi
%{_mandir}/man1/galera_recovery.1*
%config(noreplace) %{_sysconfdir}/my.cnf.d/galera.cnf
%attr(0640,root,root) %ghost %config(noreplace) %{_sysconfdir}/sysconfig/clustercheck
#%{_datadir}/selinux/packages/targeted/%{majorname}-server-galera.pp
#%%{_datadir}/selinux/packages/targeted/%%{majorname}-server-galera.pp
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixes the warning: Macro expanded in comment on line 1487: %{_datadir}/selinux/packages/targeted/%{majorname}-server-galera.pp

%endif

%files -n %{pkgname}-server
Expand Down Expand Up @@ -1769,6 +1768,9 @@ fi
%endif

%changelog
* Sun Mar 08 2026 Kanishk Bansal <kanbansal@microsoft.com> - 3:10.11.16-1
- Upgrade to 10.11.16 for CVE-2026-3494

* Mon Dec 29 2025 BinduSri Adabala <v-badabala@microsoft.com> - 10.11.15-1
- Upgrade to 10.11.15 for CVE-2025-13699

Expand All @@ -1780,9 +1782,6 @@ fi
* Thu Mar 27 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 10.11.11-1
- Auto-upgrade to 10.11.11 - for CVE-2025-21490

* Tue Nov 05 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 10.11.10-1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes
error: %changelog not in descending chronological order

- Auto-upgrade to 10.11.10 - to address CVE-2024-21096

* Wed Feb 05 2025 Michal Schorm <mschorm@redhat.com> - 3:10.11.11-1
- Rebase to 10.11.11

Expand All @@ -1797,7 +1796,10 @@ fi

* Sat Nov 16 2024 Michal Schorm <mschorm@redhat.com> - 3:10.11.10-1
- Rebase to 10.11.10


* Tue Nov 05 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 10.11.10-1
- Auto-upgrade to 10.11.10 - to address CVE-2024-21096

* Tue Aug 13 2024 Michal Schorm <mschorm@redhat.com> - 3:10.11.9-1
- Rebase to 10.11.9

Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -12991,8 +12991,8 @@
"type": "other",
"other": {
"name": "mariadb",
"version": "10.11.15",
"downloadUrl": "https://downloads.mariadb.org/interstitial/mariadb-10.11.15/source/mariadb-10.11.15.tar.gz"
"version": "10.11.16",
"downloadUrl": "https://downloads.mariadb.org/interstitial/mariadb-10.11.16/source/mariadb-10.11.16.tar.gz"
}
}
},
Expand Down
Loading