mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-17 15:25:35 +00:00
Rediff patches
Drop 0002-add-additional-fallback-case.patch: <REASON> Drop 0007-Pass-debian-version-as-GIT_VERSION.patch: <REASON>
This commit is contained in:
parent
a1f05e2abc
commit
e1c7f3ddf8
@ -1,24 +0,0 @@
|
||||
From: Jeff <jeff@lokinet.io>
|
||||
Date: Tue, 31 May 2022 15:23:36 -0400
|
||||
Subject: add additional fallback case
|
||||
|
||||
---
|
||||
llarp/link/server.cpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/llarp/link/server.cpp b/llarp/link/server.cpp
|
||||
index 44ac8b4..528b9d3 100644
|
||||
--- a/llarp/link/server.cpp
|
||||
+++ b/llarp/link/server.cpp
|
||||
@@ -159,6 +159,11 @@ namespace llarp
|
||||
// we do not have our claimed ip, nat or something?
|
||||
m_ourAddr = *maybe;
|
||||
}
|
||||
+ else if (auto maybe = net::AllInterfaces(SockAddr{"0.0.0.0"}))
|
||||
+ {
|
||||
+ // one last fallback
|
||||
+ m_ourAddr = *maybe;
|
||||
+ }
|
||||
else
|
||||
return false; // the ultimate failure case
|
||||
}
|
@ -1,32 +0,0 @@
|
||||
From: Jason Rhinelander <jason@imaginary.ca>
|
||||
Date: Fri, 13 Dec 2019 17:23:41 -0400
|
||||
Subject: Pass debian version as GIT_VERSION
|
||||
|
||||
---
|
||||
cmake/Version.cmake | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
|
||||
index a017995..068e271 100644
|
||||
--- a/cmake/Version.cmake
|
||||
+++ b/cmake/Version.cmake
|
||||
@@ -1,6 +1,10 @@
|
||||
# We do this via a custom command that re-invokes a cmake script because we need the DEPENDS on .git/index so that we will re-run it (to regenerate the commit tag in the version) whenever the current commit changes. If we used a configure_file directly here, it would only re-run when something else causes cmake to re-run.
|
||||
|
||||
-set(VERSIONTAG "${GIT_VERSION}")
|
||||
+if(GIT_VERSION)
|
||||
+ set(VERSIONTAG "${GIT_VERSION}")
|
||||
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp")
|
||||
+else()
|
||||
+find_package(Git QUIET)
|
||||
set(GIT_INDEX_FILE "${PROJECT_SOURCE_DIR}/.git/index")
|
||||
find_package(Git)
|
||||
if(EXISTS "${GIT_INDEX_FILE}" AND ( GIT_FOUND OR Git_FOUND) )
|
||||
@@ -22,6 +26,7 @@ if(EXISTS "${GIT_INDEX_FILE}" AND ( GIT_FOUND OR Git_FOUND) )
|
||||
else()
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp" @ONLY)
|
||||
endif()
|
||||
+endif()
|
||||
|
||||
|
||||
if(WIN32)
|
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -1,2 +0,0 @@
|
||||
0007-Pass-debian-version-as-GIT_VERSION.patch
|
||||
0002-add-additional-fallback-case.patch
|
Loading…
Reference in New Issue
Block a user