10 changed files with 536 additions and 1466 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/skopeo-1715c90.tar.gz
+SOURCES/release-1.6-c20c32d.tar.gz
--- a/.skopeo.metadata
+++ b/.skopeo.metadata
@ -1 +1 @@
-f258c639bda55165978c076e13bac72388e4ff14 SOURCES/skopeo-1715c90.tar.gz
+18a43c622d36200dd624006d49be199666511ad5 SOURCES/release-1.6-c20c32d.tar.gz
--- a/SOURCES/containers-storage.conf.5.md
+++ b/SOURCES/containers-storage.conf.5.md
@ -1,131 +0,0 @@
-% storage.conf(5) Container Storage Configuration File
-% Dan Walsh
-% May 2017
-
-# NAME
-storage.conf - Syntax of Container Storage configuration file
-
-# DESCRIPTION
-The STORAGE configuration file specifies all of the available container storage options
-for tools using shared container storage, but in a TOML format that can be more easily modified
-and versioned.
-
-# FORMAT
-The [TOML format][toml] is used as the encoding of the configuration file.
-Every option and subtable listed here is nested under a global "storage" table.
-No bare options are used. The format of TOML can be simplified to:
-
-    [table]
-    option = value
-
-    [table.subtable1]
-    option = value
-
-    [table.subtable2]
-    option = value
-
-## STORAGE TABLE
-
-The `storage` table supports the following options:
-
-**graphroot**=""
-  container storage graph dir (default: "/var/lib/containers/storage")
-  Default directory to store all writable content created by container storage programs
-
-**runroot**=""
-  container storage run dir (default: "/var/run/containers/storage")
-  Default directory to store all temporary writable content created by container storage programs
-
-**driver**=""
-  container storage driver (default is "overlay")
-  Default Copy On Write (COW) container storage driver
-
-### STORAGE OPTIONS TABLE 
-
-The `storage.options` table supports the following options:
-
-**additionalimagestores**=[]
-  Paths to additional container image stores. Usually these are read/only and stored on remote network shares.
-
-**size**=""
-  Maximum size of a container image.  Default is 10GB.  This flag can be used to set quota
-  on the size of container images.
-
-**override_kernel_check**=""
-  Tell storage drivers to ignore kernel version checks.  Some storage drivers assume that if a kernel is too
-  old, the driver is not supported.  But for kernels that have had the drivers backported, this flag
-  allows users to override the checks
-
-[storage.options.thinpool]
-
-Storage Options for thinpool
-
-The `storage.options.thinpool` table supports the following options:
-
-**autoextend_percent**=""
-
-Tells the thinpool driver the amount by which the thinpool needs to be grown. This is specified in terms of % of pool size. So a value of 20 means that when threshold is hit, pool will be grown by 20% of existing pool size. (Default is 20%)
-
-**autoextend_threshold**=""
-
-Tells the driver the thinpool extension threshold in terms of percentage of pool size. For example, if threshold is 60, that means when pool is 60% full, threshold has been hit. (80% is the default)
-
-**basesize**=""
-
-Specifies the size to use when creating the base device, which limits the size of images and containers. (10g is the default)
-
-**blocksize**=""
-
-Specifies a custom blocksize to use for the thin pool. (64k is the default)
-
-**directlvm_device**=""
-
-Specifies a custom block storage device to use for the thin pool. Required if you setup devicemapper
-
-**directlvm_device_force**=""
-
-Tells driver to wipe device (directlvm_device) even if device already has a filesystem.  Default is False
-
-**fs**="xfs"
-
-Specifies the filesystem type to use for the base device. (Default is xfs)
-
-**log_level**=""
-
-Sets the log level of devicemapper.
-
-    0: LogLevelSuppress 0 (Default)
-    2: LogLevelFatal
-    3: LogLevelErr
-    4: LogLevelWarn
-    5: LogLevelNotice
-    6: LogLevelInfo
-    7: LogLevelDebug
-
-**min_free_space**=""
-
-Specifies the min free space percent in a thin pool require for new device creation to succeed. Valid values are from 0% - 99%. Value 0% disables (10% is the default)
-
-**mkfsarg**=""
-
-Specifies extra mkfs arguments to be used when creating the base device.
-
-**mountopt**=""
-
-Specifies extra mount options used when mounting the thin devices.
-
-**use_deferred_removal**=""
-
-Marks device for deferred removal.  If the device is in use when it driver attempts to remove it, driver will tell the kernel to remove it as soon as possible.  (Default is true).
-
-**use_deferred_deletion**=""
-
-Marks device for deferred deletion. If the device is in use when it driver attempts to delete it, driver continue to attempt to delete device every 30 seconds, or when it restarts.  (Default is true).
-
-**xfs_nospace_max_retries**=""
-
-Specifies the maximum number of retries XFS should attempt to complete IO when ENOSPC (no space) error is returned by underlying storage device. (Default is 0, which means to try continuously.
-
-# HISTORY
-May 2017, Originally compiled by Dan Walsh <dwalsh@redhat.com>
-Format copied from crio.conf man page created by Aleksa Sarai <asarai@suse.de>
--- a/SOURCES/mounts.conf
+++ b/SOURCES/mounts.conf
@ -1 +0,0 @@
-/usr/share/rhel/secrets:/run/secrets
--- a/SOURCES/policy.json.5.md
+++ b/SOURCES/policy.json.5.md
@ -1,281 +0,0 @@
-% POLICY.JSON(5) policy.json Man Page
-% Miloslav Trmač
-% September 2016
-
-# NAME
-policy.json - Syntax for the Signature Verification Configuration File
-
-## DESCRIPTION
-
-Signature verification policy files are used to specify policy, e.g. trusted keys,
-applicable when deciding whether to accept an image, or individual signatures of that image, as valid.
-
-The default policy is stored (unless overridden at compile-time) at `/etc/containers/policy.json`;
-applications performing verification may allow using a different policy instead.
-
-## FORMAT
-
-The signature verification policy file, usually called `policy.json`,
-uses a JSON format.  Unlike some other JSON files, its parsing is fairly strict:
-unrecognized, duplicated or otherwise invalid fields cause the entire file,
-and usually the entire operation, to be rejected.
-
-The purpose of the policy file is to define a set of *policy requirements* for a container image,
-usually depending on its location (where it is being pulled from) or otherwise defined identity.
-
-Policy requirements can be defined for:
-
- An individual *scope* in a *transport*.
-  The *transport* values are the same as the transport prefixes when pushing/pulling images (e.g. `docker:`, `atomic:`),
-  and *scope* values are defined by each transport; see below for more details.
-
-  Usually, a scope can be defined to match a single image, and various prefixes of
-  such a most specific scope define namespaces of matching images.
- A default policy for a single transport, expressed using an empty string as a scope
- A global default policy.
-
-If multiple policy requirements match a given image, only the requirements from the most specific match apply,
-the more general policy requirements definitions are ignored.
-
-This is expressed in JSON using the top-level syntax
-```js
-{
-    "default": [/* policy requirements: global default */]
-    "transports": {
-        transport_name: {
-            "": [/* policy requirements: default for transport $transport_name */],
-            scope_1: [/* policy requirements: default for $scope_1 in $transport_name */],
-            scope_2: [/*…*/]
-            /*…*/
-        },
-        transport_name_2: {/*…*/}
-        /*…*/
-    }
-}
-```
-
-The global `default` set of policy requirements is mandatory; all of the other fields
-(`transports` itself, any specific transport, the transport-specific default, etc.) are optional.
-
-<!-- NOTE: Keep this in sync with transports/transports.go! -->
-## Supported transports and their scopes
-
-### `atomic:`
-
-The `atomic:` transport refers to images in an Atomic Registry.
-
-Supported scopes use the form _hostname_[`:`_port_][`/`_namespace_[`/`_imagestream_ [`:`_tag_]]],
-i.e. either specifying a complete name of a tagged image, or prefix denoting
-a host/namespace/image stream.
-
-*Note:* The _hostname_ and _port_ refer to the Docker registry host and port (the one used
-e.g. for `docker pull`), _not_ to the OpenShift API host and port.
-
-### `dir:`
-
-The `dir:` transport refers to images stored in local directories.
-
-Supported scopes are paths of directories (either containing a single image or
-subdirectories possibly containing images).
-
-*Note:* The paths must be absolute and contain no symlinks. Paths violating these requirements may be silently ignored.
-
-The top-level scope `"/"` is forbidden; use the transport default scope `""`,
-for consistency with other transports.
-
-### `docker:`
-
-The `docker:` transport refers to images in a registry implementing the "Docker Registry HTTP API V2".
-
-Scopes matching individual images are named Docker references *in the fully expanded form*, either
-using a tag or digest. For example, `docker.io/library/busybox:latest` (*not* `busybox:latest`).
-
-More general scopes are prefixes of individual-image scopes, and specify a repository (by omitting the tag or digest),
-a repository namespace, or a registry host (by only specifying the host name).
-
-### `oci:`
-
-The `oci:` transport refers to images in directories compliant with "Open Container Image Layout Specification".
-
-Supported scopes use the form _directory_`:`_tag_, and _directory_ referring to
-a directory containing one or more tags, or any of the parent directories.
-
-*Note:* See `dir:` above for semantics and restrictions on the directory paths, they apply to `oci:` equivalently.
-
-### `tarball:`
-
-The `tarball:` transport refers to tarred up container root filesystems.
-
-Scopes are ignored.
-
-## Policy Requirements
-
-Using the mechanisms above, a set of policy requirements is looked up.  The policy requirements
-are represented as a JSON array of individual requirement objects.  For an image to be accepted,
-*all* of the requirements must be satisfied simulatenously.
-
-The policy requirements can also be used to decide whether an individual signature is accepted (= is signed by a recognized key of a known author);
-in that case some requirements may apply only to some signatures, but each signature must be accepted by *at least one* requirement object.
-
-The following requirement objects are supported:
-
-### `insecureAcceptAnything`
-
-A simple requirement with the following syntax
-
-```json
-{"type":"insecureAcceptAnything"}
-```
-
-This requirement accepts any image (but note that other requirements in the array still apply).
-
-When deciding to accept an individual signature, this requirement does not have any effect; it does *not* cause the signature to be accepted, though.
-
-This is useful primarily for policy scopes where no signature verification is required;
-because the array of policy requirements must not be empty, this requirement is used
-to represent the lack of requirements explicitly.
-
-### `reject`
-
-A simple requirement with the following syntax:
-
-```json
-{"type":"reject"}
-```
-
-This requirement rejects every image, and every signature.
-
-### `signedBy`
-
-This requirement requires an image to be signed with an expected identity, or accepts a signature if it is using an expected identity and key.
-
-```js
-{
-    "type":    "signedBy",
-    "keyType": "GPGKeys", /* The only currently supported value */
-    "keyPath": "/path/to/local/keyring/file",
-    "keyData": "base64-encoded-keyring-data",
-    "signedIdentity": identity_requirement
-}
-```
-<!-- Later: other keyType values -->
-
-Exactly one of `keyPath` and `keyData` must be present, containing a GPG keyring of one or more public keys.  Only signatures made by these keys are accepted.
-
-The `signedIdentity` field, a JSON object, specifies what image identity the signature claims about the image.
-One of the following alternatives are supported:
-
- The identity in the signature must exactly match the image identity.  Note that with this, referencing an image by digest (with a signature claiming a _repository_`:`_tag_ identity) will fail.
-
-  ```json
-  {"type":"matchExact"}
-  ```
- If the image identity carries a tag, the identity in the signature must exactly match;
-  if the image identity uses a digest reference, the identity in the signature must be in the same repository as the image identity (using any tag).
-
-  (Note that with images identified using digest references, the digest from the reference is validated even before signature verification starts.)
-
-  ```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 specifing an exact image version.
-
-  ```json
-  {"type":"matchRepository"}
-  ```
- The identity in the signature must exactly match a specified identity.
-  This is useful e.g. when locally mirroring images signed using their public identity.
-
-  ```js
-  {
-      "type": "exactReference",
-      "dockerReference": docker_reference_value
-  }
-  ```
- The identity in the signature must be in the same repository as a specified identity.
-  This combines the properties of `matchRepository` and `exactReference`.
-
-  ```js
-  {
-      "type": "exactRepository",
-      "dockerRepository": docker_repository_value
-  }
-  ```
-
-If the `signedIdentity` field is missing, it is treated as `matchRepoDigestOrExact`.
-
-*Note*: `matchExact`, `matchRepoDigestOrExact` and `matchRepository` can be only used if a Docker-like image identity is
-provided by the transport.  In particular, the `dir:` and `oci:` transports can be only
-used with `exactReference` or `exactRepository`.
-
-<!-- ### `signedBaseLayer` -->
-
-## Examples
-
-It is *strongly* recommended to set the `default` policy to `reject`, and then
-selectively allow individual transports and scopes as desired.
-
-### A reasonably locked-down system
-
-(Note that the `/*`…`*/` comments are not valid in JSON, and must not be used in real policies.)
-
-```js
-{
-    "default": [{"type": "reject"}], /* Reject anything not explicitly allowed */
-    "transports": {
-        "docker": {
-            /* Allow installing images from a specific repository namespace, without cryptographic verification.
-               This namespace includes images like openshift/hello-openshift and openshift/origin. */
-            "docker.io/openshift": [{"type": "insecureAcceptAnything"}],
-            /* Similarly, allow installing the “official” busybox images.  Note how the fully expanded
-               form, with the explicit /library/, must be used. */
-            "docker.io/library/busybox": [{"type": "insecureAcceptAnything"}]
-            /* Other docker: images use the global default policy and are rejected */
-        },
-        "dir": {
-            "": [{"type": "insecureAcceptAnything"}] /* Allow any images originating in local directories */
-        },
-        "atomic": {
-            /* The common case: using a known key for a repository or set of repositories */
-            "hostname:5000/myns/official": [
-                {
-                    "type": "signedBy",
-                    "keyType": "GPGKeys",
-                    "keyPath": "/path/to/official-pubkey.gpg"
-                }
-            ],
-            /* A more complex example, for a repository which contains a mirror of a third-party product,
-               which must be signed-off by local IT */
-            "hostname:5000/vendor/product": [
-                { /* Require the image to be signed by the original vendor, using the vendor's repository location. */
-                    "type": "signedBy",
-                    "keyType": "GPGKeys",
-                    "keyPath": "/path/to/vendor-pubkey.gpg",
-                    "signedIdentity": {
-                        "type": "exactRepository",
-                        "dockerRepository": "vendor-hostname/product/repository"
-                    }
-                },
-                { /* Require the image to _also_ be signed by a local reviewer. */
-                    "type": "signedBy",
-                    "keyType": "GPGKeys",
-                    "keyPath": "/path/to/reviewer-pubkey.gpg"
-                }
-            ]
-        }
-    }
-}
-```
-
-### Completely disable security, allow all images, do not trust any signatures
-
-```json
-{
-    "default": [{"type": "insecureAcceptAnything"}]
-}
-```
-# SEE ALSO
-  atomic(1)
-
-# HISTORY
-September 2016, Originally compiled by Miloslav Trmač <mitr@redhat.com>
--- a/SOURCES/registries.conf
+++ b/SOURCES/registries.conf
@ -1,25 +0,0 @@
-# This is a system-wide configuration file used to
-# keep track of registries for various container backends.
-# It adheres to TOML format and does not support recursive
-# lists of registries.
-
-# The default location for this configuration file is /etc/containers/registries.conf.
-
-# The only valid categories are: 'registries.search', 'registries.insecure', 
-# and 'registries.block'.
-
-[registries.search]
-registries = ['registry.redhat.io', 'quay.io', 'docker.io']
-
-# If you need to access insecure registries, add the registry's fully-qualified name.
-# An insecure registry is one that does not have a valid SSL certificate or only does HTTP.
-[registries.insecure]
-registries = []
-
-
-# If you need to block pull access from a registry, uncomment the section below
-# and add the registries fully-qualified name.
-#
-# Docker only
-[registries.block]
-registries = []
--- a/SOURCES/registries.conf.5.md
+++ b/SOURCES/registries.conf.5.md
@ -1,41 +0,0 @@
-% registries.conf(5) System-wide registry configuration file
-% Brent Baude
-% Aug 2017
-
-# NAME
-registries.conf - Syntax of System Registry Configuration File
-
-# DESCRIPTION
-The REGISTRIES configuration file is a system-wide configuration file for container image
-registries. The file format is TOML.
-
-# FORMAT
-The TOML_format is used to build simple list format for registries under two
-categories: `search` and `insecure`. You can list multiple registries using
-as a comma separated list.
-
-Search registries are used when the caller of a container runtime does not fully specify the
-container image that they want to execute.  These registries are prepended onto the front
- of the specified container image until the named image is found at a registry.
-
-Insecure Registries.  By default container runtimes use TLS when retrieving images
-from a registry.  If the registry is not setup with TLS, then the container runtime
-will fail to pull images from the registry. If you add the registry to the list of
-insecure registries then the container runtime will attempt use standard web protocols to
-pull the image.  It also allows you to pull from a registry with self-signed certificates.
-Note insecure registries can be used for any registry, not just the
-registries listed under search.
-
-The following example configuration defines two searchable registries and one
-insecure registry.
-
-```
-[registries.search]
-registries = ["registry1.com", "registry2.com"]
-
-[registries.insecure]
-registries = ["registry3.com"]
-```
-
-# HISTORY
-Aug 2017, Originally compiled by Brent Baude <bbaude@redhat.com>
--- a/SOURCES/seccomp.json
+++ b/SOURCES/seccomp.json
@ -1,773 +0,0 @@
-{
-	"defaultAction": "SCMP_ACT_ERRNO",
-	"archMap": [
-		{
-			"architecture": "SCMP_ARCH_X86_64",
-			"subArchitectures": [
-				"SCMP_ARCH_X86",
-				"SCMP_ARCH_X32"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_AARCH64",
-			"subArchitectures": [
-				"SCMP_ARCH_ARM"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_MIPS64",
-			"subArchitectures": [
-				"SCMP_ARCH_MIPS",
-				"SCMP_ARCH_MIPS64N32"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_MIPS64N32",
-			"subArchitectures": [
-				"SCMP_ARCH_MIPS",
-				"SCMP_ARCH_MIPS64"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_MIPSEL64",
-			"subArchitectures": [
-				"SCMP_ARCH_MIPSEL",
-				"SCMP_ARCH_MIPSEL64N32"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_MIPSEL64N32",
-			"subArchitectures": [
-				"SCMP_ARCH_MIPSEL",
-				"SCMP_ARCH_MIPSEL64"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_S390X",
-			"subArchitectures": [
-				"SCMP_ARCH_S390"
-			]
-		}
-	],
-	"syscalls": [
-		{
-			"names": [
-				"accept",
-				"accept4",
-				"access",
-				"adjtimex",
-				"alarm",
-				"bind",
-				"brk",
-				"capget",
-				"capset",
-				"chdir",
-				"chmod",
-				"chown",
-				"chown32",
-				"clock_getres",
-				"clock_gettime",
-				"clock_nanosleep",
-				"close",
-				"connect",
-				"copy_file_range",
-				"creat",
-				"dup",
-				"dup2",
-				"dup3",
-				"epoll_create",
-				"epoll_create1",
-				"epoll_ctl",
-				"epoll_ctl_old",
-				"epoll_pwait",
-				"epoll_wait",
-				"epoll_wait_old",
-				"eventfd",
-				"eventfd2",
-				"execve",
-				"execveat",
-				"exit",
-				"exit_group",
-				"faccessat",
-				"fadvise64",
-				"fadvise64_64",
-				"fallocate",
-				"fanotify_mark",
-				"fchdir",
-				"fchmod",
-				"fchmodat",
-				"fchown",
-				"fchown32",
-				"fchownat",
-				"fcntl",
-				"fcntl64",
-				"fdatasync",
-				"fgetxattr",
-				"flistxattr",
-				"flock",
-				"fork",
-				"fremovexattr",
-				"fsetxattr",
-				"fstat",
-				"fstat64",
-				"fstatat64",
-				"fstatfs",
-				"fstatfs64",
-				"fsync",
-				"ftruncate",
-				"ftruncate64",
-				"futex",
-				"futimesat",
-				"getcpu",
-				"getcwd",
-				"getdents",
-				"getdents64",
-				"getegid",
-				"getegid32",
-				"geteuid",
-				"geteuid32",
-				"getgid",
-				"getgid32",
-				"getgroups",
-				"getgroups32",
-				"getitimer",
-				"getpeername",
-				"getpgid",
-				"getpgrp",
-				"getpid",
-				"getppid",
-				"getpriority",
-				"getrandom",
-				"getresgid",
-				"getresgid32",
-				"getresuid",
-				"getresuid32",
-				"getrlimit",
-				"get_robust_list",
-				"getrusage",
-				"getsid",
-				"getsockname",
-				"getsockopt",
-				"get_thread_area",
-				"gettid",
-				"gettimeofday",
-				"getuid",
-				"getuid32",
-				"getxattr",
-				"inotify_add_watch",
-				"inotify_init",
-				"inotify_init1",
-				"inotify_rm_watch",
-				"io_cancel",
-				"ioctl",
-				"io_destroy",
-				"io_getevents",
-				"ioprio_get",
-				"ioprio_set",
-				"io_setup",
-				"io_submit",
-				"ipc",
-				"kill",
-				"lchown",
-				"lchown32",
-				"lgetxattr",
-				"link",
-				"linkat",
-				"listen",
-				"listxattr",
-				"llistxattr",
-				"_llseek",
-				"lremovexattr",
-				"lseek",
-				"lsetxattr",
-				"lstat",
-				"lstat64",
-				"madvise",
-				"memfd_create",
-				"mincore",
-				"mkdir",
-				"mkdirat",
-				"mknod",
-				"mknodat",
-				"mlock",
-				"mlock2",
-				"mlockall",
-				"mmap",
-				"mmap2",
-				"mprotect",
-				"mq_getsetattr",
-				"mq_notify",
-				"mq_open",
-				"mq_timedreceive",
-				"mq_timedsend",
-				"mq_unlink",
-				"mremap",
-				"msgctl",
-				"msgget",
-				"msgrcv",
-				"msgsnd",
-				"msync",
-				"munlock",
-				"munlockall",
-				"munmap",
-				"nanosleep",
-				"newfstatat",
-				"_newselect",
-				"open",
-				"openat",
-				"pause",
-				"pipe",
-				"pipe2",
-				"poll",
-				"ppoll",
-				"prctl",
-				"pread64",
-				"preadv",
-				"preadv2",
-				"prlimit64",
-				"pselect6",
-				"pwrite64",
-				"pwritev",
-				"pwritev2",
-				"read",
-				"readahead",
-				"readlink",
-				"readlinkat",
-				"readv",
-				"recv",
-				"recvfrom",
-				"recvmmsg",
-				"recvmsg",
-				"remap_file_pages",
-				"removexattr",
-				"rename",
-				"renameat",
-				"renameat2",
-				"restart_syscall",
-				"rmdir",
-				"rt_sigaction",
-				"rt_sigpending",
-				"rt_sigprocmask",
-				"rt_sigqueueinfo",
-				"rt_sigreturn",
-				"rt_sigsuspend",
-				"rt_sigtimedwait",
-				"rt_tgsigqueueinfo",
-				"sched_getaffinity",
-				"sched_getattr",
-				"sched_getparam",
-				"sched_get_priority_max",
-				"sched_get_priority_min",
-				"sched_getscheduler",
-				"sched_rr_get_interval",
-				"sched_setaffinity",
-				"sched_setattr",
-				"sched_setparam",
-				"sched_setscheduler",
-				"sched_yield",
-				"seccomp",
-				"select",
-				"semctl",
-				"semget",
-				"semop",
-				"semtimedop",
-				"send",
-				"sendfile",
-				"sendfile64",
-				"sendmmsg",
-				"sendmsg",
-				"sendto",
-				"setfsgid",
-				"setfsgid32",
-				"setfsuid",
-				"setfsuid32",
-				"setgid",
-				"setgid32",
-				"setgroups",
-				"setgroups32",
-				"setitimer",
-				"setpgid",
-				"setpriority",
-				"setregid",
-				"setregid32",
-				"setresgid",
-				"setresgid32",
-				"setresuid",
-				"setresuid32",
-				"setreuid",
-				"setreuid32",
-				"setrlimit",
-				"set_robust_list",
-				"setsid",
-				"setsockopt",
-				"set_thread_area",
-				"set_tid_address",
-				"setuid",
-				"setuid32",
-				"setxattr",
-				"shmat",
-				"shmctl",
-				"shmdt",
-				"shmget",
-				"shutdown",
-				"sigaltstack",
-				"signalfd",
-				"signalfd4",
-				"sigreturn",
-				"socket",
-				"socketcall",
-				"socketpair",
-				"splice",
-				"stat",
-				"stat64",
-				"statfs",
-				"statfs64",
-				"statx",
-				"symlink",
-				"symlinkat",
-				"sync",
-				"sync_file_range",
-				"syncfs",
-				"sysinfo",
-				"syslog",
-				"tee",
-				"tgkill",
-				"time",
-				"timer_create",
-				"timer_delete",
-				"timerfd_create",
-				"timerfd_gettime",
-				"timerfd_settime",
-				"timer_getoverrun",
-				"timer_gettime",
-				"timer_settime",
-				"times",
-				"tkill",
-				"truncate",
-				"truncate64",
-				"ugetrlimit",
-				"umask",
-				"uname",
-				"unlink",
-				"unlinkat",
-				"utime",
-				"utimensat",
-				"utimes",
-				"vfork",
-				"vmsplice",
-				"wait4",
-				"waitid",
-				"waitpid",
-				"write",
-				"writev",
-				"mount",
-				"umount2",
-				"reboot",
-				"name_to_handle_at",
-				"unshare"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"personality"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 0,
-					"value": 0,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_EQ"
-				}
-			],
-			"comment": "",
-			"includes": {},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"personality"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 0,
-					"value": 8,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_EQ"
-				}
-			],
-			"comment": "",
-			"includes": {},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"personality"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 0,
-					"value": 131072,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_EQ"
-				}
-			],
-			"comment": "",
-			"includes": {},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"personality"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 0,
-					"value": 131080,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_EQ"
-				}
-			],
-			"comment": "",
-			"includes": {},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"personality"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 0,
-					"value": 4294967295,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_EQ"
-				}
-			],
-			"comment": "",
-			"includes": {},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"sync_file_range2"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"arches": [
-					"ppc64le"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"arm_fadvise64_64",
-				"arm_sync_file_range",
-				"sync_file_range2",
-				"breakpoint",
-				"cacheflush",
-				"set_tls"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"arches": [
-					"arm",
-					"arm64"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"arch_prctl"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"arches": [
-					"amd64",
-					"x32"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"modify_ldt"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"arches": [
-					"amd64",
-					"x32",
-					"x86"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"s390_pci_mmio_read",
-				"s390_pci_mmio_write",
-				"s390_runtime_instr"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"arches": [
-					"s390",
-					"s390x"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"open_by_handle_at"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_DAC_READ_SEARCH"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"bpf",
-				"clone",
-				"fanotify_init",
-				"lookup_dcookie",
-				"mount",
-				"name_to_handle_at",
-				"perf_event_open",
-				"quotactl",
-				"setdomainname",
-				"sethostname",
-				"setns",
-				"umount",
-				"umount2",
-				"unshare"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_ADMIN"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"clone"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 0,
-					"value": 2080505856,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_MASKED_EQ"
-				}
-			],
-			"comment": "",
-			"includes": {},
-			"excludes": {
-				"caps": [
-					"CAP_SYS_ADMIN"
-				],
-				"arches": [
-					"s390",
-					"s390x"
-				]
-			}
-		},
-		{
-			"names": [
-				"clone"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 1,
-					"value": 2080505856,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_MASKED_EQ"
-				}
-			],
-			"comment": "s390 parameter ordering for clone is different",
-			"includes": {
-				"arches": [
-					"s390",
-					"s390x"
-				]
-			},
-			"excludes": {
-				"caps": [
-					"CAP_SYS_ADMIN"
-				]
-			}
-		},
-		{
-			"names": [
-				"reboot"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_BOOT"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"chroot"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_CHROOT"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"delete_module",
-				"init_module",
-				"finit_module",
-				"query_module"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_MODULE"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"get_mempolicy",
-				"mbind",
-				"name_to_handle_at",
-				"set_mempolicy"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_NICE"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"acct"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_PACCT"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"kcmp",
-				"process_vm_readv",
-				"process_vm_writev",
-				"ptrace"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_PTRACE"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"iopl",
-				"ioperm"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_RAWIO"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"settimeofday",
-				"stime",
-				"clock_settime"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_TIME"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"vhangup"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_TTY_CONFIG"
-				]
-			},
-			"excludes": {}
-		}
-	]
-}
--- a/SOURCES/storage.conf
+++ b/SOURCES/storage.conf
@ -1,114 +0,0 @@
-# storage.conf is the configuration file for all tools
-# that share the containers/storage libraries
-# See man 5 containers-storage.conf for more information
-# The "container storage" table contains all of the server options.
-[storage]
-
-# Default Storage Driver
-driver = "overlay"
-
-# Temporary storage location
-runroot = "/var/run/containers/storage"
-
-# Primary Read/Write location of container storage
-graphroot = "/var/lib/containers/storage"
-
-[storage.options]
-# Storage options to be passed to underlying storage drivers
-
-# AdditionalImageStores is used to pass paths to additional Read/Only image stores
-# Must be comma separated list.
-additionalimagestores = [
-]
-
-# Size is used to set a maximum size of the container image.  Only supported by
-# certain container storage drivers.
-size = ""
-
-# OverrideKernelCheck tells the driver to ignore kernel checks based on kernel version
-override_kernel_check = "true"
-
-# Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of
-# a container, to UIDs/GIDs as they should appear outside of the container, and
-# the length of the range of UIDs/GIDs.  Additional mapped sets can be listed
-# and will be heeded by libraries, but there are limits to the number of
-# mappings which the kernel will allow when you later attempt to run a
-# container.
-#
-# remap-uids = 0:1668442479:65536
-# remap-gids = 0:1668442479:65536
-
-# Remap-User/Group is a name which can be used to look up one or more UID/GID
-# ranges in the /etc/subuid or /etc/subgid file.  Mappings are set up starting
-# with an in-container ID of 0 and the a host-level ID taken from the lowest
-# range that matches the specified name, and using the length of that range.
-# Additional ranges are then assigned, using the ranges which specify the
-# lowest host-level IDs first, to the lowest not-yet-mapped container-level ID,
-# until all of the entries have been used for maps.
-#
-# remap-user = "storage"
-# remap-group = "storage"
-
-[storage.options.thinpool]
-# Storage Options for thinpool
-
-# autoextend_percent determines the amount by which pool needs to be
-# grown. This is specified in terms of % of pool size. So a value of 20 means
-# that when threshold is hit, pool will be grown by 20% of existing
-# pool size.
-# autoextend_percent = "20"
-
-# autoextend_threshold determines the pool extension threshold in terms
-# of percentage of pool size. For example, if threshold is 60, that means when
-# pool is 60% full, threshold has been hit.
-# autoextend_threshold = "80"
-
-# basesize specifies the size to use when creating the base device, which
-# limits the size of images and containers.
-# basesize = "10G"
-
-# blocksize specifies a custom blocksize to use for the thin pool.
-# blocksize="64k"
-
-# directlvm_device specifies a custom block storage device to use for the
-# thin pool. Required if you setup devicemapper
-# directlvm_device = ""
-
-# directlvm_device_force wipes device even if device already has a filesystem
-# directlvm_device_force = "True"
-
-# fs specifies the filesystem type to use for the base device.
-# fs="xfs"
-
-# log_level sets the log level of devicemapper.
-# 0: LogLevelSuppress 0 (Default)
-# 2: LogLevelFatal
-# 3: LogLevelErr
-# 4: LogLevelWarn
-# 5: LogLevelNotice
-# 6: LogLevelInfo
-# 7: LogLevelDebug
-# log_level = "7"
-
-# min_free_space specifies the min free space percent in a thin pool require for
-# new device creation to succeed. Valid values are from 0% - 99%.
-# Value 0% disables
-# min_free_space = "10%"
-
-# mkfsarg specifies extra mkfs arguments to be used when creating the base
-# device.
-# mkfsarg = ""
-
-# mountopt specifies extra mount options used when mounting the thin devices.
-# mountopt = ""
-
-# use_deferred_removal Marking device for deferred removal
-# use_deferred_removal = "True"
-
-# use_deferred_deletion Marking device for deferred deletion
-# use_deferred_deletion = "True"
-
-# xfs_nospace_max_retries specifies the maximum number of retries XFS should
-# attempt to complete IO when ENOSPC (no space) error is returned by
-# underlying storage device.
-# xfs_nospace_max_retries = "0"
--- a/SPECS/skopeo.spec
+++ b/SPECS/skopeo.spec
@ -1,79 +1,72 @@
-%global with_debug 1
 %global with_check 0

-%if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif

 %if 0%{?rhel} > 7 && ! 0%{?fedora}
 %define gobuild(o:) \
-go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
-%endif # distro
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**};
+%else
+%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**};
+%endif

-%global provider github
-%global provider_tld com
-%global project containers
-%global repo skopeo
-# https://github.com/containers/skopeo
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global git0 https://%{import_path}
-%global commit0 1715c9084124875cb71f006916396e3c7d03014e
+%global branch release-1.6
+%global import_path github.com/containers/%{name}
+%global commit0 c20c32dc25f4bb0ec2e0cfadb51d692f4b0b50ca
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})

-# manually listed arches due https://bugzilla.redhat.com/show_bug.cgi?id=1391932 (removed ppc64)
-# remove ix86 temporarily because go-toolset issues
-ExcludeArch: ppc64 %{ix86}
-
-Name: %{repo}
-Epoch: 1
-Version: 0.1.32
-Release: 6.git%{shortcommit0}%{?dist}
-Summary: Inspect Docker images and repositories on registries
+Epoch: 2
+Name: skopeo
+Version: 1.6.2
+Release: 5%{?dist}
+Summary: Inspect container images and repositories on registries
 License: ASL 2.0
-URL: %{git0}
-Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
-Source1: storage.conf
-Source2: containers-storage.conf.5.md
-Source3: mounts.conf
-Source4: registries.conf.5.md
-Source5: registries.conf
-Source6: policy.json.5.md
-Source7: seccomp.json
-BuildRequires: git
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-BuildRequires: golang-github-cpuguy83-go-md2man
+URL: https://%{import_path}
+# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
+ExclusiveArch: %{go_arches}
+%if 0%{?branch:1}
+Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
+%else
+Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
+%endif
+BuildRequires: git-core
+BuildRequires: golang >= 1.17.7
+BuildRequires: go-md2man
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: pkgconfig(devmapper)
-BuildRequires: ostree-devel
 BuildRequires: glib2-devel
-Requires: containers-common = %{epoch}:%{version}-%{release}
+BuildRequires: make
+Requires: containers-common >= 2:1-2
+Requires: system-release

 %description
 Command line utility to inspect images and repositories directly on Docker
 registries without the need to pull them

-%package -n containers-common
-Summary: Configuration files for working with image signatures
-Obsoletes: atomic <= 1:1.13.1-2
-Conflicts: atomic-registries <= 1:1.22.1-1
-Obsoletes: docker-rhsubscription <= 2:1.13.1-31
-Provides: %{name}-containers = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-containers <= 1:0.1.31-3
-Recommends: fuse-overlayfs
-Recommends: slirp4netns
+%package tests
+Summary: Tests for %{name}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+#Requires: bats  (which RHEL8 doesn't have. If it ever does, un-comment this)
+Requires: gnupg
+Requires: jq
+Requires: podman
+Requires: httpd-tools
+Requires: openssl

-%description -n containers-common
-This package installs a default signature store configuration and a default
-policy under `/etc/containers/`.
+%description tests
+%{summary}
+
+This package contains system tests for %{name}

 %prep
+%if 0%{?branch:1}
+%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%else
 %autosetup -Sgit -n %{name}-%{commit0}
+%endif
+sed -i 's/install-binary: bin\/%{name}/install-binary:/' Makefile
+sed -i 's/install-docs: docs/install-docs:/' Makefile

 %build
 mkdir -p src/github.com/containers
@ -87,76 +80,519 @@ for v in vendor/*; do
    fi
 done

-export GOPATH=$(pwd):$(pwd)/vendor:%{gopath}
-#make BUILDTAGS='exclude_graphdriver_btrfs' binary-local docs
-export BUILDTAGS="exclude_graphdriver_btrfs"
-%gobuild -o %{name} ./cmd/%{name}
-make docs
+export GOPATH=$(pwd):$(pwd)/vendor
+export GO111MODULE=off
+export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+export BUILDTAGS="exclude_graphdriver_btrfs btrfs_noversion $(hack/libdm_tag.sh)"
+mkdir -p bin
+%gobuild -o bin/%{name} ./cmd/%{name}
+%{__make} docs

 %install
-make DESTDIR=%{buildroot} install
-mkdir -p %{buildroot}%{_sysconfdir}
-install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/storage.conf
-mkdir -p %{buildroot}%{_mandir}/man5
-go-md2man -in %{SOURCE2} -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5
-go-md2man -in %{SOURCE4} -out %{buildroot}%{_mandir}/man5/registries.conf.5
-install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/
-go-md2man -in %{SOURCE6} -out %{buildroot}%{_mandir}/man5/policy.json.5
+make install-binary install-docs install-completions DESTDIR=%{buildroot} PREFIX=%{_prefix}

-mkdir -p %{buildroot}%{_datadir}/containers
-install -m0644 %{SOURCE3} %{buildroot}%{_datadir}/containers/mounts.conf
-install -m0644 %{SOURCE7} %{buildroot}%{_datadir}/containers/seccomp.json
-
-# install secrets patch directory
-install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets
-# rhbz#1110876 - update symlinks for subscription management
-ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
-ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
-ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo
+# system tests
+install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
+cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/

 %check
 %if 0%{?with_check}
 export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
+
 %gotest %{import_path}/integration
 %endif

 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}

-%files -n containers-common
-%dir %{_sysconfdir}/containers
-%dir %{_sysconfdir}/containers/registries.d
-%config(noreplace) %{_sysconfdir}/containers/policy.json
-%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
-%config(noreplace) %{_sysconfdir}/containers/storage.conf 
-%config(noreplace) %{_sysconfdir}/containers/registries.conf
-%dir %{_sharedstatedir}/atomic/sigstore
-%{_mandir}/man5/*
-%dir %{_datadir}/containers
-%{_datadir}/containers/mounts.conf
-%{_datadir}/containers/seccomp.json
-%dir %{_datadir}/rhel/secrets
-%{_datadir}/rhel/secrets/etc-pki-entitlement
-%{_datadir}/rhel/secrets/rhel7.repo
-%{_datadir}/rhel/secrets/rhsm
-
 %files
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/%{name}*
 %dir %{_datadir}/bash-completion
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/%{name}

+%files tests
+%license LICENSE
+%{_datadir}/%{name}/test
+
 %changelog
-* Fri Jun 26 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.32-6.git1715c90
- bump release to preserve upgrade path
+* Tue Aug 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.6.2-5
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6
+  (https://github.com/containers/skopeo/commit/c20c32d)
+- Related: #2061390
+
+* Fri Jul 29 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.6.2-4
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6
+  (https://github.com/containers/skopeo/commit/f952195)
+- Related: #2061390
+
+* Wed Jul 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.6.2-3
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6
+  (https://github.com/containers/skopeo/commit/4414e52)
+- Related: #2061390
+
+* Fri May 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.6.2-2
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6
+  (https://github.com/containers/skopeo/commit/4336972)
+- Related: #2061390
+
+* Fri Apr 29 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.6.2-1
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6
+  (https://github.com/containers/skopeo/commit/540efb3)
+- Related: #2061390
+
+* Fri Apr 29 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.6.1-3
+- consume release-1.6 branch for the 4.0 stable stream
+- Related: #2061390
+
+* Fri Apr 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-2
+- bump golang BR to 1.17.7
+- Related: #2061390
+
+* Fri Mar 25 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.7.0
+- Related: #2061390
+
+* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.6.1-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.6.1
+- Related: #2001445
+
+* Thu Feb 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.6.0-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.6.0
+- Related: #2001445
+
+* Mon Nov 29 2021 Jindrich Novy <jnovy@redhat.com> - 2:1.5.2-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.5.2
+- Related: #2001445
+
+* Wed Nov 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1.5.1-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.5.1
+- Related: #2001445
+
+* Fri Oct 15 2021 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-2
+- bump Epoch to preserve upgrade path
+- Related: #2001445
+
+* Wed Oct 13 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.5.0-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.5.0
+- Related: #2001445
+
+* Wed Oct 13 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.5.1-0.3
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/9c9a9f3)
+- Related: #2001445
+
+* Fri Oct 08 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.5.1-0.2
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/116e75f)
+- Related: #2001445
+
+* Thu Oct 07 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.5.1-0.1
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/fc81803)
+- Related: #2001445
+
+* Wed Oct 06 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.12
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/ff88d3f)
+- Related: #2001445
+
+* Mon Oct 04 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.11
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/a95b0cc)
+- Related: #2001445
+
+* Fri Oct 01 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.10
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/53cf287)
+- Related: #2001445
+
+* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.9
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/86fa758)
+- Related: #2001445
+
+* Mon Sep 27 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.8
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/4d3588e)
+- Related: #2001445
+
+* Thu Sep 23 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.7
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/25d3e7b)
+- Related: #2001445
+
+* Wed Sep 22 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.6
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/c5a5199)
+- Related: #2001445
+
+* Tue Sep 21 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.5
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/db1e814)
+- Related: #2001445
+
+* Fri Sep 17 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.4
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/31b8981)
+- Related: #2001445
+
+* Wed Sep 15 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.3
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/177443f)
+- Related: #2001445
+
+* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-0.2
+- update to the latest content of https://github.com/containers/skopeo/tree/main
+  (https://github.com/containers/skopeo/commit/47b8082)
+- Related: #2001445
+
+* Thu Aug 26 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.2-0.1
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.4
+  (https://github.com/containers/skopeo/commit/01e51ce)
+- Related: #1934415
+
+* Wed Aug 25 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-2
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.4
+  (https://github.com/containers/skopeo/commit/130f32f)
+- Related: #1934415
+
+* Fri Aug 20 2021 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.4.1-1
+- update to v1.4.1
+- Related: #1934415
+
+* Tue Aug 17 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-7
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.4
+  (https://github.com/containers/skopeo/commit/ea32394)
+- Related: #1934415
+
+* Wed Aug 11 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-6
+- carve away containers-common - it's now a separate package
+- Related: #1934415
+
+* Fri Aug 06 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-5
+- be sure short-name-mode is permissive in RHEL8
+- Related: #1934415
+
+* Wed Aug 04 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-4
+- don't define short-name-mode in RHEL8
+- Related: #1934415
+
+* Tue Aug 03 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-3
+- re-add Requires: runc
+- Related: #1934415
+
+* Tue Aug 03 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-2
+- update to 1.4.0 release and switch to the release-1.4 maint branch
+- Related: #1934415
+
+* Mon Aug 02 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-1
+- update vendored components
+- ship /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release only on non-RHEL and
+  CentOS distros
+- Related: #1934415
+
+* Wed Jul 21 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-7
+- switch to "main" branch of podman
+- Related: #1934415
+
+* Wed Jul 21 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-6
+- move unqualified-search-registries to [registries.search]
+- Resolves: #1977280
+
+* Thu Jul 15 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-5
+- update shortnames from Pyxis
+- Related: #1934415
+
+* Wed Jul 07 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-4
+- add direct runc dependency to avoid situation when runc is listed
+  as default runtime but only crun is present in RHEL8
+- Related: #1934415
+
+* Mon Jul 05 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-3
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.3
+  (https://github.com/containers/skopeo/commit/038f70e)
+- Related: #1934415
+
+* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-2
+- use v3.2 branch for podman and update vendored branches
+- Related: #1934415
+
+* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.3.1
+- Related: #1934415
+
+* Mon Jun 28 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-5
+- update shortname overrides
+- Related: #1952204
+
+* Thu Jun 10 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-4
+- sync with Pyxis
+- use containers-mounts.conf.5.md from containers/common
+- Related: #1934415
+
+* Mon May 24 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-3
+- update to new versions of vendored components
+- fail is there is an issue in communication with Pyxis API
+- understand devel branch in update.sh script
+- Related: #1934415
+
+* Fri May 21 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-2
+- fix filelist with the new upstream release
+- Related: #1934415
+
+* Thu May 20 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.3.0
+- Related: #1934415
+
+* Tue May 11 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.3-3
+- update vendored components versions
+- sync shortnames with pyxis
+- Related: #1934415
+
+* Mon Apr 26 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.3-2
+- assure runc is set as default runtime in RHEL8
+- update shortnames from upstream
+- sync vendored component versions with upstream
+- Related: #1934415
+
+* Mon Apr 26 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.3-1
+- update to skopeo-1.2.3
+- sync with Fedora deps
+- fix typo in upstream Makefile
+- Related: #1934415
+
+* Thu Apr 22 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.2-6
+- add update-vendored.sh, pyxis.sh and amend the shortname generation
+- Related: #1934415
+
+* Wed Apr 07 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.2-5
+- require crun >= 0.19 and set it as default OCI runtime
+- add ensure() function to update.sh so that configuration statements
+  can be easily amended/reviewed
+- Related: #1934415
+
+* Mon Mar 15 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.2-4
+- use infra_image = "registry.redhat.io/ubi8/pause" in containers.conf
+  (unlike previous one ubi8/pause doesn't require authentication)
+- Related: #1934415
+
+* Fri Mar 12 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.2-3
+- use infra_image = "registry.redhat.io/rhel8/pause" in contiainers.conf
+- add update-vendored.sh script which will always assure we ship
+  documentation/configs for versions vendored in podman, buildah and
+  skopeo
+- Related: #1934415
+
+* Wed Mar 03 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.2-2
+- use rhel-shortnames only from trusted registries
+- sync with config files from current versions of vendored projects
+- Resolves: #1933775
+- Resolves: #1933776
+
+* Fri Feb 19 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.2-1
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.2
+  (https://github.com/containers/skopeo/commit/e72dd9c)
+- Related: #1883490
+
+* Thu Feb 18 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-14
+- rename shortnames.conf to 000-shortnames.conf to assure evaluation order
+- Related: #1883490
+
+* Thu Feb 18 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-13
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.2
+  (https://github.com/containers/skopeo/commit/3abb778)
+- Related: #1883490
+
+* Mon Feb 15 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-12
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.2
+  (https://github.com/containers/skopeo/commit/b4210c0)
+- Resolves: #1914884
+
+* Sat Feb 06 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-11
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.2
+  (https://github.com/containers/skopeo/commit/6c0e35a)
+- Related: #1883490
+
+* Tue Feb 02 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-10
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.2
+  (https://github.com/containers/skopeo/commit/a05ddb8)
+- Related: #1883490
+
+* Sun Jan 31 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-9
+- define 8.4.0 branch for podman (v3.0)
+- remove redundant source file
+- Related: #1883490
+
+* Sun Jan 31 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-8
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.2
+  (https://github.com/containers/skopeo/commit/2e90a8a)
+- Related: #1883490
+
+* Fri Jan 29 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-7
+- convert subscription-manager from weak dep to a hint
+- Related: #1883490
+
+* Tue Jan 19 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-6
+- fix rhel-shortnames.conf generation (avoid duplicates and records
+  with invalid URL)
+- Related: #1883490
+
+* Mon Jan 18 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-5
+- assure "NET_RAW" is always defined
+- support rhel-shortnames.conf with generated shortname/registry aliases
+- Related: #1883490
+
+* Fri Jan 15 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-4
+- add "NET_RAW" default capability
+- Related: #1883490
+
+* Tue Jan 12 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-3
+- ship preconfigured /etc/containers/registries.d/ files with containers-common
+- Related: #1883490
+
+* Tue Jan 12 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-2
+- add shortnames from https://github.com/containers/shortnames
+- Related: #1883490
+
+* Mon Jan 11 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-1
+- update vendored component versions
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.2
+  (https://github.com/containers/skopeo/commit/2e90a8a)
+- Related: #1883490
+
+* Fri Jan 08 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-6
+- gating tests fixes and bump podman branch
+- Related: #1883490
+
+* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-5
+- still use arch exclude as the go_arches macro is broken for 8.4
+- Related: #1883490
+
+* Wed Dec 02 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-4
+- unify vendored branches
+- add validation script
+- Related: #1883490
+
+* Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-3
+- simplify spec file
+- use short commit ID in tarball name
+- Related: #1883490
+
+* Fri Oct 23 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-2
+- synchronize with stream-container-tools-rhel8
+- Related: #1883490
+
+* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-1
+- synchronize with stream-container-tools-rhel8
+- Related: #1883490
+
+* Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-3
+- propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization
 - Related: #1821193

-* Thu Nov 28 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.32-4.git1715c90
+* Wed Jul 29 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-2
+- drop applied patches
+- Related: #1821193
+
+* Wed Jul 29 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.1.1
+- Related: #1821193
+
+* Thu Jul 23 2020 Eduardo Santiago <santiago@redhat.com> - 1:1.1.0-3
+- fix broken gating tests: docker unexpectedly removed htpasswd from
+  their 'registry:2' image, so we now use htpasswd from httpd-tools on host.
+
+* Fri Jul 17 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.1.0-2
+- fix "CVE-2020-14040 skopeo: golang.org/x/text: possibility to trigger an infinite loop in encoding/unicode could lead to crash [rhel-8]"
+- Resolves: #1854719
+
+* Fri Jun 19 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.1.0-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.1.0
+- Related: #1821193
+
+* Wed Jun 10 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.0.0-2
+- exclude i686 arch
+- Related: #1821193
+
+* Tue May 19 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.0.0-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.0.0
+- Related: #1821193
+
+* Tue May 12 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.2.0-6
+- synchronize containter-tools 8.3.0 with 8.2.1
+- Related: #1821193
+
+* Mon Apr 06 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.41-1
+- update to 0.1.41
+- Related: #1821193
+
+* Fri Mar 06 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-10
+- modify registries.conf default configuration to be more secure by default
+- Resolves: #1810053
+
+* Fri Feb 14 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-9
+- Fix CVE-2020-1702.
+- Resolves: #1801922
+
+* Thu Jan 02 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-8
+- change the search order of registries and remove quay.io (#1784267)
+
+* Wed Dec 11 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-7
+- compile in FIPS mode
+- Related: RHELPLAN-25139
+
+* Mon Dec 09 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-6
+- be sure to use golang >= 1.12.12-4
+- Related: RHELPLAN-25139
+
+* Wed Dec 04 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-5
+- fix file list
+- Related: RHELPLAN-25139
+
+* Wed Dec 04 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-4
+- fix symlinks in /usr/share/rhel/secrets and make
+  subscription-manager soft dependency to make them work
+- Related: RHELPLAN-25139
+
+* Thu Nov 28 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-3
 - rebuild because of CVE-2019-9512 and CVE-2019-9514
- Resolves: #1772130, #1772135
+- Resolves: #1772132, #1772137
+
+* Wed Nov 20 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-2
+- comment out mountopt option in order to fix gating tests
+  see bug 1769769
+- Related: RHELPLAN-25139
+
+* Wed Nov 06 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-1
+- update to 0.1.40
+- Related: RHELPLAN-25139
+
+* Thu Sep 12 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.37-5
+- Fix CVE-2019-10214 (#1734651).
+
+* Thu Aug 15 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.37-4
+- fix permissions of rhel/secrets
+  Resolves: #1691543
+
+* Fri Jun 14 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.37-3
+- Resolves: #1719994 - add registry.access.redhat.com to registries.conf
+
+* Fri Jun 14 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.37-2
+- Resolves: #1721247 - enable fips mode
+
+* Fri Jun 14 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.37-1
+- Resolves: #1720654 - rebase to v0.1.37
+
+* Tue Jun  4 2019 Eduardo Santiago <santiago@redhat.com> - 1:0.1.36-1.git6307635
+- built upstream tag v0.1.36, including system tests
+
+* Tue Apr 30 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.32-4.git1715c90
+- Fixes @openshift/machine-config-operator#669
+- install /etc/containers/oci/hooks.d and /etc/containers/certs.d

 * Tue Dec 18 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:0.1.32-3.git1715c90
 - rebase