import UBI skopeo-1.20.0-1.el10
This commit is contained in:
parent
b59031f836
commit
8dca0381fb
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
release-1.18-bfd0850.tar.gz
|
||||
skopeo-1.20.0-e2c1eec.tar.gz
|
||||
|
||||
67
skopeo.spec
67
skopeo.spec
@ -9,8 +9,8 @@
|
||||
|
||||
%global gomodulesmode GO111MODULE=on
|
||||
|
||||
%global branch release-1.18
|
||||
%global commit0 bfd0850f067e79cf4a60a911e212a62bd55181fb
|
||||
#%%global branch release-1.18
|
||||
%global commit0 e2c1eecd40b9121adf431a33cbbe60d22dc9fad7
|
||||
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||
|
||||
# No btrfs on RHEL
|
||||
@ -18,10 +18,15 @@
|
||||
%define build_with_btrfs 1
|
||||
%endif
|
||||
|
||||
%if %{defined rhel}
|
||||
%define fips 1
|
||||
%endif
|
||||
|
||||
# Only used in official koji builds
|
||||
# Copr builds set a separate epoch for all environments
|
||||
%if %{defined fedora}
|
||||
%define conditional_epoch 1
|
||||
%define fakeroot 1
|
||||
%else
|
||||
%define conditional_epoch 2
|
||||
%endif
|
||||
@ -38,10 +43,10 @@ Epoch: %{conditional_epoch}
|
||||
# If that's what you're reading, Version must be 0, and will be updated by Packit for
|
||||
# copr and koji builds.
|
||||
# If you're reading this on dist-git, the version is automatically filled in by Packit.
|
||||
Version: 1.18.1
|
||||
Version: 1.20.0
|
||||
# The `AND` needs to be uppercase in the License for SPDX compatibility
|
||||
License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
%if %{defined golang_arches_future}
|
||||
ExclusiveArch: %{golang_arches_future}
|
||||
%else
|
||||
@ -66,23 +71,28 @@ BuildRequires: go-rpm-macros
|
||||
%endif
|
||||
BuildRequires: gpgme-devel
|
||||
BuildRequires: libassuan-devel
|
||||
BuildRequires: ostree-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: shadow-utils-subid-devel
|
||||
BuildRequires: sqlite-devel
|
||||
Requires: containers-common >= 4:1-21
|
||||
|
||||
%description
|
||||
Command line utility to inspect images and repositories directly on Docker
|
||||
registries without the need to pull them
|
||||
|
||||
# NOTE: The tests subpackage is only intended for testing and will not be supported
|
||||
# for end-users and/or customers.
|
||||
%package tests
|
||||
Summary: Tests for %{name}
|
||||
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
%if %{defined fedora}
|
||||
%if %{undefined rhel}
|
||||
Requires: bats
|
||||
%endif
|
||||
%if %{defined fakeroot}
|
||||
Requires: fakeroot
|
||||
%endif
|
||||
Requires: gnupg
|
||||
Requires: jq
|
||||
Requires: golang
|
||||
@ -90,10 +100,7 @@ Requires: podman
|
||||
Requires: crun
|
||||
Requires: httpd-tools
|
||||
Requires: openssl
|
||||
%if %{defined fedora}
|
||||
Requires: fakeroot
|
||||
Requires: squashfs-tools
|
||||
%endif
|
||||
|
||||
%description tests
|
||||
%{summary}
|
||||
@ -125,11 +132,15 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an
|
||||
export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection=full"
|
||||
%endif
|
||||
|
||||
BASEBUILDTAGS="$(hack/libsubid_tag.sh)"
|
||||
BASEBUILDTAGS="$(hack/libsubid_tag.sh) libsqlite3"
|
||||
%if %{defined build_with_btrfs}
|
||||
export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_tag.sh) $(hack/btrfs_installed_tag.sh)"
|
||||
export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)"
|
||||
%else
|
||||
export BUILDTAGS="$BASEBUILDTAGS btrfs_noversion exclude_graphdriver_btrfs libtrust_openssl"
|
||||
export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs"
|
||||
%endif
|
||||
|
||||
%if %{defined fips}
|
||||
export BUILDTAGS="$BUILDTAGS libtrust_openssl"
|
||||
%endif
|
||||
|
||||
# unset LDFLAGS earlier set from set_build_flags
|
||||
@ -151,6 +162,10 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
|
||||
#define license tag if not already defined
|
||||
%{!?_licensedir:%global license %doc}
|
||||
|
||||
# Include this to silence rpmlint.
|
||||
# Especially annoying if you use syntastic vim plugin.
|
||||
%check
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
@ -169,15 +184,31 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
|
||||
%{_datadir}/%{name}/test
|
||||
|
||||
%changelog
|
||||
* Wed Jun 04 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.18.1-2
|
||||
- rebuild to fix CVE-2025-22871 skopeo: Request smuggling due to acceptance of invalid chunked data in net/http
|
||||
- Resolves: RHEL-89227
|
||||
* Mon Aug 11 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.20.0-1
|
||||
- update to https://github.com/containers/skopeo/releases/tag/v1.20.0
|
||||
- Related: RHEL-80817
|
||||
|
||||
* Mon Mar 17 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.18.1-1
|
||||
* Tue Jun 17 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.19.0-2
|
||||
- Do not require BATS on RHEL
|
||||
- Resolves: RHEL-96982
|
||||
|
||||
* Tue Jun 10 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.19.0-1
|
||||
- update to https://github.com/containers/skopeo/releases/tag/v1.19.0
|
||||
- Related: RHEL-80817
|
||||
|
||||
* Tue Mar 18 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.18.1-3
|
||||
- fix gating.yaml
|
||||
- Related: RHEL-80817
|
||||
|
||||
* Fri Mar 14 2025 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.18.1-2
|
||||
- Fix bats dep on tests subpackage
|
||||
- Resolves: RHEL-58990
|
||||
|
||||
* Fri Mar 14 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.18.1-1
|
||||
- update to the latest content of https://github.com/containers/skopeo/tree/release-1.18
|
||||
(https://github.com/containers/skopeo/commit/bfd0850)
|
||||
- fixes "CVE-2025-27144 skopeo: Go JOSE's Parsing Vulnerable to Denial of Service [rhel-10.0.z]"
|
||||
- Resolves: RHEL-82961
|
||||
- fixes "CVE-2025-27144 skopeo: Go JOSE's Parsing Vulnerable to Denial of Service [rhel-10.1]"
|
||||
- Resolves: RHEL-80611
|
||||
|
||||
* Thu Feb 13 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.18.0-1
|
||||
- update to https://github.com/containers/skopeo/releases/tag/v1.18.0
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (release-1.18-bfd0850.tar.gz) = 70ae4b50c6c729226bca6ad54c56b7619047c476dbb6521f90c2f1f2da2292c2cdf87d4a50df4b0cbcf4eb72f5f21acfee333e8a20950f7cd63dc87e78e9eeaa
|
||||
SHA512 (skopeo-1.20.0-e2c1eec.tar.gz) = fa660c36be2b3465a5f62bd41d55a21c3b0ca81f3842ab99b9569cc22fe68922660ece6635d82fcf80b148a3f1cc31e0b2279fe45b0ce25214328a06e0a09aee
|
||||
|
||||
Loading…
Reference in New Issue
Block a user