diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-08-31 04:49:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-31 04:49:49 +0100 |
| commit | c8f83ad526fb6b554daf375e0ad65eb2d56e669b (patch) | |
| tree | cafe57965da48ad47a4e5e88ae7885492f21da6f /app-containers/docker | |
| parent | 6cef603bfc4353c863a1a0b460a0aa882d2dc51c (diff) | |
gentoo auto-resync : 31:08:2022 - 04:49:49
Diffstat (limited to 'app-containers/docker')
| -rw-r--r-- | app-containers/docker/Manifest | 1 | ||||
| -rw-r--r-- | app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch | 28 |
2 files changed, 0 insertions, 29 deletions
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest index 05765b58470d..7e4eb4efd2e5 100644 --- a/app-containers/docker/Manifest +++ b/app-containers/docker/Manifest @@ -1,5 +1,4 @@ AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e -AUX etcd-F_OFD_GETLK-fix.patch 868 BLAKE2B 478be67388bc9001c90031c47e001c8bcc0435433df44b42ea4c15cdb595d2169c0b2d05a4e774d20f7f971e64c08e132b736e8847cf0966c65bf1816f6a958c SHA512 4caf8a8a1f4363545d02695fed4a06ce96fdad181d5773188ae8c2ef95e4f4fbfee6d7906ece6bf0d85dd57e159f2a3774aa228f0e6e1da0cdfef63ced62a434 AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79b7f47c6fd5a6b024529c49ef71817d4c379c7a95832a44b9c2f45c9f7707cb580b31be18dff4ee9a110e44 SHA512 bc87464d9f3351b2791e6f86bc7f2101e652c25b99cdcc02e46e4ff18f4bfb7ffc35d338370656bde6ad09ed98805e045065012dc6a264967d26272f7de099ff DIST docker-20.10.17.tar.gz 11182479 BLAKE2B 515c048ab6f19e256040122323f394dfa2e8f7a4aefd89e5b374355bd7907f3ba5eaae37d7ce3aed0d1add8fa025b8e5ac3c46c4dc90adf757426fd40af39dbf SHA512 1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4 EBUILD docker-20.10.17.ebuild 8002 BLAKE2B a5967d16b5f5ad0cb674696e19451e0475ffb9edcfa9e49d9a236d68b3560fab38e2acc3952749023ff8bcdcede5babf464f21055c2c166e350ba9f9e9d748a8 SHA512 d9ad2d0cdc3aa182fbcbbfeaf596af1ffc369237a85440142c48be0f6d1a6c5b868e3a877e8d54222fa3ffe2ce9a435a5e4016398c62598fd931f4507a850206 diff --git a/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch b/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch deleted file mode 100644 index bd574e26f040..000000000000 --- a/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ec81adb21605acd56b122bc35c53644b13d3ab7e Mon Sep 17 00:00:00 2001 -From: Moritz Both <mb@aldebaran.de> -Date: Sun, 1 Nov 2020 23:20:12 +0100 -Subject: [PATCH] pkg/fileutil: fix constant for linux locking - -The constant F_OFD_GETLK is 36, not 37, according to -/usr/include/bits/fcntl-linux.h -Credits go to joakim-tjernlund who digged deep enough -to find this. - -Fixes #31182 ---- - pkg/fileutil/lock_linux.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pkg/fileutil/lock_linux.go b/pkg/fileutil/lock_linux.go -index 939fea62381..004d35fa23b 100644 ---- a/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go -+++ b/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go -@@ -29,7 +29,7 @@ import ( - // - // constants from /usr/include/bits/fcntl-linux.h - const ( -- F_OFD_GETLK = 37 -+ F_OFD_GETLK = 36 - F_OFD_SETLK = 37 - F_OFD_SETLKW = 38 - ) |