-
Notifications
You must be signed in to change notification settings - Fork 546
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'fasttrack/3.0' into nicogbg/prometheus-High-CVEs-3.0
- Loading branch information
Showing
291 changed files
with
5,986 additions
and
18,681 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
SPECS-EXTENDED/apache-commons-io/apache-commons-io.signatures.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "Signatures": { | ||
| "apache-commons-io-build.xml": "3661f04824b5f93033dfc9f993a97f1435ff467f7e3cf5e2846f2d63a690ad3b", | ||
| "commons-io-2.8.0-src.tar.gz": "1e44c2b038bf825526305f0320b2e24dce039f399968326aab30c475ab765612", | ||
| "commons-io-2.8.0-src.tar.gz.asc": "5df617e9034a4e31cf7671af111edae1537dd14dc8d5e2fa4392a038f912df61" | ||
| "apache-commons-io-build.xml": "d7daa228b59ff41d5917745a77732bd31dc38dc1cea4edf1f65879c8ab82c4a2", | ||
| "commons-io-2.14.0-src.tar.gz": "306d53e907f491b9ac6b0e74e6ad9d8cbc0cf1b024cfb21df59a0c486fd181bc", | ||
| "commons-io-2.14.0-src.tar.gz.asc": "e46f87969e7accfa80aa194207c47d213730bc2427fb8ce7affbbfef5c3d1ec5" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,8 +22,8 @@ Distribution: Azure Linux | |
| %define short_name commons-%{base_name} | ||
| %bcond_with tests | ||
| Name: apache-%{short_name} | ||
| Version: 2.8.0 | ||
| Release: 2%{?dist} | ||
| Version: 2.14.0 | ||
| Release: 1%{?dist} | ||
| Summary: Utilities to assist with developing IO functionality | ||
| License: Apache-2.0 | ||
| Group: Development/Libraries/Java | ||
|
|
@@ -93,6 +93,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} | |
| %doc %{_javadocdir}/%{name} | ||
|
|
||
| %changelog | ||
| * Mon Oct 7 2024 Bhagyashri Pathak <[email protected]> - 2.14.0-1 | ||
| - Upgrade to 2.14.0 to fix the CVE-2024-47554. | ||
| - License verified | ||
|
|
||
| * Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 2.8.0-2 | ||
| - Converting the 'Release' tag to the '[number].[distribution]' format. | ||
|
|
||
|
|
||
11 changes: 11 additions & 0 deletions
11
SPECS-EXTENDED/apache-commons-io/commons-io-2.14.0-src.tar.gz.asc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| -----BEGIN PGP SIGNATURE----- | ||
|
|
||
| iQEzBAABCgAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAmURZkQACgkQhv3H4qES | ||
| YssmAAf+Opr906UCvufO2/ncd3Q2RuJDC24WoUlK8t18yNLTXcG1ZhxtqHn0ms/l | ||
| D59OwQQaerBr2f/Y4dB1WLTg/XIrgtbmjImKk0iOXwVirb5etdXdnLUXf3oRvJG+ | ||
| C98BB26kY4QPYmRzQMFdf6AVRMZvva51c+u7zrKDOC0/VlxYPY8UlYQfCJ6Uyxqu | ||
| TMUwQ1/cfSr65DIQui/X/RM09tGcyItb2wScZlGSq7FqtYNUj6GYAEZqhPeG74pq | ||
| 5xC19viyCGnTLO8LRaqmzmqidMPcYc95GqO9BiQDcI393qZJsq9GSxMwvIPcVJNp | ||
| l6oNdUcPRxIf0yFJm47dmFtEeM4KXg== | ||
| =+Thz | ||
| -----END PGP SIGNATURE----- |
11 changes: 0 additions & 11 deletions
11
SPECS-EXTENDED/apache-commons-io/commons-io-2.8.0-src.tar.gz.asc
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ | |
| Summary: Signed GRand Unified Bootloader for %{buildarch} systems | ||
| Name: grub2-efi-binary-signed-%{buildarch} | ||
| Version: 2.06 | ||
| Release: 20%{?dist} | ||
| Release: 21%{?dist} | ||
| License: GPLv3+ | ||
| Vendor: Microsoft Corporation | ||
| Distribution: Azure Linux | ||
|
|
@@ -79,6 +79,9 @@ cp %{SOURCE3} %{buildroot}/boot/efi/EFI/BOOT/%{grubpxeefiname} | |
| /boot/efi/EFI/BOOT/%{grubpxeefiname} | ||
|
|
||
| %changelog | ||
| * Mon Oct 28 2024 Chris Co <[email protected]> - 2.06-21 | ||
| - Bump release number to match grub release | ||
|
|
||
| * Tue Aug 13 2024 Daniel McIlvaney <[email protected]> - 2.06-20 | ||
| - Move grub2-rpm-macros to the azurelinux-rpm-macros package | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,8 @@ | |
| %define uname_r %{version}-%{release} | ||
| Summary: Signed Linux Kernel for %{buildarch} systems | ||
| Name: kernel-signed-%{buildarch} | ||
| Version: 6.6.51.1 | ||
| Release: 5%{?dist} | ||
| Version: 6.6.57.1 | ||
| Release: 2%{?dist} | ||
| License: GPLv2 | ||
| Vendor: Microsoft Corporation | ||
| Distribution: Azure Linux | ||
|
|
@@ -145,6 +145,27 @@ echo "initrd of kernel %{uname_r} removed" >&2 | |
| %exclude /module_info.ld | ||
|
|
||
| %changelog | ||
| * Wed Oct 30 2024 Thien Trung Vuong <[email protected]> - 6.6.57.1-2 | ||
| - Bump release to match kernel | ||
|
|
||
| * Tue Oct 29 2024 CBL-Mariner Servicing Account <[email protected]> - 6.6.57.1-1 | ||
| - Auto-upgrade to 6.6.57.1 | ||
|
|
||
| * Thu Oct 24 2024 Rachel Menge <[email protected]> - 6.6.56.1-5 | ||
| - Bump release to match kernel | ||
|
|
||
| * Wed Oct 23 2024 Rachel Menge <[email protected]> - 6.6.56.1-4 | ||
| - Bump release to match kernel | ||
|
|
||
| * Wed Oct 23 2024 Rachel Menge <[email protected]> - 6.6.56.1-3 | ||
| - Bump release to match kernel | ||
|
|
||
| * Tue Oct 22 2024 Rachel Menge <[email protected]> - 6.6.56.1-2 | ||
| - Bump release to match kernel | ||
|
|
||
| * Thu Oct 17 2024 CBL-Mariner Servicing Account <[email protected]> - 6.6.56.1-1 | ||
| - Auto-upgrade to 6.6.56.1 | ||
|
|
||
| * Thu Oct 03 2024 Rachel Menge <[email protected]> - 6.6.51.1-5 | ||
| - Bump release to match kernel | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,8 +5,8 @@ | |
| %define kernelver %{version}-%{release} | ||
| Summary: Signed Unified Kernel Image for %{buildarch} systems | ||
| Name: kernel-uki-signed-%{buildarch} | ||
| Version: 6.6.51.1 | ||
| Release: 5%{?dist} | ||
| Version: 6.6.57.1 | ||
| Release: 2%{?dist} | ||
| License: GPLv2 | ||
| Vendor: Microsoft Corporation | ||
| Distribution: Azure Linux | ||
|
|
@@ -68,6 +68,27 @@ popd | |
| /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi | ||
|
|
||
| %changelog | ||
| * Wed Oct 30 2024 Thien Trung Vuong <[email protected]> - 6.6.57.1-2 | ||
| - Bump release to match kernel | ||
|
|
||
| * Tue Oct 29 2024 CBL-Mariner Servicing Account <[email protected]> - 6.6.57.1-1 | ||
| - Auto-upgrade to 6.6.57.1 | ||
|
|
||
| * Thu Oct 24 2024 Rachel Menge <[email protected]> - 6.6.56.1-5 | ||
| - Bump release to match kernel | ||
|
|
||
| * Wed Oct 23 2024 Rachel Menge <[email protected]> - 6.6.56.1-4 | ||
| - Bump release to match kernel | ||
|
|
||
| * Wed Oct 23 2024 Rachel Menge <[email protected]> - 6.6.56.1-3 | ||
| - Bump release to match kernel | ||
|
|
||
| * Tue Oct 22 2024 Rachel Menge <[email protected]> - 6.6.56.1-2 | ||
| - Bump release to match kernel | ||
|
|
||
| * Thu Oct 17 2024 CBL-Mariner Servicing Account <[email protected]> - 6.6.56.1-1 | ||
| - Auto-upgrade to 6.6.56.1 | ||
|
|
||
| * Thu Oct 03 2024 Rachel Menge <[email protected]> - 6.6.51.1-5 | ||
| - Bump release to match kernel | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| Summary: A shared library implementation of IPMI and the basic tools | ||
| Name: OpenIPMI | ||
| Version: 2.0.33 | ||
| Version: 2.0.36 | ||
| Release: 1%{?dist} | ||
| License: LGPLv2+ AND GPLv2+ OR BSD | ||
| Vendor: Microsoft Corporation | ||
| Distribution: Azure Linux | ||
| Group: System Environment/Base | ||
| URL: https://sourceforge.net/projects/openipmi/ | ||
| Source0: https://downloads.sourceforge.net/openipmi/OpenIPMI-2.0.33.tar.gz | ||
| Source0: https://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz | ||
| Source1: openipmi-helper | ||
| Source2: ipmi.service | ||
| BuildRequires: ncurses-devel | ||
|
|
@@ -190,6 +190,9 @@ echo "disable ipmi.service" > %{buildroot}%{_libdir}/systemd/system-preset/50-ip | |
| %{_mandir}/man5/ipmi_sim_cmd.5.gz | ||
|
|
||
| %changelog | ||
| * Mon Oct 14 2024 Suresh Thelkar <[email protected]> - 2.0.36-1 | ||
| - Upgrade to 2.0.36 | ||
|
|
||
| * Thu Mar 28 2024 Xiaohong Deng <[email protected]> - 2.0.33-1 | ||
| - Upgrade to 2.0.33 | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "Signatures": { | ||
| "apr-1.7.4.tar.gz": "a4137dd82a185076fa50ba54232d920a17c6469c30b0876569e1c2a05ff311d9" | ||
| } | ||
| } | ||
| "Signatures": { | ||
| "apr-1.7.5.tar.gz": "3375fa365d67bcf945e52b52cba07abea57ef530f40b281ffbe977a9251361db" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,15 @@ | ||
| %define aprver 1 | ||
| Summary: The Apache Portable Runtime | ||
| Name: apr | ||
| Version: 1.7.4 | ||
| Version: 1.7.5 | ||
| Release: 1%{?dist} | ||
| License: ASL 2.0 | ||
| Vendor: Microsoft Corporation | ||
| Distribution: Azure Linux | ||
| Group: System Environment/Libraries | ||
| URL: https://apr.apache.org/ | ||
| Source0: https://dlcdn.apache.org/%{name}/%{name}-%{version}.tar.gz | ||
| Patch0: skip-known-test-failure.patch | ||
| %if 0%{?with_check} | ||
| # test_serv_by_name test requires /etc/services file from iana-etc package | ||
| BuildRequires: iana-etc | ||
|
|
@@ -25,7 +26,7 @@ Requires: %{name} = %{version}-%{release} | |
| It contains the libraries and header files to create applications | ||
|
|
||
| %prep | ||
| %setup -q | ||
| %autosetup -p1 | ||
|
|
||
| %build | ||
| ./configure --prefix=%{_prefix} \ | ||
|
|
@@ -64,6 +65,10 @@ make -j1 check | |
| %{_libdir}/pkgconfig | ||
|
|
||
| %changelog | ||
| * Wed Oct 16 2024 Muhammad Falak <[email protected]> - 1.7.5-1 | ||
| - Upgrade version to address CVE-2023-49582 | ||
| - Enable ptests | ||
|
|
||
| * Fri Oct 27 2023 CBL-Mariner Servicing Account <[email protected]> - 1.7.4-1 | ||
| - Auto-upgrade to 1.7.4 - Azure Linux 3.0 - package upgrades | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| From d4aa66b790e48f4745bcc6623b286577f2e0aef0 Mon Sep 17 00:00:00 2001 | ||
| From: Muhammad Falak R Wani <[email protected]> | ||
| Date: Wed, 16 Oct 2024 19:47:33 +0530 | ||
| Subject: [PATCH] test: skip known test failure | ||
|
|
||
| Signed-off-by: Muhammad Falak R Wani <[email protected]> | ||
| --- | ||
| test/Makefile.in | 7 +++++++ | ||
| 1 file changed, 7 insertions(+) | ||
|
|
||
| diff --git a/test/Makefile.in b/test/Makefile.in | ||
| index e3b71e0..b609c74 100644 | ||
| --- a/test/Makefile.in | ||
| +++ b/test/Makefile.in | ||
| @@ -172,6 +172,13 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) | ||
| progfailed="$$progfailed '$$prog mode $$mode'"; \ | ||
| fi; \ | ||
| done; \ | ||
| + elif test "$$prog" = 'testall'; then \ | ||
| + ./$$prog -v -x testsock; \ | ||
| + status=$$?; \ | ||
| + if test $$status != 0; then \ | ||
| + teststatus=$$status; \ | ||
| + progfailed="$$progfailed $$prog"; \ | ||
| + fi; \ | ||
| else \ | ||
| ./$$prog -v; \ | ||
| status=$$?; \ | ||
| -- | ||
| 2.40.1 | ||
|
|
Oops, something went wrong.