Skip to content

Commit 8728caa

Browse files
jslobodzianjslobodzian
committed
Merge branch 'main' into 2.0
2 parents 64d7fb3 + fd9ff7f commit 8728caa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2496
-377
lines changed

‎SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for Azure
1111
Name: kernel-azure-signed-%{buildarch}
12-
Version: 5.15.158.2
12+
Version: 5.15.160.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Sat Jun 08 2024 CBL-Mariner Servicing Account <[email protected]> - 5.15.160.1-1
157+
- Auto-upgrade to 5.15.160.1
158+
156159
* Fri Jun 07 2024 Rachel Menge <[email protected]> - 5.15.158.2-1
157160
- Revert to 5.15.158.2
158161

‎SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for HCI
66
Name: kernel-hci-signed-%{buildarch}
7-
Version: 5.15.158.2
7+
Version: 5.15.160.1
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
149149
%exclude /module_info.ld
150150

151151
%changelog
152+
* Sat Jun 08 2024 CBL-Mariner Servicing Account <[email protected]> - 5.15.160.1-1
153+
- Auto-upgrade to 5.15.160.1
154+
152155
* Fri Jun 07 2024 Rachel Menge <[email protected]> - 5.15.158.2-1
153156
- Revert to 5.15.158.2
154157

‎SPECS-SIGNED/kernel-signed/kernel-signed.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
12-
Version: 5.15.158.2
12+
Version: 5.15.160.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Sat Jun 08 2024 CBL-Mariner Servicing Account <[email protected]> - 5.15.160.1-1
157+
- Auto-upgrade to 5.15.160.1
158+
156159
* Fri Jun 07 2024 Rachel Menge <[email protected]> - 5.15.158.2-1
157160
- Revert to 5.15.158.2
158161

‎SPECS/R/CVE-2024-27322.patch

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
From f7c46500f455eb4edfc3656c3fa20af61b16abb7 Mon Sep 17 00:00:00 2001
2+
From: luke <luke@00db46b3-68df-0310-9c12-caf00c1e9a41>
3+
Date: Sun, 31 Mar 2024 19:35:58 +0000
4+
Subject: [PATCH] readRDS() and unserialize() now signal an errorr instead of
5+
returning a PROMSXP.
6+
7+
git-svn-id: https://svn.r-project.org/R/trunk@86235 00db46b3-68df-0310-9c12-caf00c1e9a41
8+
---
9+
src/main/serialize.c | 13 ++++++++++---
10+
1 file changed, 10 insertions(+), 3 deletions(-)
11+
12+
diff --git a/src/main/serialize.c b/src/main/serialize.c
13+
index a389f713116..a190fbf8f3c 100644
14+
--- a/src/main/serialize.c
15+
+++ b/src/main/serialize.c
16+
@@ -2650,6 +2650,13 @@ do_serializeToConn(SEXP call, SEXP op, SEXP args, SEXP env)
17+
return R_NilValue;
18+
}
19+
20+
+static SEXP checkNotPromise(SEXP val)
21+
+{
22+
+ if (TYPEOF(val) == PROMSXP)
23+
+ error(_("cannot return a promise (PROMSXP) object"));
24+
+ return val;
25+
+}
26+
+
27+
/* unserializeFromConn(conn, hook) used from readRDS().
28+
It became public in R 2.13.0, and that version added support for
29+
connections internally */
30+
@@ -2699,7 +2706,7 @@ do_unserializeFromConn(SEXP call, SEXP op, SEXP args, SEXP env)
31+
con->close(con);
32+
UNPROTECT(1);
33+
}
34+
- return ans;
35+
+ return checkNotPromise(ans);
36+
}
37+
38+
/*
39+
@@ -3330,8 +3337,8 @@ attribute_hidden SEXP
40+
do_serialize(SEXP call, SEXP op, SEXP args, SEXP env)
41+
{
42+
checkArity(op, args);
43+
- if (PRIMVAL(op) == 2) return R_unserialize(CAR(args), CADR(args));
44+
-
45+
+ if (PRIMVAL(op) == 2) //return R_unserialize(CAR(args), CADR(args));
46+
+ return checkNotPromise(R_unserialize(CAR(args), CADR(args)));
47+
SEXP object, icon, type, ver, fun;
48+
object = CAR(args); args = CDR(args);
49+
icon = CAR(args); args = CDR(args);

‎SPECS/R/R.spec

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Summary: A language for data analysis and graphics
33
Name: R
44
Version: 4.1.0
5-
Release: 4%{?dist}
5+
Release: 5%{?dist}
66
License: GPLv2
77
Vendor: Microsoft Corporation
88
Distribution: Mariner
@@ -13,6 +13,7 @@ Source0: https://cran.r-project.org/src/base/R-4/R-%{version}.tar.gz
1313
# in 2018. Given curl 8.0.0 is not an actual breaking change, this patch should be fine.
1414
# We should drop this when R eventually gets official support for build with curl >= 8.0.0
1515
Patch0: 0001-configure-fix-compilation-with-curl-8.0.0.patch
16+
Patch1: CVE-2024-27322.patch
1617
BuildRequires: build-essential
1718
BuildRequires: bzip2-devel
1819
BuildRequires: curl-devel
@@ -121,6 +122,9 @@ TZ="Europe/Paris" make check -k -i
121122
%endif
122123

123124
%changelog
125+
* Wed Jun 19 2024 Saul Paredes <[email protected]> - 4.1.0-5
126+
- Patch CVE-2024-27322
127+
124128
* Wed Sep 20 2023 Jon Slobodzian <[email protected]> - 4.1.0-4
125129
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)
126130

‎SPECS/conntrack-tools/conntrack-tools.signatures.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Signatures": {
3-
"conntrack-tools-1.4.5.tar.bz2": "36c6d99c7684851d4d72e75bd07ff3f0ff1baaf4b6f069eb7244990cd1a9a462",
3+
"conntrack-tools-1.4.8.tar.xz": "067677f4c5f6564819e78ed3a9d4a8980935ea9273f3abb22a420ea30ab5ded6",
44
"conntrackd.conf": "dc7fa36293263d0674508cba4499c90d20df15eabea7a7d901f2050094ede38b",
55
"conntrackd.service": "c18f00e7b76df6dce5b7b46e1bb35e6c34f5d1fe329892c1f0327c2712282778"
66
}

‎SPECS/conntrack-tools/conntrack-tools.spec

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
Summary: Manipulate netfilter connection tracking table and run High Availability
22
Name: conntrack-tools
3-
Version: 1.4.5
4-
Release: 8%{?dist}
3+
Version: 1.4.8
4+
Release: 1%{?dist}
55
License: GPLv2
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
88
URL: https://conntrack-tools.netfilter.org/
9-
Source0: https://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
9+
Source0: https://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.xz
1010
Source1: conntrackd.service
1111
Source2: conntrackd.conf
1212
BuildRequires: bison
1313
BuildRequires: flex
1414
BuildRequires: gcc
1515
BuildRequires: libmnl-devel >= 1.0.3
16-
BuildRequires: libnetfilter_conntrack-devel >= 1.0.7
16+
BuildRequires: libnetfilter_conntrack-devel >= 1.0.9
1717
BuildRequires: libnetfilter_cthelper-devel >= 1.0.0
1818
BuildRequires: libnetfilter_cttimeout-devel >= 1.0.0
1919
BuildRequires: libnetfilter_queue-devel >= 1.0.2
@@ -96,6 +96,11 @@ echo "disable conntrackd.service" > %{buildroot}%{_libdir}/systemd/system-preset
9696
%systemd_postun conntrackd.service
9797

9898
%changelog
99+
* Wed Jun 12 2024 corvus-callidus <[email protected]> - 1.4.8-1
100+
- Update to version 1.4.8
101+
- Updating source from tar.bz2 to tar.xz
102+
- Build requires libnetfilter_conntrack >= 1.0.9
103+
99104
* Wed Sep 20 2023 Jon Slobodzian <[email protected]> - 1.4.5-8
100105
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)
101106

0 commit comments

Comments
 (0)