1 |
commit: 81acaf85d760c7ac7449b3f5b77465e0c02720e9 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Tue Aug 23 17:20:07 2022 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 30 22:57:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81acaf85 |
7 |
|
8 |
app-containers/docker: remove unused patch |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
11 |
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.14 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/26985 |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../docker/files/etcd-F_OFD_GETLK-fix.patch | 28 ---------------------- |
16 |
1 file changed, 28 deletions(-) |
17 |
|
18 |
diff --git a/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch b/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch |
19 |
deleted file mode 100644 |
20 |
index bd574e26f040..000000000000 |
21 |
--- a/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch |
22 |
+++ /dev/null |
23 |
@@ -1,28 +0,0 @@ |
24 |
-From ec81adb21605acd56b122bc35c53644b13d3ab7e Mon Sep 17 00:00:00 2001 |
25 |
-From: Moritz Both <mb@×××××××××.de> |
26 |
-Date: Sun, 1 Nov 2020 23:20:12 +0100 |
27 |
-Subject: [PATCH] pkg/fileutil: fix constant for linux locking |
28 |
- |
29 |
-The constant F_OFD_GETLK is 36, not 37, according to |
30 |
-/usr/include/bits/fcntl-linux.h |
31 |
-Credits go to joakim-tjernlund who digged deep enough |
32 |
-to find this. |
33 |
- |
34 |
-Fixes #31182 |
35 |
---- |
36 |
- pkg/fileutil/lock_linux.go | 2 +- |
37 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
38 |
- |
39 |
-diff --git a/pkg/fileutil/lock_linux.go b/pkg/fileutil/lock_linux.go |
40 |
-index 939fea62381..004d35fa23b 100644 |
41 |
---- a/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go |
42 |
-+++ b/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go |
43 |
-@@ -29,7 +29,7 @@ import ( |
44 |
- // |
45 |
- // constants from /usr/include/bits/fcntl-linux.h |
46 |
- const ( |
47 |
-- F_OFD_GETLK = 37 |
48 |
-+ F_OFD_GETLK = 36 |
49 |
- F_OFD_SETLK = 37 |
50 |
- F_OFD_SETLKW = 38 |
51 |
- ) |