Skip to content

Commit bb57b03

Browse files
anphel31anphel31
authored
Merge 3.0-dev into 3.0 (#9473)
2 parents 4209f4e + beca895 commit bb57b03

File tree

207 files changed

+5396
-15296
lines changed

Some content is hidden

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

207 files changed

+5396
-15296
lines changed

‎.pipelines/containerSourceData/kubevirt/Dockerfile-kubevirt-virt-launcher

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ FROM $BASE_IMAGE
77

88
@INCLUDE_MAIN_RUN_INSTRUCTION@
99

10-
# XXX Once edk2 is moved to SPECS this will not be needed
11-
RUN tdnf -y install azurelinux-repos-extended.noarch \
12-
&& tdnf -y install edk2-ovmf \
13-
&& tdnf clean all
14-
1510
# Setup permissions and capabilities for non-root VMIs. KubeVirt sets
1611
# XDG_* directories to /var/run.
1712
RUN cd /var && rm -rf run && ln -s ../run . \

‎.pipelines/containerSourceData/kubevirt/virt-launcher.pkg

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
augeas
22
ca-certificates
3+
edk2-ovmf
34
iptables
45
kubevirt-container-disk
56
kubevirt-virt-launcher

‎.pipelines/containerSourceData/memcached/Dockerfile-Memcached

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM $BASE_IMAGE
77

88
@INCLUDE_MAIN_RUN_INSTRUCTION@
99

10-
RUN useradd memcache
10+
RUN tdnf install -y shadow-utils && useradd memcache && tdnf remove -y shadow-utils && tdnf clean all
1111

1212
USER memcache
1313

‎.pipelines/containerSourceData/multus/Dockerfile-Multus

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
1111

1212
RUN mkdir -p /usr/src/multus-cni/bin \
1313
&& cp /usr/bin/multus /usr/src/multus-cni/bin/ \
14-
&& cp /usr/bin/install_multus /install_multus \
15-
&& cp /usr/bin/thin_entrypoint /thin_entrypoint
14+
&& cp /usr/bin/multus-entrypoint /multus-entrypoint
1615

17-
ENTRYPOINT [ "/thin_entrypoint" ]
16+
ENTRYPOINT [ "/multus-entrypoint" ]

‎.pipelines/containerSourceData/nodejs/distroless/nodejs.pkg

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
distroless-packages-base
22
nodejs
3+
nodejs-npm
34
prebuilt-ca-certificates

‎.pipelines/containerSourceData/nodejs/nodejs.pkg

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
ca-certificates
22
nodejs
3+
nodejs-npm

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

+1-1
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

+4-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
"annobin",
5555
"ansible-freeipa",
5656
"archivemount",
57-
"argparse-manpage",
5857
"arptables",
5958
"arpwatch",
6059
"asio",
@@ -99,6 +98,7 @@
9998
"cachefilesd",
10099
"cairomm",
101100
"calamares",
101+
"capnproto",
102102
"capstone",
103103
"catatonit",
104104
"catch",
@@ -1629,6 +1629,7 @@
16291629
"python-aiohttp",
16301630
"python-alsa",
16311631
"python-argcomplete",
1632+
"python-argparse-manpage",
16321633
"python-astroid",
16331634
"python-astunparse",
16341635
"python-async-generator",
@@ -1854,6 +1855,7 @@
18541855
"python-winrm",
18551856
"python-wrapt",
18561857
"python-xlrd",
1858+
"python-xlsxwriter",
18571859
"python-xmltodict",
18581860
"python-yubico",
18591861
"python-zipp",
@@ -1903,6 +1905,7 @@
19031905
"rpm-mpi-hooks",
19041906
"rpmdevtools",
19051907
"rpmlint",
1908+
"rr",
19061909
"rtkit",
19071910
"rtl-sdr",
19081911
"ruby-augeas",

‎SPECS-EXTENDED/buildah/buildah.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ BuildRequires: btrfs-progs-devel
3232
BuildRequires: device-mapper-devel
3333
BuildRequires: git
3434
BuildRequires: glib2-devel
35-
BuildRequires: glibc-static >= 2.38-5%{?dist}
35+
BuildRequires: glibc-static >= 2.38-6%{?dist}
3636
BuildRequires: go-md2man
3737
BuildRequires: go-rpm-macros
3838
BuildRequires: golang

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

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"Signatures": {
3+
"capnproto-c++-1.0.1.tar.gz": "0f7f4b8a76a2cdb284fddef20de8306450df6dd031a47a15ac95bc43c3358e09"
4+
}
5+
}

‎SPECS-EXTENDED/capnproto/capnproto.spec

+205
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,205 @@
1+
# Force out of source build
2+
%undefine __cmake_in_source_build
3+
4+
%global modulename %{name}-c++
5+
6+
Name: capnproto
7+
Version: 1.0.1
8+
Release: 4%{?dist}
9+
Summary: A data interchange format and capability-based RPC system
10+
11+
License: MIT
12+
Vendor: Microsoft Corporation
13+
Distribution: Azure Linux
14+
URL: https://capnproto.org
15+
16+
Source0: https://capnproto.org/%{modulename}-%{version}.tar.gz
17+
18+
# We need C++
19+
BuildRequires: gcc-c++
20+
BuildRequires: cmake >= 3.1
21+
22+
# Ensure that we use matching version of libraries
23+
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
24+
25+
%description
26+
Cap’n Proto is an insanely fast data interchange format
27+
and capability-based RPC system. Think JSON, except binary.
28+
Or think Protocol Buffers, except faster. In fact, in benchmarks,
29+
Cap’n Proto is INFINITY TIMES faster than Protocol Buffers.
30+
31+
This package contains the schema compiler and command-line
32+
encoder/decoder tools.
33+
34+
%package libs
35+
Summary: Libraries for %{name}
36+
37+
%description libs
38+
The %{name}-libs package contains the libraries for using %{name}
39+
in applications.
40+
41+
%package devel
42+
Summary: Development files for %{name}
43+
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
44+
45+
%description devel
46+
The %{name}-devel package contains libraries and header files for
47+
developing applications that use %{name}.
48+
49+
50+
%prep
51+
%autosetup -n %{modulename}-%{version} -p2
52+
53+
# Disable broken test
54+
## Cf. https://github.com/capnproto/capnproto/issues/1349
55+
## Cf. https://github.com/capnproto/capnproto/issues/1398
56+
sed -e '/TEST(AsyncIo, AncillaryMessageHandler)/,/^}/s/^/\/\//' -i src/kj/async-io-test.c++
57+
58+
59+
%build
60+
# The tests are randomly failing due to poor sparsing support in the build system
61+
export CFLAGS="%{build_cflags} -DHOLES_NOT_SUPPORTED=1"
62+
export CXXFLAGS="%{build_cxxflags} -DHOLES_NOT_SUPPORTED=1"
63+
64+
%cmake -DBUILD_TESTING=ON
65+
%cmake_build
66+
67+
68+
%check
69+
%ctest
70+
71+
72+
%install
73+
%cmake_install
74+
find %{buildroot} -name '*.la' -delete
75+
76+
77+
%files
78+
%{_bindir}/capnp
79+
%{_bindir}/capnpc
80+
%{_bindir}/capnpc-c++
81+
%{_bindir}/capnpc-capnp
82+
83+
%files libs
84+
%license LICENSE.txt
85+
%{_libdir}/*.so.*
86+
87+
%files devel
88+
%{_includedir}/*
89+
%{_libdir}/*.so
90+
%{_libdir}/pkgconfig/*.pc
91+
%{_libdir}/cmake/CapnProto/
92+
93+
%changelog
94+
* Fri Jun 14 2024 Henry Beberman <[email protected]> - 1.0.1-4
95+
- Initial Azure Linux import from Fedora 41 (license: MIT).
96+
- License verified.
97+
98+
* Tue Jan 23 2024 Fedora Release Engineering <[email protected]> - 1.0.1-3
99+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
100+
101+
* Fri Jan 19 2024 Fedora Release Engineering <[email protected]> - 1.0.1-2
102+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
103+
104+
* Fri Sep 08 2023 Neal Gompa <[email protected]> - 1.0.1-1
105+
- Rebase to 1.0.1
106+
107+
* Wed Jul 19 2023 Fedora Release Engineering <[email protected]> - 0.10.3-4
108+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
109+
110+
* Tue Feb 28 2023 Mamoru TASAKA <[email protected]> - 0.10.3-3
111+
- Backport upstream fix for missing headers for g++13
112+
- Backport upstream fix for operator!= removal for C++20
113+
114+
* Wed Jan 18 2023 Fedora Release Engineering <[email protected]> - 0.10.3-2
115+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
116+
117+
* Fri Dec 02 2022 Fabio Valentini <[email protected]> - 0.10.3-1
118+
- Update to version 0.10.3
119+
- Fixes RHBZ#2149787
120+
- Addresses CVE-2022-46149
121+
122+
* Tue Nov 29 2022 Neal Gompa <[email protected]> - 0.10.2-1
123+
- Rebase to 0.10.2
124+
- Drop backported patch
125+
126+
* Wed Jul 20 2022 Fedora Release Engineering <[email protected]> - 0.9.1-3
127+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
128+
129+
* Wed Jan 19 2022 Fedora Release Engineering <[email protected]> - 0.9.1-2
130+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
131+
132+
* Tue Dec 21 2021 Neal Gompa <[email protected]> - 0.9.1-1
133+
- Rebase to 0.9.1
134+
- Add patch to fix running tests
135+
- Disable flaky/broken test per upstream guidance
136+
137+
* Wed Jul 21 2021 Fedora Release Engineering <[email protected]> - 0.8.0-4
138+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
139+
140+
* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 0.8.0-3
141+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
142+
143+
* Mon Jul 27 2020 Fedora Release Engineering <[email protected]> - 0.8.0-2
144+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
145+
146+
* Sat Jul 18 2020 Neal Gompa <[email protected]> - 0.8.0-1
147+
- Update to 0.8.0 (#1827443)
148+
- Drop backported patches
149+
150+
* Thu Mar 12 2020 Neal Gompa <[email protected]> - 0.7.0-6
151+
- Backport patch to fix aliasing violation breaking builds on GCC 10 on ARM (#1807872)
152+
- Disable "DiskFile holes" test to stop build failures
153+
154+
* Tue Jan 28 2020 Fedora Release Engineering <[email protected]> - 0.7.0-5
155+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
156+
157+
* Wed Jul 24 2019 Fedora Release Engineering <[email protected]> - 0.7.0-4
158+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
159+
160+
* Thu Jan 31 2019 Fedora Release Engineering <[email protected]> - 0.7.0-3
161+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
162+
163+
* Wed Jan 23 2019 Björn Esser <[email protected]> - 0.7.0-2
164+
- Append curdir to CMake invokation. (#1668512)
165+
166+
* Sun Sep 23 2018 Neal Gompa <[email protected]> - 0.7.0-1
167+
- Update to 0.7.0
168+
- Drop upstreamed patches
169+
- Drop obsolete ldconfig scriptlets
170+
171+
* Thu Jul 12 2018 Fedora Release Engineering <[email protected]> - 0.6.1-8
172+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
173+
174+
* Wed Feb 07 2018 Fedora Release Engineering <[email protected]> - 0.6.1-7
175+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
176+
177+
* Sun Aug 06 2017 Björn Esser <[email protected]> - 0.6.1-6
178+
- Rebuilt for AutoReq cmake-filesystem
179+
180+
* Wed Aug 02 2017 Fedora Release Engineering <[email protected]> - 0.6.1-5
181+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
182+
183+
* Wed Jul 26 2017 Fedora Release Engineering <[email protected]> - 0.6.1-4
184+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
185+
186+
* Fri Jun 09 2017 Neal Gompa <[email protected]> - 0.6.1-3
187+
- Update patch based on upstream feedback
188+
189+
* Fri Jun 09 2017 Neal Gompa <[email protected]> - 0.6.1-2
190+
- Adjust soversion patch to maintain binary compat across patch versions
191+
192+
* Fri Jun 09 2017 Neal Gompa <[email protected]> - 0.6.1-1
193+
- Update to 0.6.1
194+
195+
* Mon Feb 27 2017 Neal Gompa <[email protected]> - 0.5.3-4
196+
- Add patch to fix FTBFS with GCC 7 (#1423291)
197+
198+
* Fri Feb 10 2017 Fedora Release Engineering <[email protected]> - 0.5.3-3
199+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
200+
201+
* Thu Apr 28 2016 Neal Gompa <[email protected]> - 0.5.3-2
202+
- Add patches to fix ppc builds
203+
204+
* Tue Apr 26 2016 Neal Gompa <[email protected]> - 0.5.3-1
205+
- Initial packaging

‎SPECS-EXTENDED/catatonit/catatonit.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ BuildRequires: automake
1313
BuildRequires: file
1414
BuildRequires: gcc
1515
BuildRequires: git
16-
BuildRequires: glibc-static >= 2.38-5%{?dist}
16+
BuildRequires: glibc-static >= 2.38-6%{?dist}
1717
BuildRequires: libtool
1818
BuildRequires: make
1919

‎SPECS/cri-o/cri-o-rpmlintrc ‎SPECS-EXTENDED/cri-o/cri-o-rpmlintrc

File renamed without changes.

‎SPECS/cri-o/cri-o.signatures.json ‎SPECS-EXTENDED/cri-o/cri-o.signatures.json

File renamed without changes.

‎SPECS/cri-o/cri-o.spec ‎SPECS-EXTENDED/cri-o/cri-o.spec

File renamed without changes.

‎SPECS/cri-o/crio.conf ‎SPECS-EXTENDED/cri-o/crio.conf

File renamed without changes.

‎SPECS/cri-o/crio.service ‎SPECS-EXTENDED/cri-o/crio.service

File renamed without changes.

‎SPECS/cri-o/generate_source_tarball.sh ‎SPECS-EXTENDED/cri-o/generate_source_tarball.sh

File renamed without changes.

‎SPECS/cri-o/kubelet.env ‎SPECS-EXTENDED/cri-o/kubelet.env

File renamed without changes.

‎SPECS/cri-o/sysconfig.crio ‎SPECS-EXTENDED/cri-o/sysconfig.crio

File renamed without changes.

‎SPECS-EXTENDED/dyninst/dyninst.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ BuildRequires: tbb tbb-devel
3131

3232
# Extra requires just for the testsuite
3333
BuildRequires: gcc-gfortran libstdc++-static libxml2-devel
34-
BuildRequires: glibc-static >= 2.38-5%{?dist}
34+
BuildRequires: glibc-static >= 2.38-6%{?dist}
3535

3636
# Testsuite files should not provide/require anything
3737
%{?filter_setup:

‎SPECS-EXTENDED/podman/podman.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ BuildRequires: go-md2man
5050
BuildRequires: golang
5151
BuildRequires: gcc
5252
BuildRequires: glib2-devel
53-
BuildRequires: glibc-static >= 2.38-5%{?dist}
53+
BuildRequires: glibc-static >= 2.38-6%{?dist}
5454
BuildRequires: git
5555
BuildRequires: go-rpm-macros
5656
BuildRequires: gpgme-devel

‎SPECS-EXTENDED/argparse-manpage/argparse-manpage.signatures.json ‎SPECS-EXTENDED/python-argparse-manpage/python-argparse-manpage.signatures.json

File renamed without changes.

‎SPECS-EXTENDED/argparse-manpage/argparse-manpage.spec ‎SPECS-EXTENDED/python-argparse-manpage/python-argparse-manpage.spec

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
3+
%global modname argparse-manpage
34

45
%global sum() Build manual page from %* ArgumentParser object
56
%global desc \
@@ -11,33 +12,33 @@ specify that by (a) the module name or corresponding python filename and \
1112
There is a limited support for (deprecated) optparse objects, too.
1213

1314

14-
Name: argparse-manpage
15+
Name: python-%{modname}
1516
Version: 1.5
1617
Release: 3%{?dist}
1718
Summary: %{sum Python}
1819
BuildArch: noarch
1920

2021
License: ASL 2.0
21-
URL: https://github.com/praiskup/%{name}
22-
Source0: %pypi_source
22+
URL: https://github.com/praiskup/%{modname}
23+
Source0: %pypi_source argparse-manpage
2324

2425
BuildRequires: python3-setuptools python3-devel
2526
%if 0%{?with_check}
2627
BuildRequires: python3-pip
2728
%endif
28-
Requires: python3-%{name} = %{version}-%{release}
29+
Requires: python3-%{modname} = %{version}-%{release}
2930

3031
%description
3132
%desc
3233

33-
%package -n python3-%name
34+
%package -n python3-%{modname}
3435
Summary: %{sum Python 3}
3536

36-
%description -n python3-%name
37+
%description -n python3-%{modname}
3738
%{desc}
3839

3940
%prep
40-
%setup -q
41+
%setup -q -n %{modname}-%{version}
4142

4243
%build
4344
%py3_build
@@ -59,7 +60,7 @@ pip3 install pytest==7.1.2 six==1.16.0
5960
%{_mandir}/man1/argparse-manpage.1.*
6061
%{python3_sitelib}/build_manpages/cli
6162

62-
%files -n python3-%name
63+
%files -n python3-%{modname}
6364
%license LICENSE
6465
%{python3_sitelib}/build_manpages
6566
%{python3_sitelib}/argparse_manpage-%{version}*.egg-info

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

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"Signatures": {
3+
"rr-5.8.0.tar.gz": "8b162a3340a6ddb29170b359fe0f2e023f86a9bfea035555b74d38d9fc5e0c00"
4+
}
5+
}

0 commit comments

Comments
 (0)