Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.0-dev into 3.0 #9473

Merged
merged 41 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
abbbe63
add nodejs-npm to nodejs golden container (#9386)
mandeepsplaha Jun 12, 2024
42a30eb
toolkit: bump azidentity 1.3.1 -> 1.6.0 to address CVE-2024-35255 (#9…
mfrw Jun 12, 2024
a63d5a4
php: udpate to v8.3.8 to fix CVEs (#9377)
neha170 Jun 12, 2024
070daa8
Bump azurelinux release for preview (#9389)
sameluch Jun 13, 2024
a961baf
Address CVE-2024-3727 by patching vendored github.com/containers/imag…
bfjelds Jun 13, 2024
c0c4848
Python XlsxWriter Initial Azure Linux Import from Fedora 40 (#9387)
Alberto-Perez-Guevara Jun 13, 2024
a21765f
Add patch for cloud init dhcp issue (#9331)
rmhsawyer Jun 13, 2024
d751e04
add oneliner to memcached dockerfile to add user (#9399)
mandeepsplaha Jun 13, 2024
3d6f28d
Fix shadow-utils to reenable user groups (#9363)
tobiasb-ms Jun 14, 2024
7791dfe
systemd: disable llmnr by default (#9396)
christopherco Jun 14, 2024
c50d4af
[grub] Disable code optimization for ip frame checksum calculation. (…
gmileka Jun 14, 2024
4994e48
Test Fix for Package annobin (#9406)
sameluch Jun 14, 2024
77b1718
Test Fix for Package brotli (#9409)
sameluch Jun 14, 2024
daea85d
Upgrade babel to Version 2.15.0 to Fix Package Tests (#9408)
sameluch Jun 14, 2024
c687f6d
Changes to kubevirt, multus to build container images on 3.0 (#9412)
sharath-srikanth-chellappa Jun 14, 2024
640ece2
xlsxwriter build issue (#9411)
Alberto-Perez-Guevara Jun 15, 2024
6fda93c
[3.0-dev] Patch CVE-2024-5564 in libndp (#9414)
nisamson Jun 15, 2024
26d9bca
Upgrade grub2 from 2.06 to 2.12 (#9407)
gjswalling Jun 16, 2024
79bca29
Import capnproto and rr specs (#9405)
hbeberman Jun 17, 2024
5463f3a
kata-containers(-cc): enable sandbox_cgroup_only to support cgroupv2 …
miz060 Jun 17, 2024
7d8b2b2
Fix ordering issues with new preview repo handling in derivative buil…
dmcilvaney Jun 17, 2024
2df8b96
[3.0] Fix and upgrade nvidia-container-toolkit and libnvidia-containe…
henryli001 Jun 18, 2024
c025a0c
glibc - Address CVE-2023-4911, CVE-2023-5156, CVE-2023-6246, CVE-2023…
nicogbg Jun 18, 2024
5a20c8e
python-jsonschema: revert upgrade (#9427)
amritakohli Jun 18, 2024
a6d8189
Remove locales from core images, add documentation on restoring local…
dmcilvaney Jun 19, 2024
f32fdc4
Patch bash to load startup files when invoked with '-bash' (#9425)
dmcilvaney Jun 19, 2024
2af92d3
3.0-dev - telegraf upgrade to 1.31.0 to address CVE-2024-27304, CVE-2…
nicogbg Jun 19, 2024
df2f8f4
add script to update toolchain and package manifest (#9345)
neha170 Jun 19, 2024
68f6278
coreutils - add patch to fix uname (#9420)
anphel31 Jun 19, 2024
38bbb2f
Image Customizer: Minor doc updates. (#9449)
cwize1 Jun 19, 2024
137d105
3.0-dev - influxdb fix CVE-2021-4238 (#9452)
nicogbg Jun 19, 2024
690b2cb
Move cri-o to Extended (#9451)
christopherco Jun 19, 2024
90f521f
Add patch to add msflint kernel driver 4.28 as module (#9380)
jcamposeco Jun 20, 2024
70b1a20
Package argparse-manpage naming convention consistency (#9419)
AZaugg Jun 21, 2024
d5c2a09
crash: add crash-target-arm64 binary (#9442)
anphel31 Jun 21, 2024
b9a0a26
azurelinux-release: bump to 3.0-15 for June preview update 2 (#9462)
anphel31 Jun 21, 2024
e9ab586
[3.0] mariadb: patch CVE-2024-0901 (#9466)
neha170 Jun 21, 2024
f5aee66
[3.0] bluez: patch CVE-2023-50229 and CVE-2023-50230 (#9467)
neha170 Jun 21, 2024
238a839
Image Customizer: Add tests for additionalFiles and additionalDirs. (…
cwize1 Jun 21, 2024
63a3aa7
gcc: update and re-enable CVE-2023-4039.patch (#9465)
anphel31 Jun 21, 2024
beca895
Merge branch '3.0-dev' into anphel/3-pull-dev-changes-jun-23
anphel31 Jun 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 . \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
augeas
ca-certificates
edk2-ovmf
iptables
kubevirt-container-disk
kubevirt-virt-launcher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions .pipelines/containerSourceData/multus/Dockerfile-Multus
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
distroless-packages-base
nodejs
nodejs-npm
prebuilt-ca-certificates
1 change: 1 addition & 0 deletions .pipelines/containerSourceData/nodejs/nodejs.pkg
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
ca-certificates
nodejs
nodejs-npm
2 changes: 1 addition & 1 deletion LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion LICENSES-AND-NOTICES/SPECS/data/licenses.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"annobin",
"ansible-freeipa",
"archivemount",
"argparse-manpage",
"arptables",
"arpwatch",
"asio",
Expand Down Expand Up @@ -99,6 +98,7 @@
"cachefilesd",
"cairomm",
"calamares",
"capnproto",
"capstone",
"catatonit",
"catch",
Expand Down Expand Up @@ -1629,6 +1629,7 @@
"python-aiohttp",
"python-alsa",
"python-argcomplete",
"python-argparse-manpage",
"python-astroid",
"python-astunparse",
"python-async-generator",
Expand Down Expand Up @@ -1854,6 +1855,7 @@
"python-winrm",
"python-wrapt",
"python-xlrd",
"python-xlsxwriter",
"python-xmltodict",
"python-yubico",
"python-zipp",
Expand Down Expand Up @@ -1903,6 +1905,7 @@
"rpm-mpi-hooks",
"rpmdevtools",
"rpmlint",
"rr",
"rtkit",
"rtl-sdr",
"ruby-augeas",
Expand Down
2 changes: 1 addition & 1 deletion SPECS-EXTENDED/buildah/buildah.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions SPECS-EXTENDED/capnproto/capnproto.signatures.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Signatures": {
"capnproto-c++-1.0.1.tar.gz": "0f7f4b8a76a2cdb284fddef20de8306450df6dd031a47a15ac95bc43c3358e09"
}
}
205 changes: 205 additions & 0 deletions SPECS-EXTENDED/capnproto/capnproto.spec
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion SPECS-EXTENDED/catatonit/catatonit.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion SPECS-EXTENDED/dyninst/dyninst.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion SPECS-EXTENDED/podman/podman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Vendor: Microsoft Corporation
Distribution: Azure Linux
%global modname argparse-manpage

%global sum() Build manual page from %* ArgumentParser object
%global desc \
Expand All @@ -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
Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions SPECS-EXTENDED/rr/rr.signatures.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Signatures": {
"rr-5.8.0.tar.gz": "8b162a3340a6ddb29170b359fe0f2e023f86a9bfea035555b74d38d9fc5e0c00"
}
}
Loading
Loading