.gitignore

@@ -1 +1 @@
-SOURCES/osbuild-composer-62.tar.gz
+SOURCES/osbuild-composer-46.2.tar.gz

.osbuild-composer.metadata

@@ -1 +1 @@
-507b6d1c7dd00aafb3fc3988d7a1f61be10a0c03 SOURCES/osbuild-composer-62.tar.gz
+8de7694122681f90a071ce5526bb83753691cf1f SOURCES/osbuild-composer-46.2.tar.gz

SPECS/osbuild-composer.spec

@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        62
+Version:        46.2
 
 %gometa
 
@@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients.
 }
 
 Name:           osbuild-composer
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        An image building service based on osbuild
 
 # osbuild-composer doesn't have support for building i686 and armv7hl images
@@ -39,15 +39,36 @@ BuildRequires:  systemd
 BuildRequires:  krb5-devel
 BuildRequires:  python3-docutils
 BuildRequires:  make
-# Build requirements of 'theproglottis/gpgme' package
-BuildRequires:  gpgme-devel
-BuildRequires:  libassuan-devel
 %if 0%{?fedora}
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  git
-# DO NOT REMOVE the BUNDLE_START and BUNDLE_END markers as they are used by 'tools/rpm_spec_add_provides_bundle.sh' to generate the Provides: bundled list
+BuildRequires:  golang(github.com/aws/aws-sdk-go)
-# BUNDLE_START
+BuildRequires:  golang(github.com/Azure/azure-sdk-for-go)
-# BUNDLE_END
+BuildRequires:  golang(github.com/Azure/azure-storage-blob-go/azblob)
+BuildRequires:  golang(github.com/BurntSushi/toml)
+BuildRequires:  golang(github.com/coreos/go-semver/semver)
+BuildRequires:  golang(github.com/coreos/go-systemd/activation)
+BuildRequires:  golang(github.com/deepmap/oapi-codegen/pkg/codegen)
+BuildRequires:  golang(github.com/go-chi/chi)
+BuildRequires:  golang(github.com/golang-jwt/jwt)
+BuildRequires:  golang(github.com/google/uuid)
+BuildRequires:  golang(github.com/jackc/pgx/v4)
+BuildRequires:  golang(github.com/julienschmidt/httprouter)
+BuildRequires:  golang(github.com/getkin/kin-openapi/openapi3)
+BuildRequires:  golang(github.com/kolo/xmlrpc)
+BuildRequires:  golang(github.com/labstack/echo/v4)
+BuildRequires:  golang(github.com/gobwas/glob)
+BuildRequires:  golang(github.com/google/go-cmp/cmp)
+BuildRequires:  golang(github.com/gophercloud/gophercloud)
+BuildRequires:  golang(github.com/prometheus/client_golang/prometheus/promhttp)
+BuildRequires:  golang(github.com/openshift-online/ocm-sdk-go)
+BuildRequires:  golang(github.com/segmentio/ksuid)
+BuildRequires:  golang(github.com/stretchr/testify/assert)
+BuildRequires:  golang(github.com/ubccr/kerby)
+BuildRequires:  golang(github.com/vmware/govmomi)
+BuildRequires:  golang(github.com/oracle/oci-go-sdk/v54)
+BuildRequires:  golang(cloud.google.com/go)
+BuildRequires:  golang(gopkg.in/ini.v1)
 %endif
 
 Requires: %{name}-core = %{version}-%{release}
@@ -67,6 +88,9 @@ Conflicts: lorax-composer
 Obsoletes: lorax-composer < 34.3
 %endif
 
+# remove when F34 is EOL
+Obsoletes: osbuild-composer-koji <= 23
+
 %description
 %{common_description}
 
@@ -74,7 +98,7 @@ Obsoletes: lorax-composer < 34.3
 %if 0%{?rhel}
 %forgeautosetup -p1
 %else
-%goprep -k
+%goprep
 %endif
 
 %build
@@ -126,7 +150,7 @@ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tes
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-koji-tests %{goipath}/cmd/osbuild-koji-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-dbjobqueue-tests %{goipath}/cmd/osbuild-composer-dbjobqueue-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-manifest-tests %{goipath}/cmd/osbuild-composer-manifest-tests
-go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-service-maintenance-tests %{goipath}/cmd/osbuild-service-maintenance
+go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/cloud-cleaner %{goipath}/cmd/cloud-cleaner
 go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
 
 %endif
@@ -192,7 +216,7 @@ install -m 0755 -vp _bin/osbuild-auth-tests                        %{buildroot}%
 install -m 0755 -vp _bin/osbuild-koji-tests                        %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/osbuild-composer-dbjobqueue-tests         %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/osbuild-composer-manifest-tests           %{buildroot}%{_libexecdir}/osbuild-composer-test/
-install -m 0755 -vp _bin/osbuild-service-maintenance-tests         %{buildroot}%{_libexecdir}/osbuild-composer-test/
+install -m 0755 -vp _bin/cloud-cleaner                             %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/osbuild-mock-openid-provider              %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/define-compose-url.sh                    %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/provision.sh                             %{buildroot}%{_libexecdir}/osbuild-composer-test/
@@ -201,21 +225,12 @@ install -m 0755 -vp tools/gen-ssh.sh                               %{buildroot}%
 install -m 0755 -vp tools/image-info                               %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/run-koji-container.sh                    %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/koji-compose.py                          %{buildroot}%{_libexecdir}/osbuild-composer-test/
+install -m 0755 -vp tools/koji-compose-v2.py                       %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/libvirt_test.sh                          %{buildroot}%{_libexecdir}/osbuild-composer-test/
-install -m 0755 -vp tools/s3_test.sh                               %{buildroot}%{_libexecdir}/osbuild-composer-test/
-install -m 0755 -vp tools/generic_s3_test.sh                       %{buildroot}%{_libexecdir}/osbuild-composer-test/
-install -m 0755 -vp tools/generic_s3_https_test.sh                 %{buildroot}%{_libexecdir}/osbuild-composer-test/
-install -m 0755 -vp tools/run-mock-auth-servers.sh                 %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/set-env-variables.sh                     %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/test-case-generators/generate-test-cases %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vd                                                %{buildroot}%{_libexecdir}/tests/osbuild-composer
-install -m 0755 -vp test/cases/*.sh                                %{buildroot}%{_libexecdir}/tests/osbuild-composer/
+install -m 0755 -vp test/cases/*                                   %{buildroot}%{_libexecdir}/tests/osbuild-composer/
-
-install -m 0755 -vd                                                %{buildroot}%{_libexecdir}/tests/osbuild-composer/api
-install -m 0755 -vp test/cases/api/*.sh                            %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/
-
-install -m 0755 -vd                                                %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common
-install -m 0755 -vp test/cases/api/common/*.sh                     %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common/
 
 install -m 0755 -vd                                                %{buildroot}%{_datadir}/tests/osbuild-composer/ansible
 install -m 0644 -vp test/data/ansible/*                            %{buildroot}%{_datadir}/tests/osbuild-composer/ansible/
@@ -255,7 +270,7 @@ install -m 0755 -vd                                                %{buildroot}%
 install -m 0644 -vp test/data/openshift/*                          %{buildroot}%{_datadir}/tests/osbuild-composer/openshift/
 
 install -m 0755 -vd                                                %{buildroot}%{_datadir}/tests/osbuild-composer/schemas
-install -m 0644 -vp pkg/jobqueue/dbjobqueue/schemas/*              %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/
+install -m 0644 -vp internal/jobqueue/dbjobqueue/schemas/*         %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/
 
 install -m 0755 -vd                                               %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9
 install -m 0644 -vp test/data/upgrade8to9/*                       %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9/
@@ -309,12 +324,16 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
 Summary:    The worker for osbuild-composer
 Requires:   systemd
 Requires:   qemu-img
-Requires:   osbuild >= 63
+Requires:   osbuild >= 49
-Requires:   osbuild-ostree >= 63
+Requires:   osbuild-ostree >= 49
-Requires:   osbuild-lvm2 >= 63
+Requires:   osbuild-lvm2 >= 49
-Requires:   osbuild-luks2 >= 63
+Requires:   osbuild-luks2 >= 49
 Requires:   %{name}-dnf-json = %{version}-%{release}
 
+# remove in F34
+Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
+Provides:  golang-github-osbuild-composer-worker = %{version}-%{release}
+
 %description worker
 The worker for osbuild-composer
 
@@ -352,12 +371,8 @@ The dnf-json binary used by osbuild-composer and the workers.
 
 %files dnf-json
 %{_libexecdir}/osbuild-composer/dnf-json
-
+%{_unitdir}/osbuild-dnf-json.service
-%post dnf-json
+%{_unitdir}/osbuild-dnf-json.socket
-# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root
-if [ -e /var/cache/osbuild-composer/rpmmd ]; then
-    chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd
-fi
 
 %if %{with tests} || 0%{?rhel}
 
@@ -403,11 +418,12 @@ Requires:   httpd
 Requires:   mod_ssl
 Requires:   openssl
 Requires:   firewalld
+# see https://bugzilla.redhat.com/show_bug.cgi?id=1986333
+%if 0%{?rhel} && 0%{?rhel} != 9
 Requires:   podman-plugins
+%endif
 Requires:   dnf-plugins-core
 Requires:   skopeo
-Requires:   make
-Requires:   python3-pip
 %if 0%{?fedora}
 # koji and ansible are not in RHEL repositories. Depending on them breaks RHEL
 # gating (see OSCI-1541). The test script must enable EPEL and install those
@@ -430,108 +446,136 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
-* Tue Oct 25 2022 Tomáš Hozza <thozza@redhat.com> - 62-3
+* Sat Apr 02 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46.2-1
-- Fix ownership of the dnf-json rpmmd files on upgrade (#2136532)
-
-* Fri Oct 21 2022 Tomáš Hozza <thozza@redhat.com> - 62-2
-- Fix ownership of the dnf-json rpmmd files on upgrade (#2136532)
-
-* Mon Aug 29 2022 Ondřej Budai <ondrej@budai.cz> - 62-1
 - New upstream release
 
-* Wed Aug 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
+* Mon Feb 28 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46-1
 - New upstream release
 
-* Thu Aug 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
+* Fri Feb 18 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
 - New upstream release
 
-* Thu Jul 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
+* Fri Feb 11 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
 - New upstream release
 
-* Mon Jul 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
+* Wed Jan 26 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
 - New upstream release
 
-* Wed Jun 15 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 55-1
+* Wed Jan 12 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
 - New upstream release
 
-* Wed Jun 01 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
+* Wed Dec 22 2021 Ondřej Budai <ondrej@budai.cz> - 41-1
-- New upstream release
-
-* Mon May 23 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
-- New upstream release
-
-* Wed May 04 2022 Ondřej Budai <ondrej@budai.cz> - 51-1
-- New upstream release
-
-* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
-- New upstream release
-
-* Sat Feb 19 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
-- New upstream release
-
-* Mon Feb 14 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
-- New upstream release
-
-* Mon Feb 07 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
-- New upstream release
-
-* Tue Jan 18 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
 - New upstream release
 
 * Thu Dec 09 2021 Ondřej Budai <ondrej@budai.cz> - 40-1
 - New upstream release
 
-* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 37-1
+* Wed Nov 24 2021 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 39-1
 - New upstream release
 
-* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
+* Fri Nov 12 2021 'Diaa Sami' <'<disami@redhat.com>'> - 38-1
+- New upstream release
+
+* Tue Nov 02 2021 lavocatt - 37-1
+- New upstream release
+
+* Thu Oct 14 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
 - New upstream release
 
 * Mon Aug 30 2021 Tom Gundersen <teg@jklm.no> - 33-1
 - New upstream release
 
-* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-2
+* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-1
 - New upstream release
 
-* Thu Aug 12 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
+* Sun Aug 15 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
+- New upstream release
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 30-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Jul 02 2021 Ondřej Budai <ondrej@budai.cz> - 30-1
+- New upstream release
+
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 29-3
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 29-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Fri Mar 05 2021 Martin Sehnoutka <msehnout@redhat.com> - 29-1
 - New upstream release
 
 * Sat Feb 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 28-1
 - New upstream release
 
-* Fri Feb 05 2021 Ondrej Budai <obudai@redhat.com> - 27-1
+* Thu Feb 04 2021 Ondrej Budai <obudai@redhat.com> - 27-1
 - New upstream release
 
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-2
+- Fix the compatibility with a new golang-github-azure-storage-blob 0.12
+
 * Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-1
 - New upstream release
 
-* Mon Nov 30 2020 Ondrej Budai <obudai@redhat.com> - 25-1
+* Thu Nov 19 2020 Ondrej Budai <obudai@redhat.com> - 25-1
-- New upstream release 25 (rhbz#1883481)
+- New upstream release
 
-* Thu Sep 03 2020 Tom Gundersen <tgunders@redhat.com> - 20.1-1
+* Thu Nov 12 2020 Ondrej Budai <obudai@redhat.com> - 24-1
-- New upstream release 20.1 (rhbz#1872370)
+- New upstream release
 
-* Sun Aug 23 2020 Tom Gundersen <tgunders@redhat.com> - 20-1
+* Fri Nov 06 2020 Ondrej Budai <obudai@redhat.com> - 23-1
-- New upstream release 20 (rhbz#1871184 and rhbz#1871179)
+- New upstream release
 
-* Thu Aug 13 2020 Tom Gundersen <tgunders@redhat.com> - 19-1
+* Fri Oct 16 2020 Ondrej Budai <obudai@redhat.com> - 22-1
-- New upstream release 19 (rhbz#1866015 and rhbz#1866013)
+- New upstream release
 
-* Thu Jul 09 2020 Ondrej Budai <obudai@redhat.com> - 17-1
+* Sun Aug 23 2020 Tom Gundersen <teg@jklm.no> - 20-1
-- New upstream release 17 (rhbz#1831653)
+- New upstream release
-- Obsolete lorax-composer in favor of osbuild-composer (rhbz#1836844)
+
+* Tue Aug 11 2020 Tom Gundersen <teg@jklm.no> - 19-1
+- New upstream release
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 22 2020 Ondrej Budai <obudai@redhat.com> - 18-1
+- New upstream release
+
+* Wed Jul 08 2020 Ondrej Budai <obudai@redhat.com> - 17-1
+- New upstream release
 
 * Mon Jun 29 2020 Ondrej Budai <obudai@redhat.com> - 16-1
-- New upstream release 16 (rhbz#1831653)
+- New upstream release
 
 * Fri Jun 12 2020 Ondrej Budai <obudai@redhat.com> - 15-1
-- New upstream release 15 (rhbz#1831653)
+- New upstream release
 
 * Thu Jun 04 2020 Ondrej Budai <obudai@redhat.com> - 14-1
-- New upstream release 14 (rhbz#1831653)
+- New upstream release
+
+* Fri May 29 2020 Ondrej Budai <obudai@redhat.com> - 13-2
+- Add missing osbuild-ostree dependency
 
 * Thu May 28 2020 Ondrej Budai <obudai@redhat.com> - 13-1
-- New upstream release 13 (rhbz#1831653)
+- New upstream release
 
-* Tue May 05 2020 Ondrej Budai <obudai@redhat.com> - 11-1
+* Thu May 14 2020 Ondrej Budai <obudai@redhat.com> - 12-1
-- Initial package (renamed from golang-github-osbuild-composer) (rhbz#1771887)
+- New upstream release
+
+* Wed Apr 29 2020 Ondrej Budai <obudai@redhat.com> - 11-1
+- New upstream release
+
+* Wed Apr 15 2020 Ondrej Budai <obudai@redhat.com> - 10-1
+- New upstream release
+
+* Wed Apr 01 2020 Ondrej Budai <obudai@redhat.com> - 9-1
+- New upstream release
+
+* Mon Mar 23 2020 Ondrej Budai <obudai@redhat.com> - 8-1
+- Initial package (renamed from golang-github-osbuild-composer)