From 9c1de040b36483fed1c331c438d8bce5fd8fab58 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 11 Jul 2022 10:03:44 -0400
Subject: Vendor in containers/(storage,image, common, buildah)

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 vendor/github.com/proglottis/gpgme/.appveyor.yml | 40 ------------------------
 vendor/github.com/proglottis/gpgme/.travis.yml   | 32 -------------------
 vendor/github.com/proglottis/gpgme/gpgme.go      |  1 -
 3 files changed, 73 deletions(-)
 delete mode 100644 vendor/github.com/proglottis/gpgme/.appveyor.yml
 delete mode 100644 vendor/github.com/proglottis/gpgme/.travis.yml

(limited to 'vendor/github.com/proglottis/gpgme')

diff --git a/vendor/github.com/proglottis/gpgme/.appveyor.yml b/vendor/github.com/proglottis/gpgme/.appveyor.yml
deleted file mode 100644
index 2fdc09ab5..000000000
--- a/vendor/github.com/proglottis/gpgme/.appveyor.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-version: 0.{build}
-platform: x86
-branches:
-  only:
-    - master
-
-clone_folder: c:\gopath\src\github.com\proglottis\gpgme
-
-environment:   
-  GOPATH: c:\gopath
-  GOROOT: C:\go-x86
-  CGO_LDFLAGS: -LC:\gpg\lib
-  CGO_CFLAGS: -IC:\gpg\include
-  GPG_DIR: C:\gpg
-
-install:
-  - nuget install 7ZipCLI -ExcludeVersion
-  - set PATH=%appveyor_build_folder%\7ZipCLI\tools;%PATH%
-  - appveyor DownloadFile https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-2.1.20_20170403.exe -FileName gnupg-w32-2.1.20_20170403.exe
-  - 7z x -o%GPG_DIR% gnupg-w32-2.1.20_20170403.exe
-  - copy "%GPG_DIR%\lib\libgpg-error.imp" "%GPG_DIR%\lib\libgpg-error.a"
-  - copy "%GPG_DIR%\lib\libassuan.imp" "%GPG_DIR%\lib\libassuan.a"
-  - copy "%GPG_DIR%\lib\libgpgme.imp" "%GPG_DIR%\lib\libgpgme.a"
-  - set PATH=%GOPATH%\bin;%GOROOT%\bin;%GPG_DIR%\bin;C:\MinGW\bin;%PATH%
-  - C:\cygwin\bin\sed -i 's/"GPG_AGENT_INFO"/"GPG_AGENT_INFO="/;s/C.unsetenv(v)/C.putenv(v)/' %APPVEYOR_BUILD_FOLDER%\gpgme.go
-
-test_script:
-  - go test -v github.com/proglottis/gpgme
-
-
-build_script:
-  - go build -o example_decrypt.exe -i %APPVEYOR_BUILD_FOLDER%\examples\decrypt.go
-  - go build -o example_encrypt.exe -i %APPVEYOR_BUILD_FOLDER%\examples\encrypt.go
-
-artifacts:
-  - path: example_decrypt.exe
-    name: decrypt example binary
-  - path: example_encrypt.exe
-    name: encrypt example binary
\ No newline at end of file
diff --git a/vendor/github.com/proglottis/gpgme/.travis.yml b/vendor/github.com/proglottis/gpgme/.travis.yml
deleted file mode 100644
index 619e33721..000000000
--- a/vendor/github.com/proglottis/gpgme/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-language: go
-os:
-  - linux
-  - osx
-  - windows
-dist: xenial
-sudo: false
-
-go:
-  - 1.11
-  - 1.12
-  - 1.13
-
-addons:
-  apt:
-    packages:
-    - libgpgme11-dev
-  homebrew:
-    packages:
-    - gnupg
-    - gnupg@1.4
-    - gpgme
-    update: true
-
-matrix:
-  allow_failures:
-    - os: windows
-
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install msys2; fi
-  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install gpg4win; fi
diff --git a/vendor/github.com/proglottis/gpgme/gpgme.go b/vendor/github.com/proglottis/gpgme/gpgme.go
index 82effbd9e..8f495ddf5 100644
--- a/vendor/github.com/proglottis/gpgme/gpgme.go
+++ b/vendor/github.com/proglottis/gpgme/gpgme.go
@@ -2,7 +2,6 @@
 package gpgme
 
 // #cgo pkg-config: gpgme
-// #cgo LDFLAGS: -lgpgme -lassuan -lgpg-error
 // #cgo CPPFLAGS: -D_FILE_OFFSET_BITS=64
 // #include <stdlib.h>
 // #include <gpgme.h>
-- 
cgit v1.2.3-54-g00ecf