Merge 3.0-dev into 3.0 (#9473)

microsoft · Jun 24, 2024 · bb57b03 · bb57b03
2 parents 4209f4e + beca895
commit bb57b03
Show file tree

Hide file tree

Showing 207 changed files with 5,396 additions and 15,296 deletions.
diff --git a/.pipelines/containerSourceData/kubevirt/Dockerfile-kubevirt-virt-launcher b/.pipelines/containerSourceData/kubevirt/Dockerfile-kubevirt-virt-launcher
@@ -7,11 +7,6 @@ FROM $BASE_IMAGE
 
 @INCLUDE_MAIN_RUN_INSTRUCTION@
 
-# XXX Once edk2 is moved to SPECS this will not be needed
-RUN tdnf -y install azurelinux-repos-extended.noarch \
-  && tdnf -y install edk2-ovmf \
-  && tdnf clean all
-
 # Setup permissions and capabilities for non-root VMIs. KubeVirt sets
 # XDG_* directories to /var/run.
 RUN  cd /var && rm -rf run && ln -s ../run . \

diff --git a/.pipelines/containerSourceData/kubevirt/virt-launcher.pkg b/.pipelines/containerSourceData/kubevirt/virt-launcher.pkg
@@ -1,5 +1,6 @@
 augeas
 ca-certificates
+edk2-ovmf
 iptables
 kubevirt-container-disk
 kubevirt-virt-launcher

diff --git a/.pipelines/containerSourceData/memcached/Dockerfile-Memcached b/.pipelines/containerSourceData/memcached/Dockerfile-Memcached
@@ -7,7 +7,7 @@ FROM $BASE_IMAGE
 
 @INCLUDE_MAIN_RUN_INSTRUCTION@
 
-RUN useradd memcache
+RUN tdnf install -y shadow-utils && useradd memcache && tdnf remove -y shadow-utils && tdnf clean all
 
 USER memcache
 

diff --git a/.pipelines/containerSourceData/multus/Dockerfile-Multus b/.pipelines/containerSourceData/multus/Dockerfile-Multus
@@ -11,7 +11,6 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
 
 RUN mkdir -p /usr/src/multus-cni/bin \ 
   && cp /usr/bin/multus /usr/src/multus-cni/bin/ \ 
-  && cp /usr/bin/install_multus /install_multus \ 
-  && cp /usr/bin/thin_entrypoint /thin_entrypoint 
+  && cp /usr/bin/multus-entrypoint /multus-entrypoint 
 
-ENTRYPOINT [ "/thin_entrypoint" ]
+ENTRYPOINT [ "/multus-entrypoint" ]
diff --git a/.pipelines/containerSourceData/nodejs/distroless/nodejs.pkg b/.pipelines/containerSourceData/nodejs/distroless/nodejs.pkg
@@ -1,3 +1,4 @@
 distroless-packages-base
 nodejs
+nodejs-npm
 prebuilt-ca-certificates
diff --git a/.pipelines/containerSourceData/nodejs/nodejs.pkg b/.pipelines/containerSourceData/nodejs/nodejs.pkg
@@ -1,2 +1,3 @@
 ca-certificates
 nodejs
+nodejs-npm
diff --git a/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md
diff --git a/LICENSES-AND-NOTICES/SPECS/data/licenses.json b/LICENSES-AND-NOTICES/SPECS/data/licenses.json
@@ -54,7 +54,6 @@
                 "annobin",
                 "ansible-freeipa",
                 "archivemount",
-                "argparse-manpage",
                 "arptables",
                 "arpwatch",
                 "asio",
@@ -99,6 +98,7 @@
                 "cachefilesd",
                 "cairomm",
                 "calamares",
+                "capnproto",
                 "capstone",
                 "catatonit",
                 "catch",
@@ -1629,6 +1629,7 @@
                 "python-aiohttp",
                 "python-alsa",
                 "python-argcomplete",
+                "python-argparse-manpage",
                 "python-astroid",
                 "python-astunparse",
                 "python-async-generator",
@@ -1854,6 +1855,7 @@
                 "python-winrm",
                 "python-wrapt",
                 "python-xlrd",
+                "python-xlsxwriter",
                 "python-xmltodict",
                 "python-yubico",
                 "python-zipp",
@@ -1903,6 +1905,7 @@
                 "rpm-mpi-hooks",
                 "rpmdevtools",
                 "rpmlint",
+                "rr",
                 "rtkit",
                 "rtl-sdr",
                 "ruby-augeas",

diff --git a/SPECS-EXTENDED/buildah/buildah.spec b/SPECS-EXTENDED/buildah/buildah.spec
@@ -32,7 +32,7 @@ BuildRequires:  btrfs-progs-devel
 BuildRequires:  device-mapper-devel
 BuildRequires:  git
 BuildRequires:  glib2-devel
-BuildRequires:  glibc-static >= 2.38-5%{?dist}
+BuildRequires:  glibc-static >= 2.38-6%{?dist}
 BuildRequires:  go-md2man
 BuildRequires:  go-rpm-macros
 BuildRequires:  golang

diff --git a/SPECS-EXTENDED/capnproto/capnproto.signatures.json b/SPECS-EXTENDED/capnproto/capnproto.signatures.json
@@ -0,0 +1,5 @@
+{
+  "Signatures": {
+    "capnproto-c++-1.0.1.tar.gz": "0f7f4b8a76a2cdb284fddef20de8306450df6dd031a47a15ac95bc43c3358e09"
+  }
+}
diff --git a/SPECS-EXTENDED/capnproto/capnproto.spec b/SPECS-EXTENDED/capnproto/capnproto.spec
@@ -0,0 +1,205 @@
+# Force out of source build
+%undefine __cmake_in_source_build
+
+%global modulename %{name}-c++
+
+Name:           capnproto
+Version:        1.0.1
+Release:        4%{?dist}
+Summary:        A data interchange format and capability-based RPC system
+
+License:        MIT
+Vendor:         Microsoft Corporation
+Distribution:   Azure Linux
+URL:            https://capnproto.org
+
+Source0:        https://capnproto.org/%{modulename}-%{version}.tar.gz
+
+# We need C++
+BuildRequires:  gcc-c++
+BuildRequires:  cmake >= 3.1
+
+# Ensure that we use matching version of libraries
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description
+Cap’n Proto is an insanely fast data interchange format
+and capability-based RPC system. Think JSON, except binary.
+Or think Protocol Buffers, except faster. In fact, in benchmarks,
+Cap’n Proto is INFINITY TIMES faster than Protocol Buffers.
+
+This package contains the schema compiler and command-line
+encoder/decoder tools.
+
+%package        libs
+Summary:        Libraries for %{name}
+
+%description    libs
+The %{name}-libs package contains the libraries for using %{name}
+in applications.
+
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%autosetup -n %{modulename}-%{version} -p2
+
+# Disable broken test
+## Cf. https://github.com/capnproto/capnproto/issues/1349
+## Cf. https://github.com/capnproto/capnproto/issues/1398
+sed -e '/TEST(AsyncIo, AncillaryMessageHandler)/,/^}/s/^/\/\//' -i src/kj/async-io-test.c++
+
+
+%build
+# The tests are randomly failing due to poor sparsing support in the build system
+export CFLAGS="%{build_cflags} -DHOLES_NOT_SUPPORTED=1"
+export CXXFLAGS="%{build_cxxflags} -DHOLES_NOT_SUPPORTED=1"
+
+%cmake -DBUILD_TESTING=ON
+%cmake_build
+
+
+%check
+%ctest
+
+
+%install
+%cmake_install
+find %{buildroot} -name '*.la' -delete
+
+
+%files
+%{_bindir}/capnp
+%{_bindir}/capnpc
+%{_bindir}/capnpc-c++
+%{_bindir}/capnpc-capnp
+
+%files libs
+%license LICENSE.txt
+%{_libdir}/*.so.*
+
+%files devel
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/cmake/CapnProto/
+
+%changelog
+* Fri Jun 14 2024 Henry Beberman <[email protected]> - 1.0.1-4
+- Initial Azure Linux import from Fedora 41 (license: MIT).
+- License verified.
+
+* Tue Jan 23 2024 Fedora Release Engineering <[email protected]> - 1.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <[email protected]> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 08 2023 Neal Gompa <[email protected]> - 1.0.1-1
+- Rebase to 1.0.1
+
+* Wed Jul 19 2023 Fedora Release Engineering <[email protected]> - 0.10.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Feb 28 2023 Mamoru TASAKA <[email protected]> - 0.10.3-3
+- Backport upstream fix for missing headers for g++13
+- Backport upstream fix for operator!= removal for C++20
+
+* Wed Jan 18 2023 Fedora Release Engineering <[email protected]> - 0.10.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Dec 02 2022 Fabio Valentini <[email protected]> - 0.10.3-1
+- Update to version 0.10.3
+- Fixes RHBZ#2149787
+- Addresses CVE-2022-46149
+
+* Tue Nov 29 2022 Neal Gompa <[email protected]> - 0.10.2-1
+- Rebase to 0.10.2
+- Drop backported patch
+
+* Wed Jul 20 2022 Fedora Release Engineering <[email protected]> - 0.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 19 2022 Fedora Release Engineering <[email protected]> - 0.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Dec 21 2021 Neal Gompa <[email protected]> - 0.9.1-1
+- Rebase to 0.9.1
+- Add patch to fix running tests
+- Disable flaky/broken test per upstream guidance
+
+* Wed Jul 21 2021 Fedora Release Engineering <[email protected]> - 0.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 0.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <[email protected]> - 0.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 18 2020 Neal Gompa <[email protected]> - 0.8.0-1
+- Update to 0.8.0 (#1827443)
+- Drop backported patches
+
+* Thu Mar 12 2020 Neal Gompa <[email protected]> - 0.7.0-6
+- Backport patch to fix aliasing violation breaking builds on GCC 10 on ARM (#1807872)
+- Disable "DiskFile holes" test to stop build failures
+
+* Tue Jan 28 2020 Fedora Release Engineering <[email protected]> - 0.7.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <[email protected]> - 0.7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <[email protected]> - 0.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 23 2019 Björn Esser <[email protected]> - 0.7.0-2
+- Append curdir to CMake invokation. (#1668512)
+
+* Sun Sep 23 2018 Neal Gompa <[email protected]> - 0.7.0-1
+- Update to 0.7.0
+- Drop upstreamed patches
+- Drop obsolete ldconfig scriptlets
+
+* Thu Jul 12 2018 Fedora Release Engineering <[email protected]> - 0.6.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <[email protected]> - 0.6.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Aug 06 2017 Björn Esser <[email protected]> - 0.6.1-6
+- Rebuilt for AutoReq cmake-filesystem
+
+* Wed Aug 02 2017 Fedora Release Engineering <[email protected]> - 0.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <[email protected]> - 0.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jun 09 2017 Neal Gompa <[email protected]> - 0.6.1-3
+- Update patch based on upstream feedback
+
+* Fri Jun 09 2017 Neal Gompa <[email protected]> - 0.6.1-2
+- Adjust soversion patch to maintain binary compat across patch versions
+
+* Fri Jun 09 2017 Neal Gompa <[email protected]> - 0.6.1-1
+- Update to 0.6.1
+
+* Mon Feb 27 2017 Neal Gompa <[email protected]> - 0.5.3-4
+- Add patch to fix FTBFS with GCC 7 (#1423291)
+
+* Fri Feb 10 2017 Fedora Release Engineering <[email protected]> - 0.5.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Apr 28 2016 Neal Gompa <[email protected]> - 0.5.3-2
+- Add patches to fix ppc builds
+
+* Tue Apr 26 2016 Neal Gompa <[email protected]> - 0.5.3-1
+- Initial packaging
diff --git a/SPECS-EXTENDED/catatonit/catatonit.spec b/SPECS-EXTENDED/catatonit/catatonit.spec
@@ -13,7 +13,7 @@ BuildRequires: automake
 BuildRequires: file
 BuildRequires: gcc
 BuildRequires: git
-BuildRequires: glibc-static >= 2.38-5%{?dist}
+BuildRequires: glibc-static >= 2.38-6%{?dist}
 BuildRequires: libtool
 BuildRequires: make
 

diff --git a/SPECS/cri-o/cri-o-rpmlintrc → SPECS-EXTENDED/cri-o/cri-o-rpmlintrc b/SPECS/cri-o/cri-o-rpmlintrc → SPECS-EXTENDED/cri-o/cri-o-rpmlintrc
diff --git a/SPECS/cri-o/cri-o.signatures.json → SPECS-EXTENDED/cri-o/cri-o.signatures.json b/SPECS/cri-o/cri-o.signatures.json → SPECS-EXTENDED/cri-o/cri-o.signatures.json
diff --git a/SPECS/cri-o/cri-o.spec → SPECS-EXTENDED/cri-o/cri-o.spec b/SPECS/cri-o/cri-o.spec → SPECS-EXTENDED/cri-o/cri-o.spec
diff --git a/SPECS/cri-o/crio.conf → SPECS-EXTENDED/cri-o/crio.conf b/SPECS/cri-o/crio.conf → SPECS-EXTENDED/cri-o/crio.conf
diff --git a/SPECS/cri-o/crio.service → SPECS-EXTENDED/cri-o/crio.service b/SPECS/cri-o/crio.service → SPECS-EXTENDED/cri-o/crio.service
diff --git a/SPECS/cri-o/generate_source_tarball.sh → ...EXTENDED/cri-o/generate_source_tarball.sh b/SPECS/cri-o/generate_source_tarball.sh → ...EXTENDED/cri-o/generate_source_tarball.sh
diff --git a/SPECS/cri-o/kubelet.env → SPECS-EXTENDED/cri-o/kubelet.env b/SPECS/cri-o/kubelet.env → SPECS-EXTENDED/cri-o/kubelet.env
diff --git a/SPECS/cri-o/sysconfig.crio → SPECS-EXTENDED/cri-o/sysconfig.crio b/SPECS/cri-o/sysconfig.crio → SPECS-EXTENDED/cri-o/sysconfig.crio
diff --git a/SPECS-EXTENDED/dyninst/dyninst.spec b/SPECS-EXTENDED/dyninst/dyninst.spec
@@ -31,7 +31,7 @@ BuildRequires: tbb tbb-devel
 
 # Extra requires just for the testsuite
 BuildRequires: gcc-gfortran libstdc++-static libxml2-devel
-BuildRequires: glibc-static >= 2.38-5%{?dist}
+BuildRequires: glibc-static >= 2.38-6%{?dist}
 
 # Testsuite files should not provide/require anything
 %{?filter_setup:

diff --git a/SPECS-EXTENDED/podman/podman.spec b/SPECS-EXTENDED/podman/podman.spec
@@ -50,7 +50,7 @@ BuildRequires:  go-md2man
 BuildRequires:  golang
 BuildRequires:  gcc
 BuildRequires:  glib2-devel
-BuildRequires:  glibc-static >= 2.38-5%{?dist}
+BuildRequires:  glibc-static >= 2.38-6%{?dist}
 BuildRequires:  git
 BuildRequires:  go-rpm-macros
 BuildRequires:  gpgme-devel

diff --git a/...-manpage/argparse-manpage.signatures.json → ...e/python-argparse-manpage.signatures.json b/...-manpage/argparse-manpage.signatures.json → ...e/python-argparse-manpage.signatures.json
diff --git a/...ED/argparse-manpage/argparse-manpage.spec → ...arse-manpage/python-argparse-manpage.spec b/...ED/argparse-manpage/argparse-manpage.spec → ...arse-manpage/python-argparse-manpage.spec
@@ -1,5 +1,6 @@
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
+%global modname argparse-manpage
 
 %global sum()   Build manual page from %* ArgumentParser object
 %global desc \
@@ -11,33 +12,33 @@ specify that by (a) the module name or corresponding python filename and \
 There is a limited support for (deprecated) optparse objects, too.
 
 
-Name:           argparse-manpage
+Name:           python-%{modname}
 Version:        1.5
 Release:        3%{?dist}
 Summary:        %{sum Python}
 BuildArch:      noarch
 
 License:        ASL 2.0
-URL:            https://github.com/praiskup/%{name}
-Source0:        %pypi_source
+URL:            https://github.com/praiskup/%{modname}
+Source0:        %pypi_source argparse-manpage
 
 BuildRequires: python3-setuptools python3-devel
 %if 0%{?with_check}
 BuildRequires: python3-pip
 %endif
-Requires: python3-%{name} = %{version}-%{release}
+Requires: python3-%{modname} = %{version}-%{release}
 
 %description
 %desc
 
-%package -n     python3-%name
+%package -n     python3-%{modname}
 Summary:        %{sum Python 3}
 
-%description -n python3-%name
+%description -n python3-%{modname}
 %{desc}
 
 %prep
-%setup -q
+%setup -q -n %{modname}-%{version}
 
 %build
 %py3_build
@@ -59,7 +60,7 @@ pip3 install pytest==7.1.2 six==1.16.0
 %{_mandir}/man1/argparse-manpage.1.*
 %{python3_sitelib}/build_manpages/cli
 
-%files -n python3-%name
+%files -n python3-%{modname}
 %license LICENSE
 %{python3_sitelib}/build_manpages
 %{python3_sitelib}/argparse_manpage-%{version}*.egg-info

diff --git a/SPECS-EXTENDED/rr/rr.signatures.json b/SPECS-EXTENDED/rr/rr.signatures.json
@@ -0,0 +1,5 @@
+{
+  "Signatures": {
+    "rr-5.8.0.tar.gz": "8b162a3340a6ddb29170b359fe0f2e023f86a9bfea035555b74d38d9fc5e0c00"
+  }
+}