Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/skopeo.git#d61b3acc1f66d4464a5cfa8be0dd8e72416d434a
This commit is contained in:
DistroBaker 2020-11-04 23:47:04 +01:00
parent 092de221aa
commit 55f5106f6a
11 changed files with 50 additions and 175 deletions

17
.gitignore vendored
View File

@ -202,20 +202,3 @@
/skopeo-87484a1.tar.gz
/skopeo-a13b581.tar.gz
/skopeo-c4998eb.tar.gz
/skopeo-ae26454.tar.gz
/skopeo-662f9ac.tar.gz
/skopeo-23cb1b7.tar.gz
/skopeo-5dd09d7.tar.gz
/skopeo-45a9efb.tar.gz
/skopeo-12ab19f.tar.gz
/skopeo-bbd800f.tar.gz
/skopeo-77293ff.tar.gz
/skopeo-8151b89.tar.gz
/skopeo-44beab6.tar.gz
/skopeo-6dabefa.tar.gz
/skopeo-d8bc8b6.tar.gz
/skopeo-027d7e4.tar.gz
/skopeo-4cc72b9.tar.gz
/skopeo-10da9f7.tar.gz
/skopeo-362f70b.tar.gz
/skopeo-ceaee44.tar.gz

View File

@ -177,7 +177,7 @@ One of the following alternatives are supported:
```json
{"type":"matchRepoDigestOrExact"}
```
- The identity in the signature must be in the same repository as the image identity. This is useful e.g. to pull an image using the `:latest` tag when the image is signed with a tag specifying an exact image version.
- The identity in the signature must be in the same repository as the image identity. This is useful e.g. to pull an image using the `:latest` tag when the image is signed with a tag specifing an exact image version.
```json
{"type":"matchRepository"}

View File

@ -12,7 +12,7 @@ The registries configuration directory contains configuration for various regist
so that the configuration does not have to be provided in command-line options over and over for every command,
and so that it can be shared by all users of containers/image.
By default, the registries configuration directory is `$HOME/.config/containers/registries.d` if it exists, otherwise `/etc/containers/registries.d` (unless overridden at compile-time);
By default (unless overridden at compile-time), the registries configuration directory is `/etc/containers/registries.d`;
applications may allow using a different directory instead.
## Directory Structure

View File

@ -224,7 +224,7 @@ The contents of this string is not defined in detail; however each implementatio
Consumers of container signatures MAY recognize specific values or sets of values of `optional.creator`
(perhaps augmented with `optional.timestamp`),
and MAY change their processing of the signature based on these values
(usually to accommodate violations of this specification in past versions of the signing software which cannot be fixed retroactively),
(usually to acommodate violations of this specification in past versions of the signing software which cannot be fixed retroactively),
as long as the semantics of the invalid document, as created by such an implementation, is clear.
If consumers of signatures do change their behavior based on the `optional.creator` value,

View File

@ -75,7 +75,7 @@ The `storage.options` table supports the following options:
remap-group = "containers"
**root-auto-userns-user**=""
Root-auto-userns-user is a user name which can be used to look up one or more UID/GID ranges in the /etc/subuid and /etc/subgid file. These ranges will be partitioned to containers configured to create automatically a user namespace. Containers configured to automatically create a user namespace can still overlap with containers having an explicit mapping set. This setting is ignored when running as rootless.
Root-auto-userns-user is a user name which can be used to look up one or more UID/GID ranges in the /etc/subuid and /etc/subgid file. These ranges will be partioned to containers configured to create automatically a user namespace. Containers configured to automatically create a user namespace can still overlap with containers having an explicit mapping set. This setting is ignored when running as rootless.
**auto-userns-min-size**=1024
Auto-userns-min-size is the minimum size for a user namespace created automatically.

View File

@ -41,14 +41,10 @@ If `name` does not contain a slash, it is treated as `docker.io/library/name`.
Otherwise, the component before the first slash is checked if it is recognized as a `hostname[:port]` (i.e., it contains either a . or a :, or the component is exactly localhost).
If the first component of name is not recognized as a `hostname[:port]`, `name` is treated as `docker.io/name`.
### **docker-archive:**_path[:{docker-reference|@source-index}]_
### **docker-archive:**_path[:docker-reference]_
An image is stored in the docker-save(1) formatted file.
_docker-reference_ must not contain a digest.
Alternatively, for reading archives, @_source-index_ is a zero-based index in archive manifest
(to access untagged images).
If neither _docker-reference_ nor @_source_index is specified when reading an archive, the archive must contain exactly one image.
_docker-reference_ is only used when creating such a file, and it must not contain a digest.
It is further possible to copy data to stdin by specifying `docker-archive:/dev/stdin` but note that the used file must be seekable.
### **docker-daemon:**_docker-reference|algo:digest_

View File

@ -59,27 +59,29 @@
# List of default capabilities for containers. If it is empty or commented out,
# the default capabilities defined in the container engine will be added.
#
default_capabilities = [
"CHOWN",
"DAC_OVERRIDE",
"FOWNER",
"FSETID",
"KILL",
"NET_BIND_SERVICE",
"SETFCAP",
"SETGID",
"SETPCAP",
"SETUID",
"SYS_CHROOT"
]
# default_capabilities = [
# "AUDIT_WRITE",
# "CHOWN",
# "DAC_OVERRIDE",
# "FOWNER",
# "FSETID",
# "KILL",
# "MKNOD",
# "NET_BIND_SERVICE",
# "NET_RAW",
# "SETGID",
# "SETPCAP",
# "SETUID",
# "SYS_CHROOT",
# ]
# A list of sysctls to be set in containers by default,
# specified as "name=value",
# for example:"net.ipv4.ping_group_range = 0 1000".
#
default_sysctls = [
"net.ipv4.ping_group_range=0 1",
]
# default_sysctls = [
# "net.ipv4.ping_group_range=0 1000",
# ]
# A list of ulimits to be set in containers by default, specified as
# "<ulimit name>=<soft limit>:<hard limit>", for example:

View File

@ -68,13 +68,9 @@
"chown",
"chown32",
"clock_adjtime",
"clock_adjtime64",
"clock_getres",
"clock_getres_time64",
"clock_gettime",
"clock_gettime64",
"clock_nanosleep",
"clock_nanosleep_time64",
"clone",
"close",
"connect",
@ -97,7 +93,6 @@
"exit",
"exit_group",
"faccessat",
"faccessat2",
"fadvise64",
"fadvise64_64",
"fallocate",
@ -225,22 +220,18 @@
"newfstatat",
"open",
"openat",
"openat2",
"pause",
"pidfd_getfd",
"pipe",
"pipe2",
"pivot_root",
"poll",
"ppoll",
"ppoll_time64",
"prctl",
"pread64",
"preadv",
"preadv2",
"prlimit64",
"pselect6",
"pselect6_time64",
"pwrite64",
"pwritev",
"pwritev2",
@ -353,13 +344,10 @@
"timer_delete",
"timer_getoverrun",
"timer_gettime",
"timer_gettime64",
"timer_settime",
"timerfd_create",
"timerfd_gettime",
"timerfd_gettime64",
"timerfd_settime",
"timerfd_settime64",
"times",
"tkill",
"truncate",
@ -374,7 +362,6 @@
"unshare",
"utime",
"utimensat",
"utimensat_time64",
"utimes",
"vfork",
"vmsplice",
@ -761,8 +748,7 @@
"names": [
"settimeofday",
"stime",
"clock_settime",
"clock_settime64"
"clock_settime"
],
"action": "SCMP_ACT_ALLOW",
"args": [],

View File

@ -28,7 +28,7 @@
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
%global git0 https://%{import_path}
%global commit0 ceaee440a68e53652fb9abb913ff0a251655e800
%global commit0 c4998ebf3f9a348894e14e586c69e5ba2a12a193
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
# Used for comparing with latest upstream tag
@ -45,8 +45,8 @@ Epoch: 1
%else
Epoch: 2
%endif
Version: 1.2.1
Release: 14.dev.git%{shortcommit0}%{?dist}
Version: 1.1.1
Release: 37.dev.git%{shortcommit0}%{?dist}
Summary: Inspect container images and repositories on registries
License: ASL 2.0
URL: %{git0}
@ -79,9 +79,7 @@ BuildRequires: go-md2man
BuildRequires: gpgme-devel
BuildRequires: libassuan-devel
# Dependencies for containers/storage
%if 0%{?fedora} && ! 0%{?centos} >= 8 && ! 0%{?rhel}
BuildRequires: btrfs-progs-devel
%endif
BuildRequires: pkgconfig(devmapper)
BuildRequires: ostree-devel
BuildRequires: glib2-devel
@ -449,134 +447,44 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_datadir}/%{name}/test
%changelog
* Mon Oct 26 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.2.1-14.dev.gitceaee44
- fix seccomp.json typos
* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-13.dev.gitceaee44
- use %%rhel instead of %%eln
* Wed Oct 21 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.2.1-12.dev.gitceaee44
- Add time64 syscalls to seccomp.json
* Wed Oct 21 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.2.1-11.dev.gitceaee44
- autobuilt ceaee44
* Thu Oct 15 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.2.1-10.dev.git362f70b
- autobuilt 362f70b
* Sat Oct 10 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.2.1-9.dev.git10da9f7
- autobuilt 10da9f7
* Thu Oct 8 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.2.1-8.dev.git4cc72b9
- autobuilt 4cc72b9
* Tue Oct 6 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1:1.2.1-7.dev.git027d7e4
- no btrfs for eln or centos >= 8
- use old style changelogs without timezone/timestamp
* Sat Oct 3 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.2.1-6.dev.git027d7e4
- autobuilt 027d7e4
* Fri Oct 2 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.2.1-5.dev.gitd8bc8b6
- Add SETFCAP back into default capabilities
- Remove AUDIT_WRITE from default capabilities
* Fri Oct 2 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.2.1-4.dev.gitd8bc8b6
- autobuilt d8bc8b6
* Wed Sep 30 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.2.1-3.dev.git6dabefa
- autobuilt 6dabefa
* Fri Sep 25 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.2.1-2.dev.git44beab6
- bump to 1.2.1
- autobuilt 44beab6
* Fri Sep 25 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.1.1-51.dev.git5d5756c
- Modify the range of groups used in net.ipv4.ping_group_range to be 1 so that
- it will work more easily with User Namespaces
- Also turn back on AUDIT_WRITE until seccomp.json file is fixed
* Mon Sep 21 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-50.dev.git8151b89
- autobuilt 8151b89
* Mon Sep 21 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.1.1-49.dev.git5d5756c
- Add SYS_CHROOT back into default capabilities
* Mon Sep 21 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.1.1-48.dev.git5d5756c
- Remove fchmodat2 from seccomp.json (This syscall does not exist yet)
* Fri Sep 18 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-47.dev.git77293ff
- autobuilt 77293ff
* Thu Sep 17 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.1.1-46.dev.git5d5756c
- Remove NET_RAW, SYS_CHROOT, MKNOD and AUDIT_WRITE from default list of capabilities
- Turn on ping for 65k users
* Tue Sep 15 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-45.dev.gitbbd800f
- autobuilt bbd800f
* Mon Sep 14 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-44.dev.git12ab19f
- autobuilt 12ab19f
* Sat Sep 12 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.1.1-43.dev.git5d5756c
- update man pages
- Update seccomp rules
- Update configuration files in containers-common
- Update configuration files in containers-storage
* Fri Sep 11 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-42.dev.git45a9efb
- autobuilt 45a9efb
* Wed Sep 9 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-41.dev.git5dd09d7
- autobuilt 5dd09d7
* Wed Sep 9 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-40.dev.git23cb1b7
- autobuilt 23cb1b7
* Wed Sep 2 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-39.dev.git662f9ac
- autobuilt 662f9ac
* Wed Sep 2 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-38.dev.gitae26454
- autobuilt ae26454
* Fri Aug 28 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-37.dev.gitc4998eb
* Fri Aug 28 13:11:42 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-37.dev.gitc4998eb
- autobuilt c4998eb
* Thu Aug 27 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-36.dev.gita13b581
* Thu Aug 27 10:11:17 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-36.dev.gita13b581
- autobuilt a13b581
* Mon Aug 24 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-35.dev.git87484a1
* Mon Aug 24 11:10:33 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-35.dev.git87484a1
- autobuilt 87484a1
* Wed Aug 19 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.1.1-34.dev.git5d5756c
- Update configuration files in containers-common
- Update configuration files in containers-storage
* Wed Aug 19 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-33.dev.git5d5756c
* Wed Aug 19 13:10:49 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-33.dev.git5d5756c
- autobuilt 5d5756c
* Wed Aug 19 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-32.dev.git88c8c47
* Wed Aug 19 12:11:30 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-32.dev.git88c8c47
- autobuilt 88c8c47
* Tue Aug 11 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-31.dev.gitea10e61
* Tue Aug 11 22:11:26 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-31.dev.gitea10e61
- autobuilt ea10e61
* Mon Aug 10 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-30.dev.git0c2c7f4
* Mon Aug 10 08:10:36 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-30.dev.git0c2c7f4
- autobuilt 0c2c7f4
* Sun Aug 09 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-29.dev.git0f94dbc
* Sun Aug 09 13:10:26 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-29.dev.git0f94dbc
- autobuilt 0f94dbc
* Sat Aug 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-28.dev.gitbaeaad6
* Sat Aug 08 06:12:12 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-28.dev.gitbaeaad6
- autobuilt baeaad6
* Fri Aug 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-27.dev.git78d2f67
* Fri Aug 07 23:10:23 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-27.dev.git78d2f67
- autobuilt 78d2f67
* Mon Aug 03 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-26.dev.gitc052ed7
* Mon Aug 03 18:09:30 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-26.dev.gitc052ed7
- autobuilt c052ed7
* Mon Aug 03 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-25.dev.git5e88eb5
* Mon Aug 03 14:12:07 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-25.dev.git5e88eb5
- autobuilt 5e88eb5
* Sun Aug 2 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.1.1-23.dev.git62fd5a7
@ -587,28 +495,28 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 31 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-22.dev.git62fd5a7
* Fri Jul 31 12:09:53 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-22.dev.git62fd5a7
- autobuilt 62fd5a7
* Thu Jul 30 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-21.dev.git6252c22
* Thu Jul 30 23:09:46 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-21.dev.git6252c22
- autobuilt 6252c22
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.1-20.dev.git153f18d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jul 23 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-19.dev.git153f18d
* Thu Jul 23 13:09:43 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-19.dev.git153f18d
- autobuilt 153f18d
* Sat Jul 18 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-18.dev.git494d237
* Sat Jul 18 20:09:22 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-18.dev.git494d237
- autobuilt 494d237
* Fri Jul 17 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-17.dev.git89fb89a
* Fri Jul 17 14:09:50 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-17.dev.git89fb89a
- autobuilt 89fb89a
* Thu Jul 16 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-16.dev.git29eec32
* Thu Jul 16 22:09:48 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-16.dev.git29eec32
- autobuilt 29eec32
* Thu Jul 16 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-15.dev.git2fa7b99
* Thu Jul 16 17:09:51 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-15.dev.git2fa7b99
- autobuilt 2fa7b99
* Sat Jul 11 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-14.dev.git6284ceb

View File

@ -1 +1 @@
SHA512 (skopeo-ceaee44.tar.gz) = 0b6b6aded0fbe8345fa27b9d6b9fb702bbe60e704e729192c288d73cd43a8d9284e7a9e4cd02c16e6ba6a368d2e381c44166b37a6d05c37b8c50af668867b473
SHA512 (skopeo-c4998eb.tar.gz) = be31eaa783a4b78a121ae6da73d575988460f73af4d7fcd1580c2fd13ea5e58953172776c05dae8c2ffc1af4dc5b526f42c3d9c6c4f676927c45fd2ca3b95a73

View File

@ -47,7 +47,7 @@ additionalimagestores = [
# remap-group = "containers"
# Root-auto-userns-user is a user name which can be used to look up one or more UID/GID
# ranges in the /etc/subuid and /etc/subgid file. These ranges will be partitioned
# ranges in the /etc/subuid and /etc/subgid file. These ranges will be partioned
# to containers configured to create automatically a user namespace. Containers
# configured to automatically create a user namespace can still overlap with containers
# having an explicit mapping set.