skopeo: update to v1.8.0

We drop our gpme patch, since it is no longer needed.

Bumping skopeo to version v1.8.0-75-gb95e0811, which comprises the following commits:

    61593fcc Revert "Change a repo used for sync tests"
    62158a58 Vendor unreleased c/image with OCI artifact support
    7900440a Use errors.As() instead of direct type checks
    c654871b Remove uses of pkg/errors
    7abcca93 Modify error messages on failures to close
    f7df4a08 Introduce noteCloseFailure, use it for reporting of cleanup errors
    33116235 Bump github.com/stretchr/testify from 1.7.5 to 1.8.0
    89089f3a Update IRC information
    ba6af16e Use bytes.ReplaceAll instead of bytes.Replace(..., -1)
    2024e2e2 Update & fix skopeo multiarch image Containerfiles
    774ff9d1 Cirrus: Migrate multiarch build off github actions
    899d3686 Bump github.com/stretchr/testify from 1.7.4 to 1.7.5
    2f77d213 Bump github.com/stretchr/testify from 1.7.2 to 1.7.4
    2009d1c6 Bump github.com/spf13/cobra from 1.4.0 to 1.5.0
    fe022809 [CI:DOCS] skopeo.spec.rpkg: Fix syntax highlighting
    71d450cb [CI:DOCS] Makefile: include cautionary note for rpm target
    37388544 CoPR: Autobuild rpm on rhcontainerbot/podman-next
    38f4b9d0 Enable schema1 support on the test registries
    1b5fb465 Update for docker/distribution CLI change
    e9ed5e04 Use an updated CI image
    bbdabebd Change a repo used for sync tests
    92c0d0c0 Use testing.T.Setenv instead of os.Setenv in tests
    a3a72342 Update go.mod to Go 1.17
    e9379d15 Bump github.com/docker/docker
    69840fd0 Bump github.com/stretchr/testify from 1.7.1 to 1.7.2
    63622bc7 Bump github.com/containers/ocicrypt from 1.1.4 to 1.1.5
    6b584598 Cirrus: use Ubuntu 22.04 LTS
    00a58e48 Update to github.com/opencontainers/runc >= 1.1.2
    263a5f01 fix make completions for all POSIX shells
    0a3be734 Update to gopkg.in/yaml.v3 v3.0.0
    0ad7ec24 Updated skopeo logo with new artwork
    014d47f3 [CI:DOCS] Pin actions to a full length commit SHA
    d78bc827 shell completion: add completion for transports names
    6c2a415f shell completion: add install instructions docs
    9bed0a9e shell completion: add Makefile target
    ebc5573e Stop calling gpgme-config
    1ebb2520 Update c/image
    9b4c1f15 Remove cgo_pthread_ordering_workaround.go
    6863fe2d add completion command to generate shell completion scripts
    3eca480c Bump github.com/docker/docker
    149dea8d Bump github.com/containers/storage from 1.40.2 to 1.41.0
    804f7c24 Avoid hard-coding the location of bash
    e47765ed Config files live in /usr/local/etc on FreeBSD
    13ceb93b Bump github.com/docker/docker
    cd4607f9 Move to v1.8.1-dev
    37727a45 Bump to v1.8.0
    75d94e79 Bump ocicrypt to v1.1.4
    737ed9c2 Vendor in containers/storage v1.40.2
    3c286dd1 Vendor in containers/(common, storage, image)
    b8b0e993 [CI:DOCS] install.md: include distro package info links
    d9035db6 [CI:DOCS] install.md: remove Kubic package info for Ubuntu
    916a395d Cirrus: Update to F36 w/ netavark+aardvark-dns
    8960ab3c Update vendor of containers/(common,storage,image)
    d9d3ceca Use filepath.WalkDir instead of filepath.Walk
    23a46057 Extract four copies of the same loop into a function
    4811c07d Update users of deprecated io/ioutil
    4ef35a38 Add option to specify the identity for signing
    38ae81fa Bump containers/image to include sign identity option
    9b09b6eb delete non-existent option in the cmdline example
    c233a6dc Add dry-run mode to skopeo-sync
    e6802c4d Update skopeoimage/README.md that tags are v-prefixed
    80871786 Bump to v1.7.1-dev
    f45ae950 Release 1.7.0
    3bc06242 Bump github.com/prometheus/client_golang to v1.11.1
    89cd1951 Bump github.com/containers/common from 0.47.4 to 0.47.5
    7f6b0e39 Bump github.com/containers/storage from 1.38.2 to 1.39.0
    f6bf5746 Bump github.com/docker/docker
    a9cc9b91 Improve the (skopeo delete) man page
    ac7edc7d Bump github.com/containers/ocicrypt from 1.1.2 to 1.1.3
    c819bc17 Update the command to install golint
    6a2f38d6 Formally record that we require Go 1.15
    2019b79c Use check.C.MkDir() instead of manual ioutil.TempDir() calls
    f79cc8ae Update to Go 1.14 and revendor
    ac4c291f Use assert.ErrorContains
    5aaf3a9e Bump github.com/stretchr/testify from 1.7.0 to 1.7.1
    bd524670 Simplify the proxy server a bit
    693de29e Add various missing error handling
    f44ee2f8 Remove assignments to an unused variable
    a7190099 Rename "self" receiver
    7ba56f3f Add support for docker-archive: to skopeo list-tags
    ad3e8f40 Bump github.com/spf13/cobra from 1.3.0 to 1.4.0
    0703ec6c Bump github.com/docker/docker
    52002728 Update github.com/containerd/containerd

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 2 insertions, 38 deletions

diff --git a/recipes-containers/skopeo/files/0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch b/recipes-containers/skopeo/files/0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch
deleted file mode 100644
index d8782966..00000000
--- a/recipes-containers/skopeo/files/0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1dd54dce3159f52a2d33693de95d124d1acb6ba9 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Tue, 24 Aug 2021 09:25:07 -0400
-Subject: [PATCH] Makefile: use pkg-config instead of gpgme-config
-
-OE taints gpgme-config to produce the following flag when called:
-
-   --should-not-have-used-/usr/bin/gpgme-config
-
-Which breaks the build. We change to use pkg-config, and skopeo
-builds as it did before.
-
-Upstream-Status: inappropriate OE specific
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/import/Makefile b/src/import/Makefile
-index 5721b06d..31875d44 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -8,7 +8,7 @@ export GOPROXY=https://proxy.golang.org
- # supports only pkg-config, not general shell scripts, and gpgme does not install a pkg-config file.
- # If gpgme is not installed or gpgme-config can’t be found for other reasons, the error is silently ignored
- # (and the user will probably find out because the cgo compilation will fail).
--GPGME_ENV := CGO_CFLAGS="$(shell gpgme-config --cflags 2>/dev/null)" CGO_LDFLAGS="$(shell gpgme-config --libs 2>/dev/null)"
-+GPGME_ENV := CGO_CFLAGS="$(shell pkg-config gpgme --cflags 2>/dev/null)" CGO_LDFLAGS="$(shell pkg-config gpgme --libs 2>/dev/null)"
- 
- # The following variables very roughly follow https://www.gnu.org/prep/standards/standards.html#Makefile-Conventions .
- DESTDIR ?=
--- 
-2.19.1
-
diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index 35377a8d..9d19675d 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_git.bb
@@ -21,13 +21,12 @@ RDEPENDS:${PN} = " \
 
 SRC_URI = " \
     git://github.com/containers/skopeo;branch=main;protocol=https \
-    file://0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch \
     file://storage.conf \
     file://registries.conf \
 "
 
-SRCREV = "3e2defd6d37b742adde2aac6cb01f6c3c17da8e2"
-PV = "v1.6.1+git${SRCPV}"
+SRCREV = "b95e081162382f9a28f400bee10046ce72b957fe"
+PV = "v1.8.0+git${SRCPV}"
 GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"