mirror of https://github.com/oxen-io/lokinet
Refresh patches
Jason Rhinelander
4 years ago
parent
a96bc1b9ac
commit
e1d67872c4
@ -1,23 +0,0 @@
|
||||
From: Jason Rhinelander <jason@imaginary.ca>
|
||||
Date: Thu, 25 Jul 2019 18:34:08 -0300
|
||||
Subject: Remove setcap
|
||||
|
||||
The debian setcap is applied in postinst instead (and the setcap here
|
||||
doesn't work with debian's temporary install location).
|
||||
---
|
||||
daemon/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
|
||||
index bf3e540..ee6121a 100644
|
||||
--- a/daemon/CMakeLists.txt
|
||||
+++ b/daemon/CMakeLists.txt
|
||||
@@ -35,7 +35,7 @@ else()
|
||||
install(PROGRAMS ${CMAKE_SOURCE_DIR}/lokinet-bootstrap DESTINATION bin COMPONENT lokinet)
|
||||
endif()
|
||||
|
||||
- if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
+ if(FALSE AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
install(CODE "execute_process(COMMAND setcap cap_net_admin,cap_net_bind_service=+eip ${CMAKE_INSTALL_PREFIX}/bin/lokinet)")
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||
target_link_directories(${EXE} PRIVATE /usr/local/lib)
|
||||
@ -1,26 +0,0 @@
|
||||
From: Jason Rhinelander <jason@imaginary.ca>
|
||||
Date: Thu, 25 Jul 2019 19:10:21 -0300
|
||||
Subject: Remove ccache
|
||||
|
||||
The default pbuilder install already puts ccache in the path, and having
|
||||
this results in double-ccache invocation which looks odd in the build
|
||||
log.
|
||||
---
|
||||
CMakeLists.txt | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5d56e92..680a1af 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,10 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.10) # bionic's cmake version
|
||||
|
||||
-find_program(CCACHE_PROGRAM ccache)
|
||||
-if(CCACHE_PROGRAM)
|
||||
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
|
||||
-endif()
|
||||
-
|
||||
set(PROJECT_NAME lokinet)
|
||||
project(${PROJECT_NAME}
|
||||
VERSION 0.7.1
|
||||
@ -1,24 +0,0 @@
|
||||
From: Jason Rhinelander <jason@imaginary.ca>
|
||||
Date: Tue, 10 Sep 2019 19:23:47 -0300
|
||||
Subject: Add no-resolvconf hack to default config
|
||||
|
||||
---
|
||||
llarp/config/config.cpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp
|
||||
index 32aa359..de8c646 100644
|
||||
--- a/llarp/config/config.cpp
|
||||
+++ b/llarp/config/config.cpp
|
||||
@@ -670,6 +670,11 @@ llarp_generic_ensure_config(std::ofstream &f, std::string basepath,
|
||||
f << "bind=127.0.0.1:1153\n";
|
||||
#else
|
||||
f << "bind=127.3.2.1:53\n";
|
||||
+
|
||||
+ f << "# Uncomment if you want to disable trying to call resolvconf to update the system nameserver\n"
|
||||
+ << "# (only applies if the system is actually using resolvconf):\n"
|
||||
+ << "#no-resolvconf=1\n";
|
||||
+
|
||||
#endif
|
||||
#else
|
||||
f << "bind=127.0.0.1:53\n";
|
||||
@ -1,34 +0,0 @@
|
||||
From: Jeff Becker <jeff@i2p.rocks>
|
||||
Date: Tue, 24 Mar 2020 11:12:41 -0400
|
||||
Subject: [PATCH] update lokinetmon to work again with dns rebinding
|
||||
protection
|
||||
|
||||
---
|
||||
contrib/py/admin/lokinetmon | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/contrib/py/admin/lokinetmon b/contrib/py/admin/lokinetmon
|
||||
index 79159d2..3a4af2d 100755
|
||||
--- a/contrib/py/admin/lokinetmon
|
||||
+++ b/contrib/py/admin/lokinetmon
|
||||
@@ -29,7 +29,7 @@ class Monitor:
|
||||
def jsonrpc(self, meth, params):
|
||||
r = requests.post(
|
||||
self._url,
|
||||
- headers={"Content-Type": "application/json"},
|
||||
+ headers={"Content-Type": "application/json", "Host": "localhost"},
|
||||
json={
|
||||
"jsonrpc": "2.0",
|
||||
"id": "0",
|
||||
@@ -204,9 +204,9 @@ class Monitor:
|
||||
s["remoteAddr"], self.speedOf(s["txRateCurrent"]), self.speedOf(s["rxRateCurrent"])
|
||||
)
|
||||
)
|
||||
- if (s['txMsgs'] or 0) > 1:
|
||||
+ if (s['txMsgQueueSize'] or 0) > 1:
|
||||
self.win.addstr(" [out window:\t{}]".format(s['txMsgQueueSize']))
|
||||
- if (s['rxMsgs'] or 0) > 1:
|
||||
+ if (s['rxMsgQueueSize'] or 0) > 1:
|
||||
self.win.addstr(" [in window:\t{}]".format(s['rxMsgQueueSize']))
|
||||
return y
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
From: Jason Rhinelander <jason@imaginary.ca>
|
||||
Date: Wed, 22 Apr 2020 12:00:09 -0300
|
||||
Subject: No LINUX variable in cmake
|
||||
|
||||
Just let the pkg_check fail when libsystemd isn't install; it shouldn't
|
||||
hurt anything.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1826d6b..bd329c6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -234,7 +234,7 @@ endif(JEMALLOC)
|
||||
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
-if(PKG_CONFIG_FOUND AND LINUX)
|
||||
+if(PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(SD libsystemd)
|
||||
# Default WITH_SYSTEMD to true if we found it
|
||||
option(WITH_SYSTEMD "enable systemd integration for sd_notify" ${SD_FOUND})
|
||||
Loading…
Reference in New Issue