summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-02-05 09:56:25 +0100
committerValentin Rothberg <rothberg@redhat.com>2020-02-05 09:56:25 +0100
commitbaec9f3b10faa4f319b92549ea460aba0af91a4d (patch)
treea389729bea940a98dc53aa5e7410ee8309b67c36
parent801977b40d8500ff68cf5a6facd82f035735076a (diff)
downloadpodman-baec9f3b10faa4f319b92549ea460aba0af91a4d.tar.gz
podman-baec9f3b10faa4f319b92549ea460aba0af91a4d.tar.bz2
podman-baec9f3b10faa4f319b92549ea460aba0af91a4d.zip
vendor github.com/mtrmac/gpgme@v0.1.2
Fixes a build regression on CentOS 7 and RHEL 7 with older gpgme versions. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
-rw-r--r--go.mod1
-rw-r--r--go.sum2
-rw-r--r--vendor/github.com/mtrmac/gpgme/go_gpgme.h5
-rw-r--r--vendor/modules.txt2
4 files changed, 9 insertions, 1 deletions
diff --git a/go.mod b/go.mod
index 391c441f6..70d1b2c86 100644
--- a/go.mod
+++ b/go.mod
@@ -45,6 +45,7 @@ require (
github.com/json-iterator/go v1.1.9
github.com/mrtazz/checkmake v0.0.0-20191009095831-03dd76b964dd // indirect
github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618
+ github.com/mtrmac/gpgme v0.1.2 // indirect
github.com/olekukonko/tablewriter v0.0.4 // indirect
github.com/onsi/ginkgo v1.11.0
github.com/onsi/gomega v1.9.0
diff --git a/go.sum b/go.sum
index 24696a009..6125b2643 100644
--- a/go.sum
+++ b/go.sum
@@ -376,6 +376,8 @@ github.com/mtrmac/gpgme v0.0.0-20170102180018-b2432428689c h1:xa+eQWKuJ9MbB9FBL/
github.com/mtrmac/gpgme v0.0.0-20170102180018-b2432428689c/go.mod h1:GhAqVMEWnTcW2dxoD/SO3n2enrgWl3y6Dnx4m59GvcA=
github.com/mtrmac/gpgme v0.1.1 h1:a5ISnvahzTzBH0m/klhehN68N+9+/jLwhpPFtH3oPAQ=
github.com/mtrmac/gpgme v0.1.1/go.mod h1:GYYHnGSuS7HK3zVS2n3y73y0okK/BeKzwnn5jgiVFNI=
+github.com/mtrmac/gpgme v0.1.2 h1:dNOmvYmsrakgW7LcgiprD0yfRuQQe8/C8F6Z+zogO3s=
+github.com/mtrmac/gpgme v0.1.2/go.mod h1:GYYHnGSuS7HK3zVS2n3y73y0okK/BeKzwnn5jgiVFNI=
github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
diff --git a/vendor/github.com/mtrmac/gpgme/go_gpgme.h b/vendor/github.com/mtrmac/gpgme/go_gpgme.h
index eb3a4ba88..d4826ab36 100644
--- a/vendor/github.com/mtrmac/gpgme/go_gpgme.h
+++ b/vendor/github.com/mtrmac/gpgme/go_gpgme.h
@@ -6,6 +6,11 @@
#include <gpgme.h>
+/* GPGME_VERSION_NUMBER was introduced in 1.4.0 */
+#if !defined(GPGME_VERSION_NUMBER) || GPGME_VERSION_NUMBER < 0x010402
+typedef off_t gpgme_off_t; /* Introduced in 1.4.2 */
+#endif
+
extern ssize_t gogpgme_readfunc(void *handle, void *buffer, size_t size);
extern ssize_t gogpgme_writefunc(void *handle, void *buffer, size_t size);
extern off_t gogpgme_seekfunc(void *handle, off_t offset, int whence);
diff --git a/vendor/modules.txt b/vendor/modules.txt
index d845a9ba0..688a60a68 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -340,7 +340,7 @@ github.com/modern-go/reflect2
github.com/morikuni/aec
# github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618
github.com/mrunalp/fileutils
-# github.com/mtrmac/gpgme v0.1.1
+# github.com/mtrmac/gpgme v0.1.2
github.com/mtrmac/gpgme
# github.com/onsi/ginkgo v1.11.0
github.com/onsi/ginkgo