Skip to content

Commit 44a3a66

Browse files
authored
Merge branch 'microsoft:3.0-dev' into 3.0-dev
2 parents b87d489 + 9805dea commit 44a3a66

415 files changed

Lines changed: 28319 additions & 6760 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Stub workflow — A copy of this workflow must live on the default branch (3.0) so that the pull_request_target
2+
# event can trigger it with access to secrets. It then delegates all real work to the reusable template on
3+
# tomls/base/main, which has the scripts, prompts, and agent definitions.
4+
#
5+
# This two-stage design lets fork PRs trigger the review safely: the stub runs in the
6+
# context of the default branch (with secret access), but the template checks out only
7+
# .spec files (data) from the PR head — never executable code.
8+
#
9+
# A stub is needed because pull_request_target workflows always run in the context of the default branch, so they can't
10+
# directly use a reusable workflow from the PR head (which would be a security risk since untrusted code could leak
11+
# the secrets). By having the stub on the default branch, we can safely ensure only the trusted reusable workflow from
12+
# the base is used, while still allowing the PR head to provide the .spec files as data input.
13+
name: Spec Review
14+
15+
# pull_request_target is required here: we need secret access (COPILOT_TOKEN) to run the
16+
# spec review agent on fork PRs. The stub itself runs NO code from the PR — it only
17+
# delegates to a trusted reusable workflow pinned to tomls/base/main, which sparse-checks
18+
# out only .spec data files (never executable code) from the PR head.
19+
on: # zizmor: ignore[dangerous-triggers]
20+
pull_request_target:
21+
# Only trigger on PRs targeting the toml base branch which modify .spec files. We do
22+
# not want to affect PRs targeting other branches.
23+
24+
branches:
25+
- tomls/base/main
26+
paths:
27+
- '**/*.spec'
28+
29+
permissions: {}
30+
31+
concurrency:
32+
group: spec-review-${{ github.event.pull_request.number }}
33+
cancel-in-progress: true
34+
35+
jobs:
36+
review:
37+
# Prevent forks from running a stale/vulnerable copy of this stub with Actions enabled
38+
if: github.repository == 'microsoft/azurelinux'
39+
# Intentionally branch-pinned to our own repo so the
40+
# reusable workflow picks up prompt/script/agent updates automatically.
41+
uses: microsoft/azurelinux/.github/workflows/spec-review.yml@tomls/base/main # zizmor: ignore[unpinned-uses]
42+
permissions:
43+
contents: read
44+
pull-requests: write # Post review comments and inline annotations on PRs
45+
with:
46+
pr-head-sha: ${{ github.event.pull_request.head.sha }}
47+
pr-head-repo: ${{ github.event.pull_request.head.repo.full_name }}
48+
pr-number: ${{ github.event.pull_request.number }}
49+
repo: ${{ github.repository }}
50+
scripts-ref: tomls/base/main
51+
secrets:
52+
COPILOT_TOKEN: ${{ secrets.COPILOT_TOKEN }}

.pipelines/containerSourceData/scripts/BuildGoldenDistrolessContainer.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
set -e
66

7+
function docker_cleanup {
8+
echo "+++ Cleaning up Docker resources to free disk space"
9+
docker system prune -f --volumes || true
10+
docker builder prune -f || true
11+
echo "+++ Docker cleanup completed"
12+
df -h / || true
13+
}
14+
715
function DockerBuild {
816
local containerName=$1
917
local azureLinuxVersion=$2
@@ -41,6 +49,9 @@ function DockerBuild {
4149
--build-arg RPMS="$rpmsDir" \
4250
--build-arg LOCAL_REPO_FILE="$marinaraSrcDir/local.repo" \
4351
--no-cache
52+
53+
# Cleanup after build to free disk space
54+
docker_cleanup
4455
}
4556

4657
function create_distroless_container {

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

Lines changed: 1 addition & 1 deletion
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2947,6 +2947,7 @@
29472947
"nginx",
29482948
"ninja-build",
29492949
"nodejs",
2950+
"nodejs24",
29502951
"npth",
29512952
"nspr",
29522953
"nss",

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

Lines changed: 12 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: 10%{?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
@@ -83,6 +83,7 @@ Source4: 389-ds-base.sysusers
8383
Source5: https://fedorapeople.org/groups/389ds/libdb-5.3.28-59.tar.bz2
8484
%endif
8585

86+
Patch0: rust-1.90-fixes.patch
8687
Provides: ldif2ldbm >= 0
8788

8889
# Attach the buildrequires to the top level package:
@@ -732,6 +733,16 @@ exit 0
732733
%endif
733734

734735
%changelog
736+
* Mon Feb 02 2026 Archana Shettigar <v-shettigara@microsoft.com> - 3.1.1-10
737+
- Bump release to rebuild with rust
738+
739+
* Tue Jan 13 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 3.1.1-9
740+
- Bump release to rebuild with rust
741+
- Add patch add explicit lifetime for ValueArrayRef iterator
742+
743+
* Tue Jan 06 2026 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.1.1-8
744+
- Bumping release to rebuild with new 'net-snmp' libs.
745+
735746
* Fri Aug 08 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 3.1.1-7
736747
- Bump release to rebuild with rust
737748

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 3a0d6ff3272c4a3d5f2d552a436e4f0fe0756a0a Mon Sep 17 00:00:00 2001
2+
From: Kavya Sree Kaitepalli <kkaitepalli@microsoft.com>
3+
Date: Wed, 29 Oct 2025 06:38:08 +0000
4+
Subject: [PATCH] Add explicit lifetime for ValueArrayRef iterator for Rust 1.90
5+
6+
---
7+
src/slapi_r_plugin/src/value.rs | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/slapi_r_plugin/src/value.rs b/src/slapi_r_plugin/src/value.rs
11+
index 2fd35c8..fec74ac 100644
12+
--- a/src/slapi_r_plugin/src/value.rs
13+
+++ b/src/slapi_r_plugin/src/value.rs
14+
@@ -61,7 +61,7 @@ impl ValueArrayRef {
15+
ValueArrayRef { raw_slapi_val }
16+
}
17+
18+
- pub fn iter(&self) -> ValueArrayRefIter {
19+
+ pub fn iter(&self) -> ValueArrayRefIter<'_> {
20+
ValueArrayRefIter {
21+
idx: 0,
22+
va_ref: &self,
23+
--
24+
2.45.4
25+

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

Lines changed: 1 addition & 10 deletions
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: 3%{?dist}
27+
Release: 2%{?dist}
2828
Summary: Apache Commons Codec Package
2929
License: Apache-2.0
3030
Group: Development/Libraries/Java
@@ -104,10 +104,6 @@ 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-
111107
%fdupes -s %{buildroot}%{_javadocdir}
112108

113109
%pre javadoc
@@ -117,18 +113,13 @@ fi
117113

118114
%files -f .mfiles
119115
%license LICENSE.txt
120-
%license ADDITIONAL_LICENSE_INFO
121116
%doc RELEASE-NOTES.txt
122117
%{_javadir}/%{name}.jar
123118

124119
%files javadoc
125120
%{_javadocdir}/%{name}
126121

127122
%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-
132123
* Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.15-2
133124
- Converting the 'Release' tag to the '[number].[distribution]' format.
134125

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 0b10cc9b13fa782b7e318fdbc0d8c790a472f722 Mon Sep 17 00:00:00 2001
1+
From bba585e9e4fdfc67de3b53b58b8d60923e1ccd0c 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/3] Remove Brotli compressor
4+
Subject: [PATCH 1/2] Remove Brotli compressor
55

66
---
7-
.../compress/compressors/CompressorStreamFactory.java | 7 +------
7+
.../commons/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 ca0973095..2406d5a44 100644
11+
index d730b9d..ab178a9 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-
@@ -30,8 +30,6 @@
14+
@@ -31,8 +31,6 @@ import java.util.Set;
1515
import java.util.SortedMap;
1616
import java.util.TreeMap;
1717

@@ -20,7 +20,7 @@ index ca0973095..2406d5a44 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-
@@ -545,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
23+
@@ -586,10 +584,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
2424
}
2525

2626
if (BROTLI.equalsIgnoreCase(name)) {
@@ -33,5 +33,5 @@ index ca0973095..2406d5a44 100644
3333

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

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,38 @@
1-
From d80b7b190c789c33a15f56613a21c44827a63c75 Mon Sep 17 00:00:00 2001
1+
From bab91e014f73296a8ac9a3aef2aaa324a85e9b96 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/3] Remove ZSTD compressor
4+
Subject: [PATCH 2/2] Remove ZSTD compressor
55

66
---
7-
.../compressors/CompressorStreamFactory.java | 22 ++++---------------
8-
1 file changed, 4 insertions(+), 18 deletions(-)
7+
.../compress/compressors/CompressorStreamFactory.java | 14 ++------------
8+
1 file changed, 2 insertions(+), 12 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 2406d5a44..9ed40a3d7 100644
11+
index ab178a9..3817704 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-
@@ -53,9 +53,6 @@
14+
@@ -54,9 +54,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
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.Sets;
23-
24-
@@ -280,10 +277,6 @@ static String detect(final InputStream inputStream, final Set<String> compressor
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 {
2525
return LZ4_FRAMED;
2626
}
2727

28-
- if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) {
28+
- if (ZstdUtils.matches(signature, signatureLength)) {
2929
- return ZSTANDARD;
3030
- }
3131
-
3232
throw new CompressorException("No Compressor found for the stream signature.");
3333
}
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
34+
/**
35+
@@ -595,10 +588,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
5636
}
5737

5838
if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -64,16 +44,7 @@ index 2406d5a44..9ed40a3d7 100644
6444
}
6545

6646
if (LZMA.equalsIgnoreCase(name)) {
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
47+
@@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
7748
}
7849

7950
if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -83,5 +54,5 @@ index 2406d5a44..9ed40a3d7 100644
8354
} catch (final IOException e) {
8455
throw new CompressorException("Could not create CompressorOutputStream", e);
8556
--
86-
2.43.0
57+
2.14.3
8758

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

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

0 commit comments

Comments
 (0)