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#dbc60db6523ac360b0ae3a91819f49e7423b2d26

.gitignore

@@ -206,7 +206,3 @@
 /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

containers-policy.json.5.md

@@ -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"}

containers-registries.d.5.md

@@ -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

containers-signature.5.md

@@ -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,

containers-storage.conf.5.md

@@ -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.

containers-transports.5.md

@@ -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.
+_docker-reference_ is only used when creating such a file, and it 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.
-
 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_

containers.conf

@@ -59,25 +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 = [
+# default_capabilities = [
-    "CHOWN",
+#    "AUDIT_WRITE",
-    "DAC_OVERRIDE",
+#    "CHOWN",
-    "FOWNER",
+#    "DAC_OVERRIDE",
-    "FSETID",
+#    "FOWNER",
-    "KILL",
+#    "FSETID",
-    "NET_BIND_SERVICE",
+#    "KILL",
-    "SETGID",
+#    "MKNOD",
-    "SETPCAP",
+#    "NET_BIND_SERVICE",
-    "SETUID",
+#    "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 = [
+# default_sysctls = [
- "net.ipv4.ping_group_range=0 65536",
+#  "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:

seccomp.json

@@ -71,7 +71,7 @@
 				"clock_getres",
 				"clock_gettime",
 				"clock_nanosleep",
-				"clone",
+			        "clone",
 				"close",
 				"connect",
 				"copy_file_range",
@@ -93,7 +93,6 @@
 				"exit",
 				"exit_group",
 				"faccessat",
-				"faccessat2",
 				"fadvise64",
 				"fadvise64_64",
 				"fallocate",
@@ -221,7 +220,6 @@
 				"newfstatat",
 				"open",
 				"openat",
-				"openat2",
 				"pause",
 				"pipe",
 				"pipe2",

skopeo.spec

@@ -28,7 +28,7 @@
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{import_path}
-%global commit0 77293ff9c42a9c8d3db36a6c02fe26c70b232ec9
+%global commit0 5dd09d76c3a9991bb0a06475e16694f4feaa2dfb
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 # Used for comparing with latest upstream tag
@@ -46,7 +46,7 @@ Epoch: 1
 Epoch: 2
 %endif
 Version: 1.1.1
-Release: 48.dev.git%{shortcommit0}%{?dist}
+Release: 41.dev.git%{shortcommit0}%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -447,31 +447,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
-* 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 20:12:04 UTC 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 11:13:22 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-45.dev.gitbbd800f
-- autobuilt bbd800f
-
-* Mon Sep 14 16:12:20 UTC 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 19:12:27 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-42.dev.git45a9efb
-- autobuilt 45a9efb
-
 * Wed Sep  9 20:12:20 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-41.dev.git5dd09d7
 - autobuilt 5dd09d7
 

sources

@@ -1 +1 @@
-SHA512 (skopeo-77293ff.tar.gz) = 7ebcca67cff46e846407d15556a310988dc47640c2b0faee2b73a7c44ec78601debdba322020d6c388d1b338c2432944c4972614b42337e80b308d31520ec917
+SHA512 (skopeo-5dd09d7.tar.gz) = cfaf1e1240e9150ae6641f9479fa3a747ee98433fb495d89d54e63c36bc5c433058740c6229165805951afb89330df15bee42f25eeb78cab02e87320e3ac83e4

storage.conf

@@ -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.