diff --git a/.gitignore b/.gitignore index 825622b..76ce864 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ /osbuild-composer-91.tar.gz /osbuild-composer-92.tar.gz /osbuild-composer-88.2.tar.gz +/osbuild-composer-93.tar.gz diff --git a/.packit.yaml b/.packit.yaml index a32a1db..02e3d82 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,7 +2,7 @@ specfile_path: osbuild-composer.spec -synced_files: +files_to_sync: - osbuild-composer.spec - .packit.yaml @@ -15,6 +15,9 @@ actions: get-current-version: bash -c "git describe --tags --abbrev=0 | sed 's|v||'" post-upstream-clone: "./tools/rpm_spec_add_provides_bundle.sh" +# Handle only releases without a "dot" (e.g. v88.2), since "dot" releases should never be released to Fedora +upstream_tag_include: 'v\d+' + jobs: - job: bodhi_update trigger: commit diff --git a/README.packit b/README.packit index 2a3acd4..5998f60 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.84.0. +The file was generated using packit 0.85.0. diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 4bed5c5..e693d9e 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 88.2 +Version: 93 %gometa @@ -47,15 +47,15 @@ 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 # BUNDLE_START -Provides: bundled(golang(cloud.google.com/go)) = 0.110.6 -Provides: bundled(golang(cloud.google.com/go/compute)) = 1.23.0 +Provides: bundled(golang(cloud.google.com/go)) = 0.110.8 +Provides: bundled(golang(cloud.google.com/go/compute)) = 1.23.1 Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3 -Provides: bundled(golang(cloud.google.com/go/iam)) = 1.1.1 -Provides: bundled(golang(cloud.google.com/go/storage)) = 1.32.0 +Provides: bundled(golang(cloud.google.com/go/iam)) = 1.1.2 +Provides: bundled(golang(cloud.google.com/go/storage)) = 1.33.0 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 68.0.0+incompatible -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azcore)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azcore)) = 1.7.0 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/internal)) = 1.3.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.1.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.2.0 Provides: bundled(golang(github.com/Azure/go-autorest)) = 14.2.0+incompatible Provides: bundled(golang(github.com/Azure/go-autorest/autorest)) = 0.11.29 Provides: bundled(golang(github.com/Azure/go-autorest/autorest/adal)) = 0.9.22 @@ -70,34 +70,35 @@ Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.3.2 Provides: bundled(golang(github.com/VividCortex/ewma)) = 1.2.0 Provides: bundled(golang(github.com/acarl005/stripansi)) = 5a71ef0 Provides: bundled(golang(github.com/asaskevich/govalidator)) = a9d515a -Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.44.329 +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.45.27 Provides: bundled(golang(github.com/aymerick/douceur)) = 0.2.0 Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.2.1 Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.2.0 -Provides: bundled(golang(github.com/containers/common)) = 0.55.3 -Provides: bundled(golang(github.com/containers/image/v5)) = 5.27.0 +Provides: bundled(golang(github.com/containers/common)) = 0.56.0 +Provides: bundled(golang(github.com/containers/image/v5)) = 5.28.0 Provides: bundled(golang(github.com/containers/libtrust)) = c1716e8 -Provides: bundled(golang(github.com/containers/ocicrypt)) = 1.1.7 -Provides: bundled(golang(github.com/containers/storage)) = 1.48.0 +Provides: bundled(golang(github.com/containers/ocicrypt)) = 1.1.8 +Provides: bundled(golang(github.com/containers/storage)) = 1.50.2 Provides: bundled(golang(github.com/coreos/go-semver)) = 0.3.1 Provides: bundled(golang(github.com/coreos/go-systemd)) = fd7a80b -Provides: bundled(golang(github.com/cyberphone/json-canonicalization)) = 504adb8 +Provides: bundled(golang(github.com/cyberphone/json-canonicalization)) = aa7fe85 Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 Provides: bundled(golang(github.com/deepmap/oapi-codegen)) = 1.8.2 Provides: bundled(golang(github.com/dimchansky/utfbom)) = 1.1.1 Provides: bundled(golang(github.com/docker/distribution)) = 2.8.2+incompatible -Provides: bundled(golang(github.com/docker/docker)) = 24.0.2+incompatible -Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = 0.7.0 +Provides: bundled(golang(github.com/docker/docker)) = 24.0.6+incompatible +Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = 0.8.0 Provides: bundled(golang(github.com/docker/go-connections)) = 0.4.0 Provides: bundled(golang(github.com/docker/go-units)) = 0.5.0 Provides: bundled(golang(github.com/dougm/pretty)) = 2ee9d74 Provides: bundled(golang(github.com/getkin/kin-openapi)) = 0.93.0 Provides: bundled(golang(github.com/ghodss/yaml)) = 1.0.0 +Provides: bundled(golang(github.com/go-jose/go-jose/v3)) = 3.0.0 Provides: bundled(golang(github.com/go-openapi/analysis)) = 0.21.4 -Provides: bundled(golang(github.com/go-openapi/errors)) = 0.20.3 -Provides: bundled(golang(github.com/go-openapi/jsonpointer)) = 0.19.5 -Provides: bundled(golang(github.com/go-openapi/jsonreference)) = 0.20.0 +Provides: bundled(golang(github.com/go-openapi/errors)) = 0.20.4 +Provides: bundled(golang(github.com/go-openapi/jsonpointer)) = 0.19.6 +Provides: bundled(golang(github.com/go-openapi/jsonreference)) = 0.20.2 Provides: bundled(golang(github.com/go-openapi/loads)) = 0.21.2 Provides: bundled(golang(github.com/go-openapi/runtime)) = 0.26.0 Provides: bundled(golang(github.com/go-openapi/spec)) = 0.20.9 @@ -110,19 +111,20 @@ Provides: bundled(golang(github.com/golang-jwt/jwt/v4)) = 4.5.0 Provides: bundled(golang(github.com/golang/glog)) = 1.1.0 Provides: bundled(golang(github.com/golang/groupcache)) = 41bb18b Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 -Provides: bundled(golang(github.com/google/go-cmp)) = 0.5.9 -Provides: bundled(golang(github.com/google/go-containerregistry)) = 0.15.2 -Provides: bundled(golang(github.com/google/s2a-go)) = 0.1.5 +Provides: bundled(golang(github.com/google/go-cmp)) = 0.6.0 +Provides: bundled(golang(github.com/google/go-containerregistry)) = 0.16.1 +Provides: bundled(golang(github.com/google/s2a-go)) = 0.1.7 Provides: bundled(golang(github.com/google/uuid)) = 1.3.1 -Provides: bundled(golang(github.com/googleapis/enterprise-certificate-proxy)) = 0.2.5 +Provides: bundled(golang(github.com/googleapis/enterprise-certificate-proxy)) = 0.3.1 Provides: bundled(golang(github.com/googleapis/gax-go/v2)) = 2.12.0 -Provides: bundled(golang(github.com/gophercloud/gophercloud)) = 1.5.0 +Provides: bundled(golang(github.com/gophercloud/gophercloud)) = 1.7.0 Provides: bundled(golang(github.com/gorilla/css)) = 1.0.0 Provides: bundled(golang(github.com/gorilla/mux)) = 1.8.0 Provides: bundled(golang(github.com/hashicorp/errwrap)) = 1.1.0 Provides: bundled(golang(github.com/hashicorp/go-cleanhttp)) = 0.5.2 Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 1.1.1 Provides: bundled(golang(github.com/hashicorp/go-retryablehttp)) = 0.7.4 +Provides: bundled(golang(github.com/hashicorp/go-version)) = 1.6.0 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 Provides: bundled(golang(github.com/jackc/chunkreader/v2)) = 2.0.1 Provides: bundled(golang(github.com/jackc/pgconn)) = 1.14.0 @@ -137,17 +139,18 @@ Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 0.4.0 Provides: bundled(golang(github.com/josharian/intern)) = 1.0.0 Provides: bundled(golang(github.com/json-iterator/go)) = 1.1.12 Provides: bundled(golang(github.com/julienschmidt/httprouter)) = 1.3.0 -Provides: bundled(golang(github.com/klauspost/compress)) = 1.16.6 +Provides: bundled(golang(github.com/klauspost/compress)) = 1.16.7 Provides: bundled(golang(github.com/klauspost/pgzip)) = 1.2.6 Provides: bundled(golang(github.com/kolo/xmlrpc)) = 38db28d Provides: bundled(golang(github.com/kr/text)) = 0.2.0 -Provides: bundled(golang(github.com/labstack/echo/v4)) = 4.11.1 +Provides: bundled(golang(github.com/labstack/echo/v4)) = 4.11.2 Provides: bundled(golang(github.com/labstack/gommon)) = 0.4.0 Provides: bundled(golang(github.com/letsencrypt/boulder)) = fdfea0d Provides: bundled(golang(github.com/mailru/easyjson)) = 0.7.7 Provides: bundled(golang(github.com/mattn/go-colorable)) = 0.1.13 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.19 -Provides: bundled(golang(github.com/mattn/go-runewidth)) = 0.0.14 +Provides: bundled(golang(github.com/mattn/go-runewidth)) = 0.0.15 +Provides: bundled(golang(github.com/mattn/go-sqlite3)) = 1.14.17 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.4 Provides: bundled(golang(github.com/microcosm-cc/bluemonday)) = 1.0.18 Provides: bundled(golang(github.com/miekg/pkcs11)) = 1.1.1 @@ -158,24 +161,26 @@ Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7 Provides: bundled(golang(github.com/modern-go/reflect2)) = 1.0.2 Provides: bundled(golang(github.com/oklog/ulid)) = 1.3.1 Provides: bundled(golang(github.com/opencontainers/go-digest)) = 1.0.0 -Provides: bundled(golang(github.com/opencontainers/image-spec)) = 1.1.0-rc4 -Provides: bundled(golang(github.com/opencontainers/runc)) = 1.1.7 -Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = 1.1.0-rc.3 -Provides: bundled(golang(github.com/openshift-online/ocm-sdk-go)) = 0.1.362 +Provides: bundled(golang(github.com/opencontainers/image-spec)) = 1.1.0-rc5 +Provides: bundled(golang(github.com/opencontainers/runc)) = 1.1.9 +Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = 1.1.0 +Provides: bundled(golang(github.com/openshift-online/ocm-sdk-go)) = 0.1.374 Provides: bundled(golang(github.com/oracle/oci-go-sdk/v54)) = 54.0.0 -Provides: bundled(golang(github.com/osbuild/images)) = 0.3.0-r9.3.3 +Provides: bundled(golang(github.com/osbuild/images)) = 0.12.0 +Provides: bundled(golang(github.com/osbuild/pulp-client)) = 0.1.0 Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0 Provides: bundled(golang(github.com/proglottis/gpgme)) = 0.1.3 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.16.0 -Provides: bundled(golang(github.com/prometheus/client_model)) = 0.4.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.42.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.10.1 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.17.0 +Provides: bundled(golang(github.com/prometheus/client_model)) = 9a2bf30 +Provides: bundled(golang(github.com/prometheus/common)) = 0.44.0 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.11.1 Provides: bundled(golang(github.com/rivo/uniseg)) = 0.4.4 +Provides: bundled(golang(github.com/secure-systems-lab/go-securesystemslib)) = 0.7.0 Provides: bundled(golang(github.com/segmentio/ksuid)) = 1.0.4 -Provides: bundled(golang(github.com/sigstore/fulcio)) = 1.3.1 -Provides: bundled(golang(github.com/sigstore/rekor)) = 4c81ff2 -Provides: bundled(golang(github.com/sigstore/sigstore)) = 1.7.1 +Provides: bundled(golang(github.com/sigstore/fulcio)) = 1.4.0 +Provides: bundled(golang(github.com/sigstore/rekor)) = 1.2.2 +Provides: bundled(golang(github.com/sigstore/sigstore)) = 1.7.3 Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.9.3 Provides: bundled(golang(github.com/sony/gobreaker)) = dd874f9 Provides: bundled(golang(github.com/spf13/cobra)) = 1.7.0 @@ -189,35 +194,33 @@ Provides: bundled(golang(github.com/ubccr/kerby)) = 201a958 Provides: bundled(golang(github.com/ulikunitz/xz)) = 0.5.11 Provides: bundled(golang(github.com/valyala/bytebufferpool)) = 1.0.0 Provides: bundled(golang(github.com/valyala/fasttemplate)) = 1.2.2 -Provides: bundled(golang(github.com/vbatts/tar-split)) = 0.11.3 -Provides: bundled(golang(github.com/vbauerster/mpb/v8)) = 8.4.0 -Provides: bundled(golang(github.com/vmware/govmomi)) = 0.30.7 -Provides: bundled(golang(go.etcd.io/bbolt)) = 1.3.7 +Provides: bundled(golang(github.com/vbatts/tar-split)) = 0.11.5 +Provides: bundled(golang(github.com/vbauerster/mpb/v8)) = 8.6.1 +Provides: bundled(golang(github.com/vmware/govmomi)) = 0.32.0 Provides: bundled(golang(go.mongodb.org/mongo-driver)) = 1.11.3 Provides: bundled(golang(go.mozilla.org/pkcs7)) = 33d0574 Provides: bundled(golang(go.opencensus.io)) = 0.24.0 -Provides: bundled(golang(golang.org/x/crypto)) = 0.12.0 -Provides: bundled(golang(golang.org/x/exp)) = 2e198f4 -Provides: bundled(golang(golang.org/x/mod)) = 0.10.0 -Provides: bundled(golang(golang.org/x/net)) = 0.14.0 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.11.0 -Provides: bundled(golang(golang.org/x/sync)) = 0.3.0 -Provides: bundled(golang(golang.org/x/sys)) = 0.11.0 -Provides: bundled(golang(golang.org/x/term)) = 0.11.0 -Provides: bundled(golang(golang.org/x/text)) = 0.12.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.14.0 +Provides: bundled(golang(golang.org/x/exp)) = d852ddb +Provides: bundled(golang(golang.org/x/mod)) = 0.12.0 +Provides: bundled(golang(golang.org/x/net)) = 0.17.0 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.13.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.4.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.13.0 +Provides: bundled(golang(golang.org/x/term)) = 0.13.0 +Provides: bundled(golang(golang.org/x/text)) = 0.13.0 Provides: bundled(golang(golang.org/x/time)) = 0.3.0 -Provides: bundled(golang(golang.org/x/tools)) = 0.9.3 +Provides: bundled(golang(golang.org/x/tools)) = 74c255b Provides: bundled(golang(golang.org/x/xerrors)) = 04be3eb -Provides: bundled(golang(google.golang.org/api)) = 0.138.0 +Provides: bundled(golang(google.golang.org/api)) = 0.147.0 Provides: bundled(golang(google.golang.org/appengine)) = 1.6.7 -Provides: bundled(golang(google.golang.org/genproto)) = f966b18 -Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = f966b18 -Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 1744710 -Provides: bundled(golang(google.golang.org/grpc)) = 1.57.0 +Provides: bundled(golang(google.golang.org/genproto)) = d307bd8 +Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = d307bd8 +Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 8bfb1ae +Provides: bundled(golang(google.golang.org/grpc)) = 1.58.2 Provides: bundled(golang(google.golang.org/protobuf)) = 1.31.0 Provides: bundled(golang(gopkg.in/go-jose/go-jose.v2)) = 2.6.1 Provides: bundled(golang(gopkg.in/ini.v1)) = 1.67.0 -Provides: bundled(golang(gopkg.in/square/go-jose.v2)) = 2.6.0 Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.4.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 # BUNDLE_END @@ -251,6 +254,11 @@ export PATH=$PWD/_bin${PATH:+:$PATH} export GOPATH=$GO_BUILD_PATH:%{gopath} export GOFLAGS+=" -mod=vendor" %endif +%if 0%{?fedora} +# Fedora disables Go modules by default, but we want to use them. +# Undefine the macro which disables it to use the default behavior. +%undefine gomodulesmode +%endif # Set the commit hash so that composer can report what source version # was used to build it. This has to be set explicitly when calling rpmbuild, @@ -589,6 +597,25 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Nov 01 2023 Packit - 93-1 +Changes with 93 +---------------- + * :package: Packit configuration enhancements (#3768) + * Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Ondřej Budai, Simon Steinbeiß + * Add partitioning mode support to cloudapi and weldr api (#3723) + * Author: Brian C. Lane, Reviewers: Ondřej Budai + * Add support for uploading an ostree commit to Pulp (#3636) + * Author: Achilleas Koutsou, Reviewers: Nobody + * Build rpms on RHEL-8.10 and RHEL-9.4 (#3772) + * Author: Jakub Rusz, Reviewers: Alexander Todorov + * Post `osbuild/images` split autumn cleanup :broom: (#3754) + * Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger + * test/README: run go tests when updating images (#3763) + * Author: Achilleas Koutsou, Reviewers: Tomáš Hozza, djach7 + +— Somewhere on the Internet, 2023-11-01 + + * Tue Oct 24 2023 Packit - 88.2-1 Changes with 88.2 ----------------- diff --git a/sources b/sources index d6126f5..3056685 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-88.2.tar.gz) = 0435c582e45b982ec74957f87db0ee4a86c563ff3217370a3a01c3537fd5dcf529e446d12b5c094fa6cb022e33f787c56cf8495ff7c756591225d5830415209c +SHA512 (osbuild-composer-93.tar.gz) = efd512252d14d3465baf0bfeab0da67e52c8aafd511aa946d7106002169be4569e1b47264bf69ba7b07a64eba8a4a2d99d546a9832ffa80a1e9de506fb8bf388