1 |
commit: bb87817a66e82c45bee3b0fae643046a50bff975 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Tue Feb 8 17:15:49 2022 +0000 |
4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 8 18:15:02 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb87817a |
7 |
|
8 |
net-misc/croc: remove unused patch |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/24131 |
13 |
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> |
14 |
|
15 |
net-misc/croc/files/croc-9.4.2-tcp-const.patch | 49 -------------------------- |
16 |
1 file changed, 49 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/croc/files/croc-9.4.2-tcp-const.patch b/net-misc/croc/files/croc-9.4.2-tcp-const.patch |
19 |
deleted file mode 100644 |
20 |
index bcd6823983b9..000000000000 |
21 |
--- a/net-misc/croc/files/croc-9.4.2-tcp-const.patch |
22 |
+++ /dev/null |
23 |
@@ -1,49 +0,0 @@ |
24 |
-From 2ffb20201c00a4de9c8082c909e2428c2b46d5c2 Mon Sep 17 00:00:00 2001 |
25 |
-From: jolheiser <john.olheiser@×××××.com> |
26 |
-Date: Sun, 3 Oct 2021 16:23:29 -0500 |
27 |
-Subject: [PATCH] Fix TCP constant |
28 |
- |
29 |
-Signed-off-by: jolheiser <john.olheiser@×××××.com> |
30 |
---- |
31 |
- src/tcp/tcp.go | 7 +++---- |
32 |
- src/tcp/tcp_test.go | 4 ++-- |
33 |
- 2 files changed, 5 insertions(+), 6 deletions(-) |
34 |
- |
35 |
-diff --git a/src/tcp/tcp.go b/src/tcp/tcp.go |
36 |
-index 2714e5f1..d271756b 100644 |
37 |
---- a/src/tcp/tcp.go |
38 |
-+++ b/src/tcp/tcp.go |
39 |
-@@ -37,10 +37,9 @@ type roomMap struct { |
40 |
- sync.Mutex |
41 |
- } |
42 |
- |
43 |
--const ( |
44 |
-- timeToRoomDeletion = 10 * time.Minute |
45 |
-- pingRoom = "pinglkasjdlfjsaldjf" |
46 |
--) |
47 |
-+const pingRoom = "pinglkasjdlfjsaldjf" |
48 |
-+ |
49 |
-+var timeToRoomDeletion = 10 * time.Minute |
50 |
- |
51 |
- // Run starts a tcp listener, run async |
52 |
- func Run(debugLevel, host, port, password string, banner ...string) (err error) { |
53 |
-diff --git a/src/tcp/tcp_test.go b/src/tcp/tcp_test.go |
54 |
-index 165f9537..6ba99677 100644 |
55 |
---- a/src/tcp/tcp_test.go |
56 |
-+++ b/src/tcp/tcp_test.go |
57 |
-@@ -25,13 +25,13 @@ func TestTCP(t *testing.T) { |
58 |
- log.SetLevel("error") |
59 |
- timeToRoomDeletion = 100 * time.Millisecond |
60 |
- go Run("debug", "localhost", "8281", "pass123", "8282") |
61 |
-- time.Sleep(100 * time.Millisecond) |
62 |
-+ time.Sleep(timeToRoomDeletion) |
63 |
- err := PingServer("localhost:8281") |
64 |
- assert.Nil(t, err) |
65 |
- err = PingServer("localhost:8333") |
66 |
- assert.NotNil(t, err) |
67 |
- |
68 |
-- time.Sleep(100 * time.Millisecond) |
69 |
-+ time.Sleep(timeToRoomDeletion) |
70 |
- c1, banner, _, err := ConnectToTCPServer("localhost:8281", "pass123", "testRoom", 1*time.Minute) |
71 |
- assert.Equal(t, banner, "8282") |
72 |
- assert.Nil(t, err) |