From 8b7b66dc5a14d38980aa43cda9f439201d14c010 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 13 Nov 2024 16:15:32 +0300 Subject: [PATCH] import osbuild-composer-118-2.el9_5 --- .gitignore | 2 +- .osbuild-composer.metadata | 2 +- SPECS/osbuild-composer.spec | 89 +++++++++++++++++++++++++++++++------ 3 files changed, 78 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 40e73ed..4424966 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-101.tar.gz +SOURCES/osbuild-composer-118.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 7f36b97..f3abeaa 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -0feb86b5dcd146ce5b87816ae482eb50ed507c16 SOURCES/osbuild-composer-101.tar.gz +be808e5f869ae48145daef50ed6ed82b91359b48 SOURCES/osbuild-composer-118.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 61d1806..468c820 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -8,11 +8,11 @@ %bcond_with relax_requires # The minimum required osbuild version -%global min_osbuild_version 109 +%global min_osbuild_version 120 %global goipath github.com/osbuild/osbuild-composer -Version: 101 +Version: 118 %gometa @@ -106,6 +106,7 @@ export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/comm %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker +%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker-executor %{goipath}/cmd/osbuild-worker-executor %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-manager %{goipath}/cmd/osbuild-jobsite-manager %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-builder %{goipath}/cmd/osbuild-jobsite-builder @@ -126,6 +127,10 @@ export GOPATH=%{gobuilddir}:%{gopath} TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')" +%if 0%{?rhel} +GOTAGS="${GOTAGS:+$GOTAGS,}rhel%{rhel}" +%endif + go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/ @@ -142,32 +147,52 @@ go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _b install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/ +install -m 0755 -vp _bin/osbuild-worker-executor %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vp _bin/osbuild-jobsite-manager %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%{_libexecdir}/osbuild-composer/ # Only include repositories for the distribution and release install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories + # CentOS also defines rhel so we check for centos first %if 0%{?centos} -# CentOS 9 supports building for CentOS 8 and later -%if 0%{?centos} >= 9 +# Latest CentOS supports building all CentOS versions +%if 0%{?centos} >= 10 install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ + %else -# CentOS 8 only supports building for CentOS 8 +# All other CentOS versions support building for the same version install -m 0644 -vp repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ - %endif + %else + %if 0%{?rhel} -# RHEL 9 supports building for RHEL 8 and later -%if 0%{?rhel} >= 9 -install -m 0644 -vp repositories/rhel-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +# RHEL 10 supports building all RHEL versions +%if 0%{?rhel} >= 10 +for REPO_FILE in $(ls repositories/rhel-* | grep -v 'no-aux-key'); do + install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) +done + +# RHEL-8 auxiliary key is signed using SHA-1, which is not enabled by default on RHEL-10 and later +for REPO_FILE in $(ls repositories/rhel-8*-no-aux-key.json); do + install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE} | sed 's/-no-aux-key//g') +done %else -# RHEL 8 only supports building for 8 -install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +# All other RHEL versions support building for the same version +for REPO_FILE in $(ls repositories/rhel-%{rhel}* | grep -v 'no-aux-key'); do + install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) +done + +# RHEL 9 supports building also for RHEL 8 +%if 0%{?rhel} == 9 +for REPO_FILE in $(ls repositories/rhel-8* | grep -v 'no-aux-key'); do + install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) +done +%endif %endif %endif @@ -328,6 +353,7 @@ The worker for osbuild-composer %files worker %{_libexecdir}/osbuild-composer/osbuild-worker +%{_libexecdir}/osbuild-composer/osbuild-worker-executor %{_libexecdir}/osbuild-composer/osbuild-jobsite-manager %{_libexecdir}/osbuild-composer/osbuild-jobsite-builder %{_unitdir}/osbuild-worker@.service @@ -395,7 +421,11 @@ Requires: httpd Requires: mod_ssl Requires: openssl Requires: firewalld +# podman-plugins has been deprecated since podman version 5.0.0, +# which is in Fedora 40+ and in c10s / el10 +%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 40) Requires: podman-plugins +%endif Requires: dnf-plugins-core Requires: skopeo Requires: make @@ -422,10 +452,43 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Wed Sep 25 2024 Tomáš Hozza - 101-2 +* Wed Sep 25 2024 Tomáš Hozza - 118-2 - Rebuilt to fix: - CVE-2024-34156 - - RHEL-57945 + - RHEL-57947 + +* Fri Aug 23 2024 imagebuilder-bot - 118-1 +- New upstream release + +* Wed Aug 21 2024 imagebuilder-bot - 117-1 +- New upstream release + +* Thu Aug 15 2024 imagebuilder-bot - 116-1 +- New upstream release + +* Wed Aug 07 2024 imagebuilder-bot - 115-1 +- New upstream release + +* Wed Jul 24 2024 imagebuilder-bot - 114-1 +- New upstream release + +* Fri Jul 12 2024 imagebuilder-bot - 113-1 +- New upstream release + +* Wed Jun 12 2024 imagebuilder-bot - 110-1 +- New upstream release + +* Tue Jun 04 2024 imagebuilder-bot - 109-1 +- New upstream release + +* Fri May 17 2024 imagebuilder-bot - 108-1 +- New upstream release + +* Wed Apr 03 2024 imagebuilder-bot - 104-1 +- New upstream release + +* Wed Mar 06 2024 imagebuilder-bot - 102-1 +- New upstream release * Mon Feb 26 2024 imagebuilder-bot - 101-1 - New upstream release