skoeo: update to 1.4.x release series

updating to the 1.4.x release series, we refresh our Makefile patch
and pick up the following commits:

    6b2aa5da [release-1.4] Bump to v1.4.2-dev
    130f32f0 [release-1.4] Bump to v1.4.1
    6f99811c [release-1.4] Bump c/image 5.15.2 c/storage 1.34.1 c/common 0.42.1
    a9f5f10c [release-1.4] Bump c/storage 1.34.0, c/image 5.15.1 and c/common 0.43.0
    a44da449 Release 1.4.0
    3d9340c8 vendor-in-container: update to golang:1.16
    961d5da7 Accept repositories on login/logout
    fb03e033 update c/common, c/image, c/storage
    d70ea890 Update on Building on Ubuntu
    ce6035b7 Add timeouts when waiting on OpenShift or the registry to start
    3a8d3cb5 Add docs and bash completions
    aeb61f65 Add support for decompressing while copying to dir://
    76eb9bc9 Update to enabled containers/image version
    a1f9318e Fix two instances of unused err found by go-staticcheck
    d82c6621 Bump github.com/containers/storage from 1.32.6 to 1.33.0
    f0c49b5c Multi-arch image build: Daily version-tag push
    5e550664 CONTRIBUTING: small fixes to commands
    726d982c Fix --tls-verify
    bb447f2f Test both imageOptions and imageDestOptions in TestTLSVerifyFlags
    2a98df6b Split testing of --tls-verify into separate TestTLSVerifyFlags
    a6cf2f42 Add the --tls-verify option to (skopeo logout)
    285a5cb6 Fix using images from rate-limited docker hub
    02bacf57 Use Fedora container for doccheck
    ae0595c5 Man page validation: part 2 of 2
    ec73ff3d docs: Adding info re container signatures
    e460b9aa [CI:DOCS] Multi-arch image workflow: Make steps generic
    ee054863 Update nix pin with `make nixpkgs`
    2476e99c Cirrus: Freshen CI images
    76103a6c Bump github.com/containers/common from 0.40.1 to 0.41.0
    990908bf Bump github.com/containers/storage from 1.32.5 to 1.32.6
    ede29c91 Remove an unnecessary break
    75f0183e Remove an unnecessary Sprintf
    7ace4265 Fix TestDockerRepositoryReferenceParser
    3d4fb09f Remove unused code
    4efeb71e Set cobra.Command.CompletionOption already in createApp
    a0ce5421 Bump version to v1.4.0-dev
    f80bf8a3 Revert "integration tests: disable `ls` for logs"
    c39b3dc2 CONTRIBUTING: update vendoring instructions
    8eaf0329 disable `completion` command
    aeb75f38 Bump github.com/spf13/cobra from 1.2.0 to 1.2.1
    83603a79 Bump github.com/spf13/cobra from 1.1.3 to 1.2.0
    6d6c8b56 Update tests for removal of error and Error from error messages
    09282bcf Fix some comments in man-page-checker
    09ca3ba4 Improve the description of (skopeo list-tags)
    22908fb3 Include the mandatory --output option in synopsis of (skopeo standalone-sign)
    a3725128 Support **non-replaceable strings** in synopsis
    e4d13920 Use (make validate-local) in the validate target
    e716b2fa man page checker - part 1 of 2
    97eaace7 Cirrus: Rename cross -> osx task, add cross task.
    30c0eb03 Bump github.com/containers/ocicrypt from 1.1.1 to 1.1.2
    5918513e Cirrus: Add vendor + tree status check
    b20c2d45 Run unit tests as well, not integration tests twice
    d0f7339b Bump github.com/containers/storage from 1.32.4 to 1.32.5
    012ed661 Reintroduce the GNU semantics of DESTDIR
    c30b904c Add --retry-times to markdown docs
    9fbb9abc Workaround quay.io image build failure
    4417dc44 Update brew to avoid 403 on accessing https://homebrew.bintray.com
    93b819a7 Fix automation re: master->main rename
    e7c5e9f7 Bump github.com/containers/storage from 1.32.3 to 1.32.4
    1eac38e3 Bump github.com/containers/common from 0.40.0 to 0.40.1
    b1e78efa Bump github.com/containers/storage from 1.32.2 to 1.32.3
    298f7476 Bump github.com/containers/image/v5 from 5.13.1 to 5.13.2
    5778d9bd Fix documentation of the --format option of skopeo copy and skopeo sync
    df170047 Bump github.com/containers/common from 0.39.0 to 0.40.0
    ad4ec8b4 Cirrus: New VM Images w/ podman 3.2.1
    abdc4a7e Bump github.com/containers/image/v5 from 5.12.0 to 5.13.1
    bcc18ebf Update nix pin with `make nixpkgs`
    9b9ef675 Fix multi-arch build version check
    9a5f009e [CI:DOCS] Fix docs links due to branch rename
    865407ca Bump github.com/containers/storage from 1.32.1 to 1.32.2
    10c4c877 Update nix pin with `make nixpkgs`
    e32f3f17 Bump github.com/docker/docker
    76110014 Fix wrong directory name
    a0b6ea28 Support [CI:DOCS] mode
    e5cb7ce1 install.md Building Docs needs MacOS section
    c8060838 Bump github.com/containers/storage from 1.32.0 to 1.32.1
    cac3f2b1 Bump github.com/containers/common from 0.38.4 to 0.39.0
    6452a9b6 Multi-arch github-action workflow unification
    184f0eee Bump github.com/containers/storage from 1.31.1 to 1.31.2
    65ed9920 Move to v1.3.1-dev

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

2 files changed, 7 insertions, 7 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
index f12734c9..d8782966 100644
--- 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
@@ -1,6 +1,6 @@
-From 4f60614b51df50f5d28495cf2e270dd6ab5fea7d Mon Sep 17 00:00:00 2001
+From 1dd54dce3159f52a2d33693de95d124d1acb6ba9 Mon Sep 17 00:00:00 2001
 From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Tue, 25 May 2021 13:42:56 -0400
+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:
@@ -18,7 +18,7 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/import/Makefile b/src/import/Makefile
-index 6bacd12e..8a94b236 100644
+index 5721b06d..31875d44 100644
 --- a/src/import/Makefile
 +++ b/src/import/Makefile
 @@ -8,7 +8,7 @@ export GOPROXY=https://proxy.golang.org
@@ -28,7 +28,7 @@ index 6bacd12e..8a94b236 100644
 -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)"
  
- # Normally empty, DESTDIR can be used to relocate the entire install-tree
+ # 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 7d2a9c13..39ee8ca6 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_git.bb
@@ -21,14 +21,14 @@ RDEPENDS:${PN} = " \
 "
 
 SRC_URI = " \
-    git://github.com/containers/skopeo;branch=release-1.3 \
+    git://github.com/containers/skopeo;branch=release-1.4 \
     file://0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch \
     file://storage.conf \
     file://registries.conf \
 "
 
-SRCREV = "038f70e6f52ca354534b2d38ce9611b8fc5537c4"
-PV = "v1.3.1+git${SRCPV}"
+SRCREV = "01e51ce610e3cfe1230a10af982e962c4ad1c990"
+PV = "v1.4.1+git${SRCPV}"
 GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"