Skip to content

Commit 91b9b45

Browse files
jslobodzianjslobodzian
committed
Merge branch '3.0-dev' into 3.0
2 parents 1a3e754 + 32428ae commit 91b9b45

Some content is hidden

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

43 files changed

+992
-193
lines changed

‎SPECS-EXTENDED/ocaml-markup/ocaml-markup.signatures.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"markup-1.0.0.tar.gz": "0a82c7a1e3c6516f835ef5a9ca07a9dee11f0006420a57afaa7f57257d3ded26"
3+
"markup-1.0.3.tar.gz": "9526fd06a0afc37d7ae6e2528787142d52b124238ffb0e7e8e83bdd383806eb5"
44
}
55
}

‎SPECS-EXTENDED/ocaml-markup/ocaml-markup.spec

+105-105
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,28 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
3+
34
%ifnarch %{ocaml_native_compiler}
45
%global debug_package %{nil}
56
%endif
67

78
%global srcname markup
8-
%bcond_with tests
9-
%bcond_with docs
9+
%global giturl https://github.com/aantron/markup.ml
1010

1111
Name: ocaml-%{srcname}
12-
Version: 1.0.0
13-
Release: 5%{?dist}
12+
Version: 1.0.3
13+
Release: 18%{?dist}
1414
Summary: Error-recovering streaming HTML5 and XML parsers for OCaml
1515

1616
License: MIT
17-
URL: http://aantron.github.io/markup.ml/
17+
URL: https://aantron.github.io/markup.ml/
1818
Source0: https://github.com/aantron/markup.ml/archive/%{version}/%{srcname}-%{version}.tar.gz
1919

20-
BuildRequires: ocaml >= 4.02.0
21-
BuildRequires: ocaml-bisect-ppx-devel >= 2.0.0
20+
BuildRequires: ocaml >= 4.03.0
21+
BuildRequires: ocaml-bisect-ppx-devel >= 2.5.0
2222
BuildRequires: ocaml-dune >= 2.7.0
2323
BuildRequires: ocaml-lwt-devel
24-
BuildRequires: ocaml-uutf-devel >= 1.0.0
25-
%if %{with tests}
2624
BuildRequires: ocaml-ounit-devel
27-
%endif
28-
%if %{with docs}
29-
BuildRequires: ocaml-ocamldoc
30-
%endif
25+
BuildRequires: ocaml-uutf-devel >= 1.0.0
3126

3227
%description
3328
Markup.ml is a pair of parsers implementing the HTML5 and XML
@@ -69,15 +64,14 @@ This package contains an adapter between Markup.ml and Lwt.
6964
Summary: Development files for %{name}-lwt
7065
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
7166
Requires: %{name}-lwt%{?_isa} = %{version}-%{release}
72-
Requires: ocaml-bisect-ppx-devel%{?_isa}
7367
Requires: ocaml-lwt-devel%{?_isa}
7468

7569
%description lwt-devel
7670
The %{name}-lwt-devel package contains libraries and signature files for
7771
developing applications that use %{name}-lwt.
7872

7973
%prep
80-
%autosetup -n %{srcname}.ml-%{version} -p1
74+
%autosetup -n markup.ml-%{version} -p1
8175

8276
# The uchar package is a forward compatibility package for OCaml versions prior
8377
# to 4.03. We have a later OCaml in Fedora; uchar is in the standard library.
@@ -86,107 +80,113 @@ developing applications that use %{name}-lwt.
8680
sed -i '/uchar/d' markup.opam
8781

8882
%build
89-
dune build %{?_smp_mflags} @install
90-
91-
%if %{with docs}
92-
# Build the documentation. Unfortunately, ocamldoc is not smart enough to
93-
# figure out that Kstream is Markup.Kstream. I have not been able to figure
94-
# out how to convince it, so the temporary hacked-up copy of markup.mli is
95-
# my way of working around the problem. We should really build documentation
96-
# with odoc, but this package is a build dependency of odoc.
97-
mkdir tmp
98-
sed '/Kstream/d' _build/default/src/markup.mli > tmp/markup.mli
99-
100-
mkdir html
101-
ocamldoc -html -d html -css-style doc/style.css -I +lwt -I +lwt/unix \
102-
-I _build/install/default/lib/markup \
103-
-I _build/install/default/lib/markup-lwt \
104-
-I _build/install/default/lib/markup-lwt/unix \
105-
tmp/markup.mli \
106-
_build/default/src/lwt/markup_lwt.mli \
107-
_build/default/src/lwt_unix/markup_lwt_unix.mli
108-
%endif
83+
%dune_build
10984

11085
%install
111-
dune install --destdir=%{buildroot}
112-
113-
# We install the documentation with the doc macro
114-
rm -fr %{buildroot}%{_prefix}/doc
115-
116-
%ifarch %{ocaml_native_compiler}
117-
# Add missing executable bits
118-
find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod 0755 {} \+
119-
%endif
86+
%dune_install -s
12087

12188
%check
122-
%if %{with tests}
123-
dune runtest
124-
%endif
89+
%dune_check
12590

126-
%files
91+
%files -f .ofiles-markup
12792
%doc README.md
12893
%license LICENSE.md
129-
%dir %{_libdir}/ocaml/%{srcname}/
130-
%{_libdir}/ocaml/%{srcname}/META
131-
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cma
132-
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmi
133-
%ifarch %{ocaml_native_compiler}
134-
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxs
135-
%endif
13694

137-
%files devel
138-
%if %{with docs}
139-
%doc html/*
140-
%endif
141-
%{_libdir}/ocaml/%{srcname}/dune-package
142-
%{_libdir}/ocaml/%{srcname}/opam
143-
%ifarch %{ocaml_native_compiler}
144-
%{_libdir}/ocaml/%{srcname}/%{srcname}*.a
145-
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmx
146-
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxa
147-
%endif
148-
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmt
149-
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmti
150-
%{_libdir}/ocaml/%{srcname}/*.ml
151-
%{_libdir}/ocaml/%{srcname}/*.mli
152-
153-
%files lwt
154-
%dir %{_libdir}/ocaml/%{srcname}-lwt/
155-
%dir %{_libdir}/ocaml/%{srcname}-lwt/unix/
156-
%{_libdir}/ocaml/%{srcname}-lwt/META
157-
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cma
158-
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmi
159-
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cma
160-
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmi
161-
%ifarch %{ocaml_native_compiler}
162-
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmxs
163-
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmxs
164-
%endif
95+
%files devel -f .ofiles-markup-devel
16596

166-
%files lwt-devel
167-
%{_libdir}/ocaml/%{srcname}-lwt/dune-package
168-
%{_libdir}/ocaml/%{srcname}-lwt/opam
169-
%ifarch %{ocaml_native_compiler}
170-
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.a
171-
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmx
172-
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmxa
173-
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.a
174-
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmx
175-
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmxa
176-
%endif
177-
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmt
178-
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmti
179-
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.ml
180-
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.mli
181-
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmt
182-
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmti
183-
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.ml
184-
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.mli
97+
%files lwt -f .ofiles-markup-lwt
98+
99+
%files lwt-devel -f .ofiles-markup-lwt-devel
185100

186101
%changelog
187-
* Mon Aug 09 2021 Thomas Crain <[email protected]> - 1.0.0-5
188-
- Initial CBL-Mariner import from Fedora 34 (license: MIT).
189-
- Remove test, docs circular dependencies
102+
* Wed Jan 08 2025 Durga Jagadeesh Palli <[email protected]> - 1.0.3-18
103+
- Initial Azure Linux import from Fedora 41 (license: MIT)
104+
- License verified
105+
106+
* Thu Jul 18 2024 Fedora Release Engineering <[email protected]> - 1.0.3-17
107+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
108+
109+
* Wed Jun 19 2024 Richard W.M. Jones <[email protected]> - 1.0.3-16
110+
- OCaml 5.2.0 ppc64le fix
111+
112+
* Wed May 29 2024 Richard W.M. Jones <[email protected]> - 1.0.3-15
113+
- OCaml 5.2.0 for Fedora 41
114+
115+
* Thu Jan 25 2024 Fedora Release Engineering <[email protected]> - 1.0.3-14
116+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
117+
118+
* Sun Jan 21 2024 Fedora Release Engineering <[email protected]> - 1.0.3-13
119+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
120+
121+
* Mon Dec 18 2023 Richard W.M. Jones <[email protected]> - 1.0.3-12
122+
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
123+
124+
* Tue Dec 12 2023 Richard W.M. Jones <[email protected]> - 1.0.3-11
125+
- OCaml 5.1.1 rebuild for Fedora 40
126+
127+
* Thu Oct 05 2023 Richard W.M. Jones <[email protected]> - 1.0.3-10
128+
- OCaml 5.1 rebuild for Fedora 40
129+
130+
* Thu Jul 20 2023 Fedora Release Engineering <[email protected]> - 1.0.3-9
131+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
132+
133+
* Tue Jul 11 2023 Richard W.M. Jones <[email protected]> - 1.0.3-8
134+
- OCaml 5.0 rebuild for Fedora 39
135+
136+
* Mon Jul 10 2023 Jerry James <[email protected]> - 1.0.3-7
137+
- OCaml 5.0.0 rebuild
138+
139+
* Tue Jan 24 2023 Richard W.M. Jones <[email protected]> - 1.0.3-6
140+
- Rebuild OCaml packages for F38
141+
142+
* Thu Jan 19 2023 Fedora Release Engineering <[email protected]> - 1.0.3-5
143+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
144+
145+
* Thu Aug 18 2022 Jerry James <[email protected]> - 1.0.3-4
146+
- Rebuild for ocaml-lwt 5.6.1
147+
148+
* Fri Jul 22 2022 Fedora Release Engineering <[email protected]> - 1.0.3-3
149+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
150+
151+
* Wed Jul 20 2022 Jerry James <[email protected]> - 1.0.3-2
152+
- Use new OCaml macros
153+
154+
* Sun Jun 19 2022 Richard W.M. Jones <[email protected]> - 1.0.3-2
155+
- OCaml 4.14.0 rebuild
156+
157+
* Wed Apr 27 2022 Jerry James <[email protected]> - 1.0.3-1
158+
- Version 1.0.3
159+
- Drop upstreamed patch for OCaml 4.13.1 compatibility
160+
161+
* Mon Feb 28 2022 Jerry James <[email protected]> - 1.0.2-7
162+
- Rebuild for ocaml-uutf 1.0.3
163+
164+
* Fri Feb 04 2022 Richard W.M. Jones <[email protected]> - 1.0.2-6
165+
- OCaml 4.13.1 rebuild to remove package notes
166+
167+
* Thu Jan 20 2022 Fedora Release Engineering <[email protected]> - 1.0.2-5
168+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
169+
170+
* Mon Jan 3 2022 Jerry James <[email protected]> - 1.0.2-4
171+
- Rebuild for changed ocaml-lwt hashes
172+
173+
* Tue Oct 05 2021 Richard W.M. Jones <[email protected]> - 1.0.2-3
174+
- OCaml 4.13.1 build
175+
176+
* Thu Jul 22 2021 Fedora Release Engineering <[email protected]> - 1.0.2-2
177+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
178+
179+
* Mon Jul 5 2021 Jerry James <[email protected]> - 1.0.2-1
180+
- Version 1.0.2
181+
182+
* Tue Jun 22 2021 Jerry James <[email protected]> - 1.0.1-1
183+
- Version 1.0.1
184+
185+
* Thu Jun 3 2021 Richard W.M. Jones <[email protected]> - 1.0.0-6
186+
- Rebuild for new ocaml-lwt.
187+
188+
* Mon Mar 1 21:30:59 GMT 2021 Richard W.M. Jones <[email protected]> - 1.0.0-5
189+
- OCaml 4.12.0 build
190190

191191
* Mon Feb 22 2021 Jerry James <[email protected]> - 1.0.0-4
192192
- Rebuild for ocaml-lwt 5.4.0

‎SPECS-EXTENDED/perl-File-ShareDir-Install/perl-File-ShareDir-Install.signatures.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"perl-File-ShareDir-Install-0.13.tar.gz": "45befdf0d95cbefe7c25a1daf293d85f780d6d2576146546e6828aad26e580f9"
3+
"perl-File-ShareDir-Install-0.14.tar.gz": "8f9533b198f2d4a9a5288cbc7d224f7679ad05a7a8573745599789428bc5aea0"
44
}
5-
}
5+
}

‎SPECS-EXTENDED/perl-File-ShareDir-Install/perl-File-ShareDir-Install.spec

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: perl-File-ShareDir-Install
2-
Version: 0.13
3-
Release: 9%{?dist}
2+
Version: 0.14
3+
Release: 1%{?dist}
44
Summary: Install shared files
55
License: GPL+ or Artistic
66
Vendor: Microsoft Corporation
@@ -57,6 +57,10 @@ make test
5757
%{_mandir}/man3/File::ShareDir::Install.3*
5858

5959
%changelog
60+
* Mon Dec 23 2024 Kevin Lockwood <[email protected]> - 0.14-1
61+
- Updated to version 0.14
62+
- License verified
63+
6064
* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 0.13-9
6165
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
6266

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Summary: Signed Linux Kernel for %{buildarch} systems
88
Name: kernel-64k-signed-%{buildarch}
99
Version: 6.6.64.2
10-
Release: 3%{?dist}
10+
Release: 4%{?dist}
1111
License: GPLv2
1212
Vendor: Microsoft Corporation
1313
Distribution: Azure Linux
@@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
105105
%exclude /module_info.ld
106106

107107
%changelog
108+
* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
109+
- Bump release to match kernel-64k
110+
108111
* Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
109112
- Bump release to match kernel
110113

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

+4-1
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: 6.6.64.2
13-
Release: 3%{?dist}
13+
Release: 4%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148+
* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
149+
- Bump release to match kernel
150+
148151
* Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
149152
- Bump release to match kernel
150153

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
88
Version: 6.6.64.2
9-
Release: 3%{?dist}
9+
Release: 4%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,6 +68,9 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71+
* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
72+
- Bump release to match kernel
73+
7174
* Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
7275
- Bump release to match kernel
7376

‎SPECS/ceph/ceph.spec

+17-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Summary: User space components of the Ceph file system
66
Name: ceph
77
Version: 18.2.2
8-
Release: 2%{?dist}
8+
Release: 3%{?dist}
99
License: LGPLv2 and LGPLv3 and CC-BY-SA and GPLv2 and Boost and BSD and MIT and Public Domain and GPLv3 and ASL-2.0
1010
URL: https://ceph.io/
1111
Vendor: Microsoft Corporation
@@ -898,6 +898,10 @@ This package provides a Ceph hardware monitoring agent.
898898
%autosetup -p1
899899

900900
%build
901+
pwd
902+
# CVE-2022-24736 and CVE-2022-24735 Remove opentelemetry-cpp which uses LUA
903+
# This subsystem is not getting built in ceph
904+
rm -rf src/jaegertracing/opentelemetry-cpp/*
901905
# LTO can be enabled as soon as the following GCC bug is fixed:
902906
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200
903907
%define _lto_cflags %{nil}
@@ -2000,6 +2004,18 @@ exit 0
20002004

20012005

20022006
%changelog
2007+
* Tue Jan 01 2025 Sandeep Karambelkar <[email protected]> - 18.2.2-3
2008+
- Based on the package build logs, opentelemetry-cpp submodule is not being built
2009+
- Removing opentelemetry-cpp to address below CVEs as this submodule is not relevant
2010+
- CVE-2022-24735
2011+
- CVE-2022-24736
2012+
- CVE-2021-44647
2013+
- CVE-2020-24371
2014+
- CVE-2014-5461
2015+
- CVE-2021-43519
2016+
- CVE-2021-44964
2017+
- CVE-2024-31755
2018+
20032019
* Wed Dec 4 2024 Bhagyashri Pathak <[email protected]> - 18.2.2-2
20042020
- Fix for CVE-2024-52338
20052021

0 commit comments

Comments
 (0)