Skip to content

Commit eeab7e5

Browse files
jslobodzianjslobodzian
committed
Merge branch '2.0' into fasttrack/2.0
2 parents 52013b4 + bec0395 commit eeab7e5

File tree

90 files changed

+1732
-112
lines changed

Some content is hidden

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

90 files changed

+1732
-112
lines changed

‎SPECS-EXTENDED/apache-commons-io/apache-commons-io-build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<property name="project.groupId" value="commons-io"/>
1212
<property name="project.artifactId" value="commons-io"/>
13-
<property name="project.version" value="2.8.0"/>
13+
<property name="project.version" value="2.14.0"/>
1414
<property name="project.name" value="Apache Commons IO"/>
1515
<property name="project.description" value="The Apache Commons IO library
1616
contains utility classes, stream implementations, file filters,

‎SPECS-EXTENDED/apache-commons-io/apache-commons-io.signatures.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
3-
"apache-commons-io-build.xml": "3661f04824b5f93033dfc9f993a97f1435ff467f7e3cf5e2846f2d63a690ad3b",
4-
"commons-io-2.8.0-src.tar.gz": "1e44c2b038bf825526305f0320b2e24dce039f399968326aab30c475ab765612",
5-
"commons-io-2.8.0-src.tar.gz.asc": "5df617e9034a4e31cf7671af111edae1537dd14dc8d5e2fa4392a038f912df61"
3+
"apache-commons-io-build.xml": "d7daa228b59ff41d5917745a77732bd31dc38dc1cea4edf1f65879c8ab82c4a2",
4+
"commons-io-2.14.0-src.tar.gz": "306d53e907f491b9ac6b0e74e6ad9d8cbc0cf1b024cfb21df59a0c486fd181bc",
5+
"commons-io-2.14.0-src.tar.gz.asc": "e46f87969e7accfa80aa194207c47d213730bc2427fb8ce7affbbfef5c3d1ec5"
66
}
77
}

‎SPECS-EXTENDED/apache-commons-io/apache-commons-io.spec‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Distribution: Mariner
2222
%define short_name commons-%{base_name}
2323
%bcond_with tests
2424
Name: apache-%{short_name}
25-
Version: 2.8.0
26-
Release: 2%{?dist}
25+
Version: 2.14.0
26+
Release: 1%{?dist}
2727
Summary: Utilities to assist with developing IO functionality
2828
License: Apache-2.0
2929
Group: Development/Libraries/Java
@@ -93,6 +93,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
9393
%doc %{_javadocdir}/%{name}
9494

9595
%changelog
96+
* Mon Oct 7 2024 Bhagyashri Pathak <[email protected]> - 2.14.0-1
97+
- Upgrade to 2.14.0 to fix the CVE-2024-47554.
98+
- License verified
99+
96100
* Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 2.8.0-2
97101
- Converting the 'Release' tag to the '[number].[distribution]' format.
98102

‎SPECS-EXTENDED/apache-commons-io/commons-io-2.14.0-src.tar.gz.asc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
-----BEGIN PGP SIGNATURE-----
2+
3+
iQEzBAABCgAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAmURZkQACgkQhv3H4qES
4+
YssmAAf+Opr906UCvufO2/ncd3Q2RuJDC24WoUlK8t18yNLTXcG1ZhxtqHn0ms/l
5+
D59OwQQaerBr2f/Y4dB1WLTg/XIrgtbmjImKk0iOXwVirb5etdXdnLUXf3oRvJG+
6+
C98BB26kY4QPYmRzQMFdf6AVRMZvva51c+u7zrKDOC0/VlxYPY8UlYQfCJ6Uyxqu
7+
TMUwQ1/cfSr65DIQui/X/RM09tGcyItb2wScZlGSq7FqtYNUj6GYAEZqhPeG74pq
8+
5xC19viyCGnTLO8LRaqmzmqidMPcYc95GqO9BiQDcI393qZJsq9GSxMwvIPcVJNp
9+
l6oNdUcPRxIf0yFJm47dmFtEeM4KXg==
10+
=+Thz
11+
-----END PGP SIGNATURE-----

‎SPECS-EXTENDED/apache-commons-io/commons-io-2.8.0-src.tar.gz.asc‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 5.15.167.1
13-
Release: 1%{?dist}
13+
Release: 2%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Mariner
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Wed Oct 23 2024 Rachel Menge <[email protected]> - 5.15.167.1-2
157+
- Bump release to match kernel
158+
156159
* Wed Sep 18 2024 CBL-Mariner Servicing Account <[email protected]> - 5.15.167.1-1
157160
- Auto-upgrade to 5.15.167.1
158161

‎SPECS/apr/apr.signatures.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"apr-1.7.2.tar.gz": "3d8999b216f7b6235343a4e3d456ce9379aa9a380ffb308512f133f0c5eb2db9"
3+
"apr-1.7.5.tar.gz": "3375fa365d67bcf945e52b52cba07abea57ef530f40b281ffbe977a9251361db"
44
}
55
}

‎SPECS/apr/apr.spec‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
%define aprver 1
22
Summary: The Apache Portable Runtime
33
Name: apr
4-
Version: 1.7.2
5-
Release: 2%{?dist}
4+
Version: 1.7.5
5+
Release: 1%{?dist}
66
License: ASL 2.0
77
Vendor: Microsoft Corporation
88
Distribution: Mariner
99
Group: System Environment/Libraries
1010
URL: https://apr.apache.org/
1111
Source0: https://dlcdn.apache.org/%{name}/%{name}-%{version}.tar.gz
12+
Patch0: skip-known-test-failure.patch
1213
%if %{with_check}
1314
# test_serv_by_name test requires /etc/services file from iana-etc package
1415
BuildRequires: iana-etc
@@ -25,7 +26,7 @@ Requires: %{name} = %{version}-%{release}
2526
It contains the libraries and header files to create applications
2627

2728
%prep
28-
%setup -q
29+
%autosetup -p1
2930

3031
%build
3132
./configure --prefix=%{_prefix} \
@@ -64,6 +65,10 @@ make -j1 check
6465
%{_libdir}/pkgconfig
6566

6667
%changelog
68+
* Wed Oct 16 2024 Muhammad Falak <[email protected]> - 1.7.5-1
69+
- Upgrade version to address CVE-2023-49582
70+
- Enable ptests
71+
6772
* Wed Sep 20 2023 Jon Slobodzian <[email protected]> - 1.7.2-2
6873
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)
6974

‎SPECS/apr/skip-known-test-failure.patch‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From d4aa66b790e48f4745bcc6623b286577f2e0aef0 Mon Sep 17 00:00:00 2001
2+
From: Muhammad Falak R Wani <[email protected]>
3+
Date: Wed, 16 Oct 2024 19:47:33 +0530
4+
Subject: [PATCH] test: skip known test failure
5+
6+
Signed-off-by: Muhammad Falak R Wani <[email protected]>
7+
---
8+
test/Makefile.in | 7 +++++++
9+
1 file changed, 7 insertions(+)
10+
11+
diff --git a/test/Makefile.in b/test/Makefile.in
12+
index e3b71e0..b609c74 100644
13+
--- a/test/Makefile.in
14+
+++ b/test/Makefile.in
15+
@@ -172,6 +172,13 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
16+
progfailed="$$progfailed '$$prog mode $$mode'"; \
17+
fi; \
18+
done; \
19+
+ elif test "$$prog" = 'testall'; then \
20+
+ ./$$prog -v -x testsock; \
21+
+ status=$$?; \
22+
+ if test $$status != 0; then \
23+
+ teststatus=$$status; \
24+
+ progfailed="$$progfailed $$prog"; \
25+
+ fi; \
26+
else \
27+
./$$prog -v; \
28+
status=$$?; \
29+
--
30+
2.40.1
31+

‎SPECS/cni-plugins/CVE-2023-3978.patch‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
From 8ffa475fbdb33da97e8bf79cc5791ee8751fca5e Mon Sep 17 00:00:00 2001
2+
From: Roland Shoemaker <[email protected]>
3+
Date: Thu, 06 Jul 2023 10:25:47 -0700
4+
Subject: [PATCH] html: only render content literally in the HTML namespace
5+
6+
Per the WHATWG HTML specification, section 13.3, only append the literal
7+
content of a text node if we are in the HTML namespace.
8+
9+
Thanks to Mohammad Thoriq Aziz for reporting this issue.
10+
11+
Fixes golang/go#61615
12+
Fixes CVE-2023-3978
13+
14+
Change-Id: I332152904d4e7646bd2441602bcbe591fc655fa4
15+
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1942896
16+
Reviewed-by: Tatiana Bradley <[email protected]>
17+
Run-TryBot: Roland Shoemaker <[email protected]>
18+
Reviewed-by: Damien Neil <[email protected]>
19+
TryBot-Result: Security TryBots <[email protected]>
20+
Reviewed-on: https://go-review.googlesource.com/c/net/+/514896
21+
Reviewed-by: Roland Shoemaker <[email protected]>
22+
TryBot-Result: Gopher Robot <[email protected]>
23+
Run-TryBot: Damien Neil <[email protected]>
24+
---
25+
26+
diff --git a/vendor/golang.org/x/net/html/render.go b/vendor/golang.org/x/net/html/render.go
27+
index 8b28031..e8c1233 100644
28+
--- a/vendor/golang.org/x/net/html/render.go
29+
+++ b/vendor/golang.org/x/net/html/render.go
30+
@@ -194,9 +194,8 @@
31+
}
32+
}
33+
34+
- // Render any child nodes.
35+
- switch n.Data {
36+
- case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
37+
+ // Render any child nodes
38+
+ if childTextNodesAreLiteral(n) {
39+
for c := n.FirstChild; c != nil; c = c.NextSibling {
40+
if c.Type == TextNode {
41+
if _, err := w.WriteString(c.Data); err != nil {
42+
@@ -213,7 +212,7 @@
43+
// last element in the file, with no closing tag.
44+
return plaintextAbort
45+
}
46+
- default:
47+
+ } else {
48+
for c := n.FirstChild; c != nil; c = c.NextSibling {
49+
if err := render1(w, c); err != nil {
50+
return err
51+
@@ -231,6 +230,27 @@
52+
return w.WriteByte('>')
53+
}
54+
55+
+func childTextNodesAreLiteral(n *Node) bool {
56+
+ // Per WHATWG HTML 13.3, if the parent of the current node is a style,
57+
+ // script, xmp, iframe, noembed, noframes, or plaintext element, and the
58+
+ // current node is a text node, append the value of the node's data
59+
+ // literally. The specification is not explicit about it, but we only
60+
+ // enforce this if we are in the HTML namespace (i.e. when the namespace is
61+
+ // "").
62+
+ // NOTE: we also always include noscript elements, although the
63+
+ // specification states that they should only be rendered as such if
64+
+ // scripting is enabled for the node (which is not something we track).
65+
+ if n.Namespace != "" {
66+
+ return false
67+
+ }
68+
+ switch n.Data {
69+
+ case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
70+
+ return true
71+
+ default:
72+
+ return false
73+
+ }
74+
+}
75+
+
76+
// writeQuoted writes s to w surrounded by quotes. Normally it will use double
77+
// quotes, but if s contains a double quote, it will use single quotes.
78+
// It is used for writing the identifiers in a doctype declaration.

0 commit comments

Comments
 (0)