Skip to content

Commit 6ad0c3b

Browse files
ranjan-duttaranjan-dutta
committed
Merge tag '3.0.20250521-3.0' into 3.0-dev
* tag '3.0.20250521-3.0': (271 commits) Fixed reporting of build errors (CP: #13889) (#13897) Revert "Revert "Merge 3.0-dev for May 2025 2 release"" (#13847) Revert "Anphel/3 mid may 2025 update b" (#13846) kernel-64k: Added a new patch to solve EFI slack slots issue (#13783) kernel-64k: enabling config options required for GB200 and GB200F diags (#13674) Prepare May 2025 Update 2 (#13808) Revert "Merge 3.0-dev for May 2025 2 release" (#13833) kernel-64k: Added a new patch to solve EFI slack slots issue (#13783) Patch docker-buildx for CVE-2025-0495 [Medium] (#13768) [Medium] Patch yasm for CVE-2023-51258 and CVE-2023-37732 (#13792) [Medium] Patch iniparser for CVE-2023-33461 (#13804) [Medium] patch rpm-ostree for CVE-2024-2905 (#13818) kernel-64k: enabling config options required for GB200 and GB200F diags (#13674) [3.0] bmake: move tests to check section (#13815) Updated lua-json to version 1.3.4 (#11179) Upgrade kyotocabinet to version 1.2.80 (#10802) Extended build failure logging (#13705) Prepare May 2025 Update 2 (#13808) dom0 packages: Update to dom0 release v2411.19.1 (#13648) [AUTO-CHERRYPICK] Upgrade SymCrypt-OpenSSL to 1.8.1 - branch 3.0-dev (#13805) ...
2 parents cf9fc0e + 3cd11c5 commit 6ad0c3b

File tree

742 files changed

+46742
-9025
lines changed

Some content is hidden

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

742 files changed

+46742
-9025
lines changed

‎.github/workflows/check-srpm-duplicates.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Copyright (c) Microsoft Corporation.
2+
# Licensed under the MIT License.
3+
4+
# This action checks that the specs in this repo
5+
# generate SRPMs with unique names.
6+
name: SRPMs duplicates check
7+
8+
on:
9+
push:
10+
branches: [main, 2.0*, 3.0*, fasttrack/*]
11+
pull_request:
12+
branches: [main, 2.0*, 3.0*, fasttrack/*]
13+
14+
jobs:
15+
check:
16+
name: SRPMs duplicates check
17+
runs-on: ubuntu-latest
18+
strategy:
19+
matrix:
20+
# Each group is published to a different repo, thus we only need to check
21+
# for SRPM duplicates within the group.
22+
specs-dirs-groups: ["SPECS SPECS-SIGNED", "SPECS-EXTENDED"]
23+
24+
steps:
25+
# Checkout the branch of our repo that triggered this action
26+
- name: Workflow trigger checkout
27+
uses: actions/checkout@v4
28+
29+
# For consistency, we use the same major/minor version of Python that Azure Linux ships
30+
- name: Setup Python 3.12
31+
uses: actions/setup-python@v5
32+
with:
33+
python-version: 3.12
34+
35+
# Generate the specs.json files. They are the input for the duplicates check script.
36+
- name: Generate specs.json
37+
run: |
38+
set -euo pipefail
39+
40+
for spec_folder in ${{ matrix.specs-dirs-groups }}; do
41+
echo "Generating specs.json for spec folder '$spec_folder'."
42+
43+
sudo make -C toolkit -j$(nproc) parse-specs REBUILD_TOOLS=y DAILY_BUILD_ID=lkg SPECS_DIR=../$spec_folder
44+
cp -v build/pkg_artifacts/specs.json ${spec_folder}_specs.json
45+
done
46+
47+
- name: Check for duplicate SRPMs
48+
run: python3 toolkit/scripts/check_srpm_duplicates.py *_specs.json

‎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: 2%{?dist}
71+
Release: 3%{?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+
* Mon Apr 21 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> 3.1.1-3
736+
- Bump release to build with rust 1.85.0
737+
735738
* Fri Sep 20 2024 Muhammad Falak <mwani@microsoft.com> 3.1.0-2
736739
- Initial Azure Linux import from Fedora 42 (license: MIT)
737740
- License verified

‎SPECS-EXTENDED/amtk/amtk.signatures.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"Signatures": {
3-
"amtk-5.0.2.tar.xz": "71cc891fbaaa3d0cb87eeef9a2f7e1a2acab62f738d09ea922fb4b9ea2f84f86"
3+
"amtk-5.6.1.tar.xz": "d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228"
44
}
55
}
6+

‎SPECS-EXTENDED/amtk/amtk.spec‎

Lines changed: 74 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
33
Name: amtk
4-
Version: 5.0.2
5-
Release: 3%{?dist}
4+
Version: 5.6.1
5+
Release: 8%{?dist}
66
Summary: Actions, Menus and Toolbars Kit for GTK+ applications
77

8-
License: LGPLv2+
8+
License: LGPL-3.0-or-later
99
URL: https://wiki.gnome.org/Projects/Amtk
10-
Source0: https://download.gnome.org/sources/amtk/5.0/amtk-%{version}.tar.xz
10+
Source0: https://download.gnome.org/sources/amtk/5.6/amtk-%{version}.tar.xz
1111

1212
BuildRequires: gcc
1313
BuildRequires: gettext
14+
BuildRequires: gtk-doc
15+
BuildRequires: meson
1416
BuildRequires: pkgconfig(glib-2.0)
1517
BuildRequires: pkgconfig(gobject-introspection-1.0)
1618
BuildRequires: pkgconfig(gtk+-3.0)
1719

20+
# Removed in F34
21+
Obsoletes: amtk-tests < 5.3.1
22+
1823
%description
1924
Amtk is the acronym for “Actions, Menus and Toolbars Kit”. It is a basic
2025
GtkUIManager replacement based on GAction. It is suitable for both a
@@ -30,34 +35,24 @@ The %{name}-devel package contains libraries and header files for
3035
developing applications that use %{name}.
3136

3237

33-
%package tests
34-
Summary: Tests for the %{name} package
35-
Requires: %{name}%{?_isa} = %{version}-%{release}
36-
37-
%description tests
38-
The %{name}-tests package contains tests that can be used to verify
39-
the functionality of the installed %{name} package.
40-
41-
4238
%prep
43-
%autosetup
39+
%autosetup -p1
4440

4541

4642
%build
47-
%configure --enable-installed-tests
48-
%make_build V=1
43+
%meson -Dgtk_doc=true
44+
%meson_build
4945

5046

5147
%install
52-
%make_install
53-
find $RPM_BUILD_ROOT -name '*.la' -delete
48+
%meson_install
5449

5550
%find_lang amtk-5
5651

5752

5853
%files -f amtk-5.lang
59-
%license COPYING
60-
%doc AUTHORS NEWS README
54+
%license LICENSES/LGPL-3.0-or-later.txt
55+
%doc NEWS README.md
6156
%dir %{_libdir}/girepository-1.0
6257
%{_libdir}/girepository-1.0/Amtk-5.typelib
6358
%{_libdir}/libamtk-5.so.0*
@@ -70,18 +65,68 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
7065
%{_datadir}/gir-1.0/Amtk-5.gir
7166
%dir %{_datadir}/gtk-doc
7267
%dir %{_datadir}/gtk-doc/html
73-
%{_datadir}/gtk-doc/html/amtk-5.0/
74-
75-
%files tests
76-
%dir %{_libexecdir}/installed-tests
77-
%{_libexecdir}/installed-tests/amtk-5/
78-
%dir %{_datadir}/installed-tests
79-
%{_datadir}/installed-tests/amtk-5/
68+
%{_datadir}/gtk-doc/html/amtk-5/
8069

8170

8271
%changelog
83-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 5.0.2-3
84-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
72+
* Fri Mar 14 2025 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 5.6.1-8
73+
- Initial Azure Linux import from Fedora 41 (license: MIT)
74+
- License verified.
75+
76+
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.1-7
77+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
78+
79+
* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.1-6
80+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
81+
82+
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.1-5
83+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
84+
85+
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.1-4
86+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
87+
88+
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.1-3
89+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
90+
91+
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.1-2
92+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
93+
94+
* Mon Dec 12 2022 Kalev Lember <klember@redhat.com> - 5.6.1-1
95+
- Update to 5.6.1
96+
- Switch to SPDX license tags
97+
98+
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-4
99+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
100+
101+
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-3
102+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
103+
104+
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-2
105+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
106+
107+
* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 5.3.1-1
108+
- Update to 5.3.1
109+
- Switch to meson build system
110+
- Remove -tests sub package as the installed tests are gone upstream
111+
112+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-2
113+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
114+
115+
* Thu Sep 10 2020 Kalev Lember <klember@redhat.com> - 5.2.0-1
116+
- Update to 5.2.0
117+
118+
* Fri Sep 04 2020 Kalev Lember <klember@redhat.com> - 5.1.2-1
119+
- Update to 5.1.2
120+
121+
* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
122+
- Second attempt - Rebuilt for
123+
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
124+
125+
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
126+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
127+
128+
* Fri May 29 2020 Kalev Lember <klember@redhat.com> - 5.1.1-1
129+
- Update to 5.1.1
85130

86131
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.2-2
87132
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

‎SPECS-EXTENDED/ansible-freeipa/ansible-freeipa.signatures.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"ansible-freeipa-0.3.4.tar.gz": "3c60aadbd612cd577145e85582a5e3ab8d62787592d7789218196cf624ffc85f"
3+
"ansible-freeipa-1.13.2.tar.gz": "f4965770a906c78988c097aa08a20f84ad268be3479401edeebfe47541cbe0c8"
44
}
55
}

0 commit comments

Comments
 (0)