summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch')
-rw-r--r--app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch28
1 files changed, 0 insertions, 28 deletions
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
- )