From f8eed130d65f96675daca332b0cf91915aa9a1f4 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 29 Jun 2022 08:34:20 +0000 Subject: [PATCH] [packit] 56 upstream release Upstream tag: v56 Upstream commit: 321295e3 Signed-off-by: Packit --- .gitignore | 1 + .packit.yaml | 1 + README.packit | 2 +- osbuild-composer.spec | 217 ++++++++++++++++++++++++++++++++++++------ sources | 2 +- 5 files changed, 190 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 972c392..abc7939 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /osbuild-composer-53.tar.gz /osbuild-composer-54.tar.gz /osbuild-composer-55.tar.gz +/osbuild-composer-56.tar.gz diff --git a/.packit.yaml b/.packit.yaml index c077bb9..e3edc29 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -16,6 +16,7 @@ upstream_tag_template: v{version} srpm_build_deps: [] actions: get-current-version: bash -c "git describe --tags --abbrev=0 | sed 's|v||'" + post-upstream-clone: "./tools/rpm_spec_add_provides_bundle.sh" jobs: - job: koji_build diff --git a/README.packit b/README.packit index 547d708..d5632f7 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.52.2.dev4+g63407fe. +The file was generated using packit 0.53.1.dev6+ged586c5. diff --git a/osbuild-composer.spec b/osbuild-composer.spec index fd71351..a7b6632 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 55 +Version: 56 %gometa @@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients. } Name: osbuild-composer -Release: 2%{?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,37 +39,164 @@ 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 -BuildRequires: golang(github.com/aws/aws-sdk-go) -BuildRequires: golang(github.com/Azure/azure-sdk-for-go) -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/v4) -BuildRequires: golang(github.com/google/uuid) -BuildRequires: golang(github.com/hashicorp/go-retryablehttp) -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) +# 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 +# BUNDLE_START +Provides: bundled(golang(cloud.google.com/go)) = v0.100.2 +Provides: bundled(golang(cloud.google.com/go/cloudbuild)) = v1.2.0 +Provides: bundled(golang(cloud.google.com/go/compute)) = v1.6.1 +Provides: bundled(golang(cloud.google.com/go/iam)) = v0.3.0 +Provides: bundled(golang(cloud.google.com/go/storage)) = v1.22.0 +Provides: bundled(golang(github.com/acarl005/stripansi)) = v0.0.0_20180116102854_5a71ef0e047d +Provides: bundled(golang(github.com/aws/aws_sdk_go)) = v1.44.4 +Provides: bundled(golang(github.com/aymerick/douceur)) = v0.2.0 +Provides: bundled(golang(github.com/Azure/azure_pipeline_go)) = v0.2.3 +Provides: bundled(golang(github.com/Azure/azure_sdk_for_go)) = v63.4.0+incompatible +Provides: bundled(golang(github.com/Azure/azure_storage_blob_go)) = v0.13.0 +Provides: bundled(golang(github.com/Azure/go_autorest)) = v14.2.0+incompatible +Provides: bundled(golang(github.com/Azure/go_autorest/autorest)) = v0.11.27 +Provides: bundled(golang(github.com/Azure/go_autorest/autorest/adal)) = v0.9.18 +Provides: bundled(golang(github.com/Azure/go_autorest/autorest/azure/auth)) = v0.5.11 +Provides: bundled(golang(github.com/Azure/go_autorest/autorest/azure/cli)) = v0.4.5 +Provides: bundled(golang(github.com/Azure/go_autorest/autorest/date)) = v0.3.0 +Provides: bundled(golang(github.com/Azure/go_autorest/autorest/to)) = v0.4.0 +Provides: bundled(golang(github.com/Azure/go_autorest/autorest/validation)) = v0.3.1 +Provides: bundled(golang(github.com/Azure/go_autorest/logger)) = v0.2.1 +Provides: bundled(golang(github.com/Azure/go_autorest/tracing)) = v0.6.0 +Provides: bundled(golang(github.com/beorn7/perks)) = v1.0.1 +Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.1.0 +Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = v4.1.3 +Provides: bundled(golang(github.com/cespare/xxhash/v2)) = v2.1.2 +Provides: bundled(golang(github.com/containers/common)) = v0.48.0 +Provides: bundled(golang(github.com/containers/image/v5)) = v5.21.1 +Provides: bundled(golang(github.com/containers/libtrust)) = v0.0.0_20200511145503_9c3a6c22cd9a +Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.4_0.20220428134531_566b808bdf6f +Provides: bundled(golang(github.com/containers/storage)) = v1.40.0 +Provides: bundled(golang(github.com/coreos/go_semver)) = v0.3.0 +Provides: bundled(golang(github.com/coreos/go_systemd)) = v0.0.0_20190719114852_fd7a80b32e1f +Provides: bundled(golang(github.com/davecgh/go_spew)) = v1.1.1 +Provides: bundled(golang(github.com/deepmap/oapi_codegen)) = v1.8.2 +Provides: bundled(golang(github.com/dimchansky/utfbom)) = v1.1.1 +Provides: bundled(golang(github.com/docker/distribution)) = v2.8.1+incompatible +Provides: bundled(golang(github.com/docker/docker)) = v20.10.14+incompatible +Provides: bundled(golang(github.com/docker/docker_credential_helpers)) = v0.6.4 +Provides: bundled(golang(github.com/docker/go_connections)) = v0.4.0 +Provides: bundled(golang(github.com/docker/go_metrics)) = v0.0.1 +Provides: bundled(golang(github.com/docker/go_units)) = v0.4.0 +Provides: bundled(golang(github.com/dougm/pretty)) = v0.0.0_20171025230240_2ee9d7453c02 +Provides: bundled(golang(github.com/getkin/kin_openapi)) = v0.93.0 +Provides: bundled(golang(github.com/ghodss/yaml)) = v1.0.0 +Provides: bundled(golang(github.com/go_openapi/jsonpointer)) = v0.19.5 +Provides: bundled(golang(github.com/go_openapi/swag)) = v0.21.1 +Provides: bundled(golang(github.com/gobwas/glob)) = v0.2.3 +Provides: bundled(golang(github.com/golang_jwt/jwt)) = v3.2.2+incompatible +Provides: bundled(golang(github.com/golang_jwt/jwt/v4)) = v4.4.1 +Provides: bundled(golang(github.com/golang/glog)) = v1.0.0 +Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0_20210331224755_41bb18bfe9da +Provides: bundled(golang(github.com/golang/protobuf)) = v1.5.2 +Provides: bundled(golang(github.com/google/go_cmp)) = v0.5.8 +Provides: bundled(golang(github.com/google/uuid)) = v1.3.0 +Provides: bundled(golang(github.com/googleapis/gax_go/v2)) = v2.3.0 +Provides: bundled(golang(github.com/googleapis/go_type_adapters)) = v1.0.0 +Provides: bundled(golang(github.com/gophercloud/gophercloud)) = v0.24.0 +Provides: bundled(golang(github.com/gorilla/css)) = v1.0.0 +Provides: bundled(golang(github.com/gorilla/mux)) = v1.8.0 +Provides: bundled(golang(github.com/hashicorp/errwrap)) = v1.1.0 +Provides: bundled(golang(github.com/hashicorp/go_cleanhttp)) = v0.5.1 +Provides: bundled(golang(github.com/hashicorp/go_multierror)) = v1.1.1 +Provides: bundled(golang(github.com/hashicorp/go_retryablehttp)) = v0.7.1 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = v1.0.0 +Provides: bundled(golang(github.com/jackc/chunkreader/v2)) = v2.0.1 +Provides: bundled(golang(github.com/jackc/pgconn)) = v1.12.0 +Provides: bundled(golang(github.com/jackc/pgio)) = v1.0.0 +Provides: bundled(golang(github.com/jackc/pgpassfile)) = v1.0.0 +Provides: bundled(golang(github.com/jackc/pgproto3/v2)) = v2.3.0 +Provides: bundled(golang(github.com/jackc/pgservicefile)) = v0.0.0_20200714003250_2b9c44734f2b +Provides: bundled(golang(github.com/jackc/pgtype)) = v1.11.0 +Provides: bundled(golang(github.com/jackc/pgx/v4)) = v4.16.0 +Provides: bundled(golang(github.com/jackc/puddle)) = v1.2.1 +Provides: bundled(golang(github.com/jmespath/go_jmespath)) = v0.4.0 +Provides: bundled(golang(github.com/josharian/intern)) = v1.0.0 +Provides: bundled(golang(github.com/json_iterator/go)) = v1.1.12 +Provides: bundled(golang(github.com/julienschmidt/httprouter)) = v1.3.0 +Provides: bundled(golang(github.com/klauspost/compress)) = v1.15.2 +Provides: bundled(golang(github.com/klauspost/pgzip)) = v1.2.5 +Provides: bundled(golang(github.com/kolo/xmlrpc)) = v0.0.0_20201022064351_38db28db192b +Provides: bundled(golang(github.com/kr/text)) = v0.2.0 +Provides: bundled(golang(github.com/labstack/echo/v4)) = v4.7.2 +Provides: bundled(golang(github.com/labstack/gommon)) = v0.3.1 +Provides: bundled(golang(github.com/mailru/easyjson)) = v0.7.6 +Provides: bundled(golang(github.com/mattn/go_colorable)) = v0.1.11 +Provides: bundled(golang(github.com/mattn/go_ieproxy)) = v0.0.1 +Provides: bundled(golang(github.com/mattn/go_isatty)) = v0.0.14 +Provides: bundled(golang(github.com/mattn/go_runewidth)) = v0.0.13 +Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = v1.0.2_0.20181231171920_c182affec369 +Provides: bundled(golang(github.com/microcosm_cc/bluemonday)) = v1.0.18 +Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.5.2 +Provides: bundled(golang(github.com/miekg/pkcs11)) = v1.1.1 +Provides: bundled(golang(github.com/mitchellh/go_homedir)) = v1.1.0 +Provides: bundled(golang(github.com/moby/sys/mountinfo)) = v0.6.1 +Provides: bundled(golang(github.com/modern_go/concurrent)) = v0.0.0_20180306012644_bacd9c7ef1dd +Provides: bundled(golang(github.com/modern_go/reflect2)) = v1.0.2 +Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0 +Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.0.3_0.20211202193544_a5463b7f9c84 +Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.1 +Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.0.3_0.20210326190908_1c3f411f0417 +Provides: bundled(golang(github.com/openshift_online/ocm_sdk_go)) = v0.1.266 +Provides: bundled(golang(github.com/oracle/oci_go_sdk/v54)) = v54.0.0 +Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1 +Provides: bundled(golang(github.com/pmezard/go_difflib)) = v1.0.0 +Provides: bundled(golang(github.com/proglottis/gpgme)) = v0.1.1 +Provides: bundled(golang(github.com/prometheus/client_golang)) = v1.12.1 +Provides: bundled(golang(github.com/prometheus/client_model)) = v0.2.0 +Provides: bundled(golang(github.com/prometheus/common)) = v0.32.1 +Provides: bundled(golang(github.com/prometheus/procfs)) = v0.7.3 +Provides: bundled(golang(github.com/rivo/uniseg)) = v0.2.0 +Provides: bundled(golang(github.com/segmentio/ksuid)) = v1.0.4 +Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1 +Provides: bundled(golang(github.com/sony/gobreaker)) = v0.4.2_0.20210216022020_dd874f9dd33b +Provides: bundled(golang(github.com/spf13/cobra)) = v1.4.0 +Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5 +Provides: bundled(golang(github.com/stefanberger/go_pkcs11uri)) = v0.0.0_20201008174630_78d3cae3a980 +Provides: bundled(golang(github.com/stretchr/testify)) = v1.7.1 +Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635 +Provides: bundled(golang(github.com/ubccr/kerby)) = v0.0.0_20170626144437_201a958fc453 +Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.10 +Provides: bundled(golang(github.com/valyala/bytebufferpool)) = v1.0.0 +Provides: bundled(golang(github.com/valyala/fasttemplate)) = v1.2.1 +Provides: bundled(golang(github.com/vbatts/tar_split)) = v0.11.2 +Provides: bundled(golang(github.com/vbauerster/mpb/v7)) = v7.4.1 +Provides: bundled(golang(github.com/VividCortex/ewma)) = v1.2.0 +Provides: bundled(golang(github.com/vmware/govmomi)) = v0.28.0 +Provides: bundled(golang(go.etcd.io/bbolt)) = v1.3.6 +Provides: bundled(golang(go.mozilla.org/pkcs7)) = v0.0.0_20200128120323_432b2356ecb1 +Provides: bundled(golang(go.opencensus.io)) = v0.23.0 +Provides: bundled(golang(golang.org/x/crypto)) = v0.0.0_20220427172511_eb4f295cb31f +Provides: bundled(golang(golang.org/x/mod)) = v0.6.0_dev.0.20220106191415_9b9b3d81d5e3 +Provides: bundled(golang(golang.org/x/net)) = v0.0.0_20220425223048_2871e0cb64e4 +Provides: bundled(golang(golang.org/x/oauth2)) = v0.0.0_20220411215720_9780585627b5 +Provides: bundled(golang(golang.org/x/sync)) = v0.0.0_20210220032951_036812b2e83c +Provides: bundled(golang(golang.org/x/sys)) = v0.0.0_20220422013727_9388b58f7150 +Provides: bundled(golang(golang.org/x/term)) = v0.0.0_20210927222741_03fcf44c2211 +Provides: bundled(golang(golang.org/x/text)) = v0.3.7 +Provides: bundled(golang(golang.org/x/time)) = v0.0.0_20210723032227_1f47c861a9ac +Provides: bundled(golang(golang.org/x/tools)) = v0.1.10 +Provides: bundled(golang(golang.org/x/xerrors)) = v0.0.0_20220411194840_2f41105eb62f +Provides: bundled(golang(google.golang.org/api)) = v0.75.0 +Provides: bundled(golang(google.golang.org/appengine)) = v1.6.7 +Provides: bundled(golang(google.golang.org/genproto)) = v0.0.0_20220421151946_72621c1f0bd3 +Provides: bundled(golang(google.golang.org/grpc)) = v1.45.0 +Provides: bundled(golang(google.golang.org/protobuf)) = v1.28.0 +Provides: bundled(golang(gopkg.in/ini.v1)) = v1.66.4 +Provides: bundled(golang(gopkg.in/square/go_jose.v2)) = v2.5.1 +Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.4.0 +Provides: bundled(golang(gopkg.in/yaml.v3)) = v3.0.0_20210107192922_496545a6307b +# BUNDLE_END %endif Requires: %{name}-core = %{version}-%{release} @@ -99,7 +226,7 @@ Obsoletes: osbuild-composer-koji <= 23 %if 0%{?rhel} %forgeautosetup -p1 %else -%goprep +%goprep -k %endif %build @@ -447,6 +574,34 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Jun 29 2022 Packit - 56-1 +Changes with 56 +---------------- + * CI: new test for checking if any manifests changed in a PR (#2749) + * Consolidate Koji target options values meaning (#2758) + * Fedora - Use vendor instead of rpm dependencies (#2762) + * Remove vhd image type from RHEL 7 (#2768) + * Support the insecure option in curl sources (#2752) + * Switch to latest RHEL versions for testing (#2678) + * [rhel7] add initial support (qcow2, vhd, azure-rhui) (#2705) + * build(deps): bump github.com/aws/aws-sdk-go from 1.44.4 to 1.44.43 (#2777) + * cloudapi: get specific error from openapi (#2666) + * cmd/osbuild-upload-gcp: fix typo in skip-import's help string (#2761) + * dnf-json: fix depsolve error handling (#2775) + * dnfjson: Load subscriptions when creating a new solver (#2751) + * docker-compose: fix osbuild-worker unable load libcrypt.so.1 (#2745) + * manifests: regenerate RHEL-8.6 qcow2 test cases (#2781) + * pipelines: introduce declarative pipeline abstractions (#2773) + * rpmbuild: add fedora-36 (#2770) + * upload: initial draft for container upload (#2462) + * worker: clean up the config and add tests (#2779) + +Contributions from: Achilleas Koutsou, Alexander Todorov, Chloe Kaubisch, Christian Kellner, Jakub Rusz, Juan Abia, Ondřej Budai, Sanne Raymaekers, Tom Gundersen, Tomas Hozza, Ygal Blum, dependabot[bot], zwtop + +— Somewhere on the Internet, 2022-06-29 + + + * Sat Jun 18 2022 Robert-André Mauchin - 55-2 - Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 diff --git a/sources b/sources index 53c71ec..49a92f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-55.tar.gz) = 56a3118f1e85830673892452f6d01d36b2c84ae6fc50cf7e4b8cae986a92380c396081be1912925f2a152f5c621ec762daf96fc14a8a59eebcd3f51329a71a6d +SHA512 (osbuild-composer-56.tar.gz) = 082f95ddffb7c39827bf4595bbf630cd99188dc5c9fbbde39131cc4f90bd70c0668d92a9a994db3ea35aae176d33bc642606deef6e562f305f2d853d7650b17e