Skip to content

Commit 6a3673d

Browse files
jslobodzianjslobodzian
committed
Merge branch '3.0-dev' into 3.0
2 parents 68b8a4f + 9c00c57 commit 6a3673d

9 files changed

Lines changed: 79930 additions & 10 deletions

File tree

‎SPECS/SymCrypt-OpenSSL/SymCrypt-OpenSSL.signatures.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Signatures": {
3-
"SymCrypt-OpenSSL-1.6.0.tar.gz": "7265ddd737b582418a7f0c29144ab11af1bdfd8ea65fbb1a92711068fa606f61"
4-
}
2+
"Signatures": {
3+
"SymCrypt-OpenSSL-1.6.1.tar.gz": "8766d2f5c977960b1aab0099c0d74190b0705bc29f29ff4b266dac3729644658"
4+
}
55
}

‎SPECS/SymCrypt-OpenSSL/SymCrypt-OpenSSL.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Summary: The SymCrypt engine for OpenSSL (SCOSSL) allows the use of OpenSSL with SymCrypt as the provider for core cryptographic operations
22
Name: SymCrypt-OpenSSL
3-
Version: 1.6.0
3+
Version: 1.6.1
44
Release: 1%{?dist}
55
License: MIT
66
Vendor: Microsoft Corporation
@@ -67,6 +67,9 @@ install SymCryptProvider/symcrypt_prov.cnf %{buildroot}%{_sysconfdir}/pki/tls/sy
6767
%{_sysconfdir}/pki/tls/symcrypt_prov.cnf
6868

6969
%changelog
70+
* Wed Nov 27 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.6.1-1
71+
- Auto-upgrade to 1.6.1 - bug fixes
72+
7073
* Mon Nov 25 2024 Tobias Brick <tobiasb@microsoft.com> - 1.6.0-1
7174
- Upgrade to SymCrypt-OpenSSL 1.6.0
7275

‎SPECS/multus/CVE-2023-44487.patch‎

Lines changed: 71077 additions & 0 deletions
Large diffs are not rendered by default.

‎SPECS/multus/CVE-2023-45288.patch‎

Lines changed: 8790 additions & 0 deletions
Large diffs are not rendered by default.

‎SPECS/multus/multus.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
Summary: CNI plugin providing multiple interfaces in containers
2020
Name: multus
2121
Version: 4.0.2
22-
Release: 2%{?dist}
22+
Release: 3%{?dist}
2323
License: ASL 2.0
2424
Vendor: Microsoft Corporation
2525
Distribution: Azure Linux
@@ -28,6 +28,8 @@ URL: https://github.com/intel/multus-cni
2828
Source0: https://github.com/k8snetworkplumbingwg/multus-cni/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
2929
%define commit efdc0a5c7d1ea4bb236d638403420448b48782b3
3030
Patch0: CVE-2023-3978.patch
31+
Patch1: CVE-2023-44487.patch
32+
Patch2: CVE-2023-45288.patch
3133
BuildRequires: golang
3234
BuildRequires: golang-packaging
3335

@@ -70,6 +72,10 @@ install -D -m0644 deployments/multus-daemonset-crio.yml %{buildroot}%{_datadir}/
7072
%{_datarootdir}/k8s-yaml/multus/multus.yaml
7173

7274
%changelog
75+
* Fri Nov 22 2024 Xiaohong Deng <xiaohongdeng@microsoft.com> - 4.0.2-3
76+
- Add patches to resolve CVE-2023-39325, CVE-2023-44487 and CVE-2023-45288.
77+
- CVE-2023-39325 is a subset of CVE-2023-44487 and the patches are combined.
78+
7379
* Wed Aug 21 2024 Sumedh Sharma <sumsharma@microsoft.com> - 4.0.2-2
7480
- Add patch to resolve CVE-2023-3978
7581

‎SPECS/perl-Module-ScanDeps/CVE-2024-10224.patch‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,39 @@ index 7bc9662..dd79c65 100644
243243
# e.g. for autosplit .ix and .al files. In the latter case,
244244
# the key may also start with "./" if found via a relative path in @INC.
245245
$key =~ s|\\|/|g;
246+
247+
248+
From 49468814a24221affe113664899be21aef60e846 Mon Sep 17 00:00:00 2001
249+
From: rschupp <roderich.schupp@gmail.com>
250+
Date: Fri, 8 Nov 2024 19:17:30 +0100
251+
Subject: [PATCH] fix parsing of "use if ..."
252+
253+
Fixes errors in PAR::Packer test t/90-rt59710.t
254+
---
255+
lib/Module/ScanDeps.pm | 6 ++++--
256+
1 file changed, 4 insertions(+), 2 deletions(-)
257+
258+
diff --git a/lib/Module/ScanDeps.pm b/lib/Module/ScanDeps.pm
259+
index f911440..71d8b75 100644
260+
--- a/lib/Module/ScanDeps.pm
261+
+++ b/lib/Module/ScanDeps.pm
262+
@@ -925,7 +925,7 @@ sub scan_line {
263+
next CHUNK;
264+
}
265+
266+
- if (my ($pragma, $args) = /^use \s+ (autouse|if) \s+ (.+)/x)
267+
+ if (my ($pragma, $args) = /^(?:use|no) \s+ (autouse|if) \s+ (.+)/x)
268+
{
269+
# NOTE: There are different ways the MODULE may
270+
# be specified for the "autouse" and "if" pragmas, e.g.
271+
@@ -938,7 +938,9 @@ sub scan_line {
272+
else {
273+
# The syntax of the "if" pragma is
274+
# use if COND, MODULE => ARGUMENTS
275+
- (undef, $module) = _parse_module_list($args);
276+
+ # NOTE: This works only for simple conditions.
277+
+ $args =~ s/.*? (?:,|=>) \s*//x;
278+
+ ($module) = _parse_module_list($args);
279+
}
280+
$found{_mod2pm($pragma)}++;
281+
$found{_mod2pm($module)}++ if $module;

‎SPECS/perl-Module-ScanDeps/perl-Module-ScanDeps.spec‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Summary: Recursively scan Perl code for dependencies
33
Name: perl-Module-ScanDeps
44
Version: 1.35
5-
Release: 2%{?dist}
5+
Release: 3%{?dist}
66
License: GPL+ or Artistic
77
Group: Development/Libraries
88
Source0: https://cpan.metacpan.org/authors/id/R/RS/RSCHUPP/Module-ScanDeps-%{version}.tar.gz
@@ -15,10 +15,14 @@ BuildRequires: perl >= 5.28.0
1515
BuildRequires: perl(ExtUtils::MakeMaker)
1616
BuildRequires: perl-generators
1717
%if 0%{?with_check}
18+
BuildRequires: perl(AutoLoader)
19+
BuildRequires: perl(blib)
1820
BuildRequires: perl(CPAN)
1921
BuildRequires: perl(CPAN::Meta)
2022
BuildRequires: perl(FindBin)
23+
BuildRequires: perl(Test)
2124
BuildRequires: perl(Test::More)
25+
BuildRequires: perl(Test::Pod)
2226
%endif
2327

2428
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -55,6 +59,7 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} +
5559
export PERL_MM_USE_DEFAULT=1
5660
cpan local::lib
5761
cpan Test::Requires
62+
cpan IPC::Run3
5863
make %{?_smp_mflags} test
5964

6065
%files
@@ -65,13 +70,16 @@ make %{?_smp_mflags} test
6570
%{_mandir}/man3/*
6671

6772
%changelog
73+
* Mon Nov 25 2024 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.35-3
74+
- Fixing perl-Module-ScanDeps tests.
75+
6876
* Fri Nov 15 2024 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.35-2
6977
- Patched CVE-2024-10224.
7078

7179
* Mon Dec 18 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.35-1
7280
- Auto-upgrade to 1.35 - Azure Linux 3.0 - package upgrades
7381

74-
* Tue Aug 23 2020 Muhammad Falak <mwani@microsoft.com> - 1.31-2
82+
* Tue Aug 23 2022 Muhammad Falak <mwani@microsoft.com> - 1.31-2
7583
- Add BR on `perl-{(CPAN::*),(FindBin),(Test::More)}` to enable ptest
7684

7785
* Fri Apr 22 2022 Mateusz Malisz <mamalisz@microsoft.com> - 1.31-1

‎cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28246,8 +28246,8 @@
2824628246
"type": "other",
2824728247
"other": {
2824828248
"name": "SymCrypt-OpenSSL",
28249-
"version": "1.6.0",
28250-
"downloadUrl": "https://github.com/microsoft/SymCrypt-OpenSSL/archive/v1.6.0.tar.gz"
28249+
"version": "1.6.1",
28250+
"downloadUrl": "https://github.com/microsoft/SymCrypt-OpenSSL/archive/v1.6.1.tar.gz"
2825128251
}
2825228252
}
2825328253
},

toolkit/imageconfigs/cvm.json renamed to toolkit/imageconfigs/marketplace-gen2-cvm.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"MaxSize": 2048,
66
"Artifacts": [
77
{
8-
"Name": "cvm",
8+
"Name": "cblmariner-gen2-cvm",
99
"Type": "vhd"
1010
}
1111
],

0 commit comments

Comments
 (0)