Skip to content

Commit a81282a

Browse files
dmcilvaneysandeepkarambelkarazurelinux-securityxorduxmayankfz
authored
Merge changes for 3.0 monthly update (#15461)
Signed-off-by: Mayank Singh <mayansingh@microsoft.com> Signed-off-by: Kanishk Bansal <kanbansal@microsoft.com> Signed-off-by: Harshit Gupta <guptaharshit@microsoft.com> Signed-off-by: Chris Co <chrco@microsoft.com> Co-authored-by: Sandeep Karambelkar <skarambelkar@microsoft.com> Co-authored-by: Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> Co-authored-by: Rohit Rawat <rohitrawat@microsoft.com> Co-authored-by: mayankfz <mayankfz@gmail.com> Co-authored-by: Mayank Singh <mayansingh@microsoft.com> Co-authored-by: durgajagadeesh <v-dpalli@microsoft.com> Co-authored-by: chalamalasetty <42326515+chalamalasetty@users.noreply.github.com> Co-authored-by: Suresh Babu Chalamalasetty <schalam@microsoft.com> Co-authored-by: jykanase <v-jykanase@microsoft.com> Co-authored-by: Aditya Singh <v-aditysing@microsoft.com> Co-authored-by: kgodara912 <kshigodara@outlook.com> Co-authored-by: Kanishk Bansal <kanbansal@microsoft.com> Co-authored-by: Akhila Guruju <v-guakhila@microsoft.com> Co-authored-by: AkarshHCL <v-akarshc@microsoft.com> Co-authored-by: CBL-Mariner-Bot <75509084+CBL-Mariner-Bot@users.noreply.github.com> Co-authored-by: jslobodzian <joslobo@microsoft.com> Co-authored-by: BinduSri-6522866 <v-badabala@microsoft.com> Co-authored-by: Kanishk Bansal <103916909+Kanishk-Bansal@users.noreply.github.com> Co-authored-by: Archana Shettigar <v-shettigara@microsoft.com> Co-authored-by: Chris Gunn <chrisgun@microsoft.com> Co-authored-by: SumitJenaHCL <v-sumitjena@microsoft.com> Co-authored-by: Ratiranjan5 <v-ratbehera@microsoft.com> Co-authored-by: Aninda Pradhan <v-anipradhan@microsoft.com> Co-authored-by: Harshit Gupta <harshitgupta1337@gmail.com> Co-authored-by: Harshit Gupta <guptaharshit@microsoft.com> Co-authored-by: Rachel Menge <rachelmenge@microsoft.com> Co-authored-by: Christopher Co <35273088+christopherco@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: CBL-Mariner Servicing Account <cblmargh@microsoft.com> Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>
1 parent 950c61a commit a81282a

File tree

380 files changed

+18227
-8352
lines changed

Some content is hidden

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

380 files changed

+18227
-8352
lines changed

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
"cpufrequtils",
148148
"cpuid",
149149
"criu",
150+
"crun",
150151
"crypto-policies",
151152
"cryptsetup",
152153
"cscope",
@@ -847,6 +848,7 @@
847848
"linuxptp",
848849
"lksctp-tools",
849850
"lldpd",
851+
"llhttp",
850852
"lockdev",
851853
"logwatch",
852854
"lpsolve",
@@ -1516,7 +1518,6 @@
15161518
"perl-Test-Requires",
15171519
"perl-Test-RequiresInternet",
15181520
"perl-Test-Script",
1519-
"perl-Test-Simple",
15201521
"perl-Test-SubCalls",
15211522
"perl-Test-Synopsis",
15221523
"perl-Test-Taint",
@@ -1828,6 +1829,7 @@
18281829
"python-ruamel-yaml-clib",
18291830
"python-s3transfer",
18301831
"python-schedutils",
1832+
"python-scikit-build-core",
18311833
"python-semantic_version",
18321834
"python-should_dsl",
18331835
"python-simpleline",
@@ -1909,9 +1911,9 @@
19091911
"qperf",
19101912
"qr-code-generator",
19111913
"qt-rpm-macros",
1912-
"qt5-qtconnectivity",
1913-
"qt5-qtsensors",
1914-
"qt5-qtserialport",
1914+
"qt6-qtconnectivity",
1915+
"qt6-qtsensors",
1916+
"qt6-qtserialport",
19151917
"qtbase",
19161918
"qtdeclarative",
19171919
"qtsvg",
@@ -2473,10 +2475,6 @@
24732475
"NVIDIA": {
24742476
"license": "[ASL 2.0 License and spec specific licenses](http://www.apache.org/licenses/LICENSE-2.0)",
24752477
"specs": [
2476-
"fwctl",
2477-
"fwctl-hwe",
2478-
"fwctl-hwe-signed",
2479-
"fwctl-signed",
24802478
"ibarr",
24812479
"ibsim",
24822480
"iser",
@@ -2492,6 +2490,7 @@
24922490
"knem-hwe-modules-signed",
24932491
"knem-modules-signed",
24942492
"libnvidia-container",
2493+
"libvma",
24952494
"mft_kernel",
24962495
"mft_kernel-hwe",
24972496
"mft_kernel-hwe-signed",
@@ -2588,6 +2587,7 @@
25882587
"cpulimit",
25892588
"cri-o",
25902589
"ecj",
2590+
"ed25519-java",
25912591
"fillup",
25922592
"flux",
25932593
"gd",
@@ -2610,6 +2610,7 @@
26102610
"javacc",
26112611
"javacc-bootstrap",
26122612
"javassist",
2613+
"jbcrypt",
26132614
"jboss-interceptors-1.2-api",
26142615
"jdepend",
26152616
"jflex",

‎SPECS-EXTENDED/389-ds-base/389-ds-base.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ExcludeArch: i686
6868
Summary: 389 Directory Server (%{variant})
6969
Name: 389-ds-base
7070
Version: 3.1.1
71-
Release: 7%{?dist}
71+
Release: 8%{?dist}
7272
License: GPL-3.0-or-later AND (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT) AND (CC-BY-4.0 AND MIT) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (MIT OR CC0-1.0) AND (MIT OR Unlicense) AND 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MIT AND ISC AND MPL-2.0 AND PSF-2.0
7373
URL: https://www.port389.org
7474
Vendor: Microsoft Corporation
@@ -732,6 +732,9 @@ exit 0
732732
%endif
733733

734734
%changelog
735+
* Tue Jan 06 2026 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.1.1-8
736+
- Bumping release to rebuild with new 'net-snmp' libs.
737+
735738
* Fri Aug 08 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 3.1.1-7
736739
- Bump release to rebuild with rust
737740

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Distribution: Azure Linux
2424
%bcond_with tests
2525
Name: apache-commons-codec
2626
Version: 1.15
27-
Release: 2%{?dist}
27+
Release: 3%{?dist}
2828
Summary: Apache Commons Codec Package
2929
License: Apache-2.0
3030
Group: Development/Libraries/Java
@@ -104,6 +104,10 @@ install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
104104
# javadoc
105105
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
106106
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
107+
# Remove LICENSE from javadoc directory to avoid duplicate license warning
108+
mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO .
109+
mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE .
110+
107111
%fdupes -s %{buildroot}%{_javadocdir}
108112

109113
%pre javadoc
@@ -113,13 +117,18 @@ fi
113117

114118
%files -f .mfiles
115119
%license LICENSE.txt
120+
%license ADDITIONAL_LICENSE_INFO
116121
%doc RELEASE-NOTES.txt
117122
%{_javadir}/%{name}.jar
118123

119124
%files javadoc
120125
%{_javadocdir}/%{name}
121126

122127
%changelog
128+
* Fri Nov 28 2025 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 1.15-3
129+
- Address build error caused by license warning
130+
- License verified
131+
123132
* Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.15-2
124133
- Converting the 'Release' tag to the '[number].[distribution]' format.
125134

‎SPECS-EXTENDED/apache-commons-compress/0001-Remove-Brotli-compressor.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From bba585e9e4fdfc67de3b53b58b8d60923e1ccd0c Mon Sep 17 00:00:00 2001
1+
From 0b10cc9b13fa782b7e318fdbc0d8c790a472f722 Mon Sep 17 00:00:00 2001
22
From: Michael Simacek <msimacek@redhat.com>
33
Date: Mon, 12 Feb 2018 10:53:48 +0100
4-
Subject: [PATCH 1/2] Remove Brotli compressor
4+
Subject: [PATCH 1/3] Remove Brotli compressor
55

66
---
7-
.../commons/compress/compressors/CompressorStreamFactory.java | 7 +------
7+
.../compress/compressors/CompressorStreamFactory.java | 7 +------
88
1 file changed, 1 insertion(+), 6 deletions(-)
99

1010
diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
11-
index d730b9d..ab178a9 100644
11+
index ca0973095..2406d5a44 100644
1212
--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
1313
+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
14-
@@ -31,8 +31,6 @@ import java.util.Set;
14+
@@ -30,8 +30,6 @@
1515
import java.util.SortedMap;
1616
import java.util.TreeMap;
1717

@@ -20,7 +20,7 @@ index d730b9d..ab178a9 100644
2020
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
2121
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
2222
import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream;
23-
@@ -586,10 +584,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
23+
@@ -545,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
2424
}
2525

2626
if (BROTLI.equalsIgnoreCase(name)) {
@@ -33,5 +33,5 @@ index d730b9d..ab178a9 100644
3333

3434
if (XZ.equalsIgnoreCase(name)) {
3535
--
36-
2.14.3
36+
2.43.0
3737

‎SPECS-EXTENDED/apache-commons-compress/0002-Remove-ZSTD-compressor.patch‎

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,58 @@
1-
From bab91e014f73296a8ac9a3aef2aaa324a85e9b96 Mon Sep 17 00:00:00 2001
1+
From d80b7b190c789c33a15f56613a21c44827a63c75 Mon Sep 17 00:00:00 2001
22
From: Michael Simacek <msimacek@redhat.com>
33
Date: Mon, 12 Feb 2018 10:59:55 +0100
4-
Subject: [PATCH 2/2] Remove ZSTD compressor
4+
Subject: [PATCH 2/3] Remove ZSTD compressor
55

66
---
7-
.../compress/compressors/CompressorStreamFactory.java | 14 ++------------
8-
1 file changed, 2 insertions(+), 12 deletions(-)
7+
.../compressors/CompressorStreamFactory.java | 22 ++++---------------
8+
1 file changed, 4 insertions(+), 18 deletions(-)
99

1010
diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
11-
index ab178a9..3817704 100644
11+
index 2406d5a44..9ed40a3d7 100644
1212
--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
1313
+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
14-
@@ -54,9 +54,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
14+
@@ -53,9 +53,6 @@
1515
import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
1616
import org.apache.commons.compress.compressors.xz.XZUtils;
1717
import org.apache.commons.compress.compressors.z.ZCompressorInputStream;
1818
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
1919
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
2020
-import org.apache.commons.compress.compressors.zstandard.ZstdUtils;
2121
import org.apache.commons.compress.utils.IOUtils;
22-
import org.apache.commons.compress.utils.Lists;
23-
import org.apache.commons.compress.utils.ServiceLoaderIterator;
24-
@@ -516,10 +513,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
22+
import org.apache.commons.compress.utils.Sets;
23+
24+
@@ -280,10 +277,6 @@ static String detect(final InputStream inputStream, final Set<String> compressor
2525
return LZ4_FRAMED;
2626
}
2727

28-
- if (ZstdUtils.matches(signature, signatureLength)) {
28+
- if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) {
2929
- return ZSTANDARD;
3030
- }
3131
-
3232
throw new CompressorException("No Compressor found for the stream signature.");
3333
}
34-
/**
35-
@@ -595,10 +588,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
34+
35+
@@ -405,10 +398,6 @@ public static String getZ() {
36+
return Z;
37+
}
38+
39+
- public static String getZstandard() {
40+
- return ZSTANDARD;
41+
- }
42+
-
43+
static void putAll(final Set<String> names, final CompressorStreamProvider provider, final TreeMap<String, CompressorStreamProvider> map) {
44+
names.forEach(name -> map.put(toKey(name), provider));
45+
}
46+
@@ -513,7 +502,7 @@ public CompressorInputStream createCompressorInputStream(final InputStream in, f
47+
* Creates a compressor input stream from a compressor name and an input stream.
48+
*
49+
* @param name of the compressor, i.e. {@value #GZIP}, {@value #BZIP2}, {@value #XZ}, {@value #LZMA}, {@value #PACK200}, {@value #SNAPPY_RAW},
50+
- * {@value #SNAPPY_FRAMED}, {@value #Z}, {@value #LZ4_BLOCK}, {@value #LZ4_FRAMED}, {@value #ZSTANDARD}, {@value #DEFLATE64} or
51+
+ * {@value #SNAPPY_FRAMED}, {@value #Z}, {@value #LZ4_BLOCK}, {@value #LZ4_FRAMED}, {@value #DEFLATE64} or
52+
* {@value #DEFLATE}
53+
* @param in the input stream
54+
* @return compressor input stream
55+
@@ -554,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
3656
}
3757

3858
if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -44,7 +64,16 @@ index ab178a9..3817704 100644
4464
}
4565

4666
if (LZMA.equalsIgnoreCase(name)) {
47-
@@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
67+
@@ -614,7 +600,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
68+
* Creates a compressor output stream from a compressor name and an output stream.
69+
*
70+
* @param name the compressor name, i.e. {@value #GZIP}, {@value #BZIP2}, {@value #XZ}, {@value #PACK200}, {@value #SNAPPY_FRAMED}, {@value #LZ4_BLOCK},
71+
- * {@value #LZ4_FRAMED}, {@value #ZSTANDARD} or {@value #DEFLATE}
72+
+ * {@value #LZ4_FRAMED} or {@value #DEFLATE}
73+
* @param out the output stream
74+
* @return the compressor output stream
75+
* @throws CompressorException if the archiver name is not known
76+
@@ -665,7 +651,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, fi
4877
}
4978

5079
if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -54,5 +83,5 @@ index ab178a9..3817704 100644
5483
} catch (final IOException e) {
5584
throw new CompressorException("Could not create CompressorOutputStream", e);
5685
--
57-
2.14.3
86+
2.43.0
5887

‎SPECS-EXTENDED/apache-commons-compress/0003-Remove-Pack200-compressor.patch‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
From 77d08229cd95cc948a19996faa8515e0d77d7930 Mon Sep 17 00:00:00 2001
2+
From: Marian Koncek <mkoncek@redhat.com>
3+
Date: Fri, 6 Aug 2021 13:42:40 +0200
4+
Subject: [PATCH 3/3] Remove Pack200 compressor
5+
6+
---
7+
.../compress/compressors/CompressorStreamFactory.java | 10 ++--------
8+
1 file changed, 2 insertions(+), 8 deletions(-)
9+
10+
diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
11+
index 9ed40a3d7..565aa519e 100644
12+
--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
13+
+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
14+
@@ -44,8 +44,6 @@
15+
import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream;
16+
import org.apache.commons.compress.compressors.lzma.LZMACompressorOutputStream;
17+
import org.apache.commons.compress.compressors.lzma.LZMAUtils;
18+
-import org.apache.commons.compress.compressors.pack200.Pack200CompressorInputStream;
19+
-import org.apache.commons.compress.compressors.pack200.Pack200CompressorOutputStream;
20+
import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream;
21+
import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream;
22+
import org.apache.commons.compress.compressors.snappy.SnappyCompressorInputStream;
23+
@@ -249,10 +247,6 @@ static String detect(final InputStream inputStream, final Set<String> compressor
24+
return GZIP;
25+
}
26+
27+
- if (compressorNames.contains(PACK200) && Pack200CompressorInputStream.matches(signature, signatureLength)) {
28+
- return PACK200;
29+
- }
30+
-
31+
if (compressorNames.contains(SNAPPY_FRAMED) && FramedSnappyCompressorInputStream.matches(signature, signatureLength)) {
32+
return SNAPPY_FRAMED;
33+
}
34+
@@ -554,7 +548,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
35+
}
36+
37+
if (PACK200.equalsIgnoreCase(name)) {
38+
- return new Pack200CompressorInputStream(in);
39+
+ throw new CompressorException("Pack200 compression is not available in this build.");
40+
}
41+
42+
if (SNAPPY_RAW.equalsIgnoreCase(name)) {
43+
@@ -627,7 +621,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, fi
44+
}
45+
46+
if (PACK200.equalsIgnoreCase(name)) {
47+
- return new Pack200CompressorOutputStream(out);
48+
+ throw new CompressorException("Pack200 compression is not available in this build.");
49+
}
50+
51+
if (LZMA.equalsIgnoreCase(name)) {
52+
--
53+
2.43.0
54+

0 commit comments

Comments
 (0)