mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-15 12:13:24 +00:00
Rediff patches
Drop 0009-cherry-picked-libabyss-read-fix.patch: <REASON> Drop 0008-Disable-failing-1024-test.patch: <REASON>
This commit is contained in:
parent
6b950e9662
commit
5208daec10
@ -26,10 +26,10 @@ index 79d60e1..054aa57 100644
|
|||||||
if(WITH_TESTS)
|
if(WITH_TESTS)
|
||||||
add_subdirectory(test)
|
add_subdirectory(test)
|
||||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||||
index 22c7eff..57709c3 100644
|
index 3aea0d1..e84e3f8 100644
|
||||||
--- a/test/CMakeLists.txt
|
--- a/test/CMakeLists.txt
|
||||||
+++ b/test/CMakeLists.txt
|
+++ b/test/CMakeLists.txt
|
||||||
@@ -73,3 +73,6 @@ endif(NOT WIN32)
|
@@ -71,3 +71,6 @@ endif(NOT WIN32)
|
||||||
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||||
target_link_directories(${TEST_EXE} PRIVATE /usr/local/lib)
|
target_link_directories(${TEST_EXE} PRIVATE /usr/local/lib)
|
||||||
endif()
|
endif()
|
||||||
|
@ -3,15 +3,15 @@ Date: Wed, 4 Sep 2019 15:50:06 -0300
|
|||||||
Subject: Make root bootstraps to system path
|
Subject: Make root bootstraps to system path
|
||||||
|
|
||||||
---
|
---
|
||||||
lokinet-bootstrap | 4 ++++
|
lokinet-bootstrap | 7 +++++++
|
||||||
1 file changed, 4 insertions(+)
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
diff --git a/lokinet-bootstrap b/lokinet-bootstrap
|
diff --git a/lokinet-bootstrap b/lokinet-bootstrap
|
||||||
index 690eb9b..feed8cd 100755
|
index b1cf445..4427716 100755
|
||||||
--- a/lokinet-bootstrap
|
--- a/lokinet-bootstrap
|
||||||
+++ b/lokinet-bootstrap
|
+++ b/lokinet-bootstrap
|
||||||
@@ -12,6 +12,10 @@ helpme=
|
@@ -17,6 +17,10 @@ default_url=(
|
||||||
default_url="https://seed.lokinet.org/bootstrap.signed"
|
)
|
||||||
default_dest="$HOME/.lokinet/bootstrap.signed"
|
default_dest="$HOME/.lokinet/bootstrap.signed"
|
||||||
|
|
||||||
+if [ "$UID" == 0 ]; then
|
+if [ "$UID" == 0 ]; then
|
||||||
@ -21,3 +21,13 @@ index 690eb9b..feed8cd 100755
|
|||||||
if [ "$#" -gt 2 ]; then
|
if [ "$#" -gt 2 ]; then
|
||||||
helpme=y
|
helpme=y
|
||||||
fi
|
fi
|
||||||
|
@@ -26,6 +30,9 @@ then
|
||||||
|
url="${default_url[mainnet]}"
|
||||||
|
elif [ -n "${default_url[$1]}" ]; then
|
||||||
|
url="${default_url[$1]}"
|
||||||
|
+ if [ "$UID-$1" == "0-testnet" ]; then
|
||||||
|
+ default_dest=/var/lib/lokinet/testnet/bootstrap.signed
|
||||||
|
+ fi
|
||||||
|
elif [[ "$1" = -* ]]; then
|
||||||
|
helpme=y
|
||||||
|
else
|
||||||
|
@ -1,24 +0,0 @@
|
|||||||
From: Jason Rhinelander <jason@imaginary.ca>
|
|
||||||
Date: Sat, 14 Dec 2019 00:02:18 -0400
|
|
||||||
Subject: Disable failing 1024 test
|
|
||||||
|
|
||||||
This test is testing a value that isn't actually used. Why it is
|
|
||||||
failing is a mystery.
|
|
||||||
---
|
|
||||||
test/util/test_llarp_util_aligned.cpp | 3 +--
|
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/test/util/test_llarp_util_aligned.cpp b/test/util/test_llarp_util_aligned.cpp
|
|
||||||
index 3dfa7ab..840c99e 100644
|
|
||||||
--- a/test/util/test_llarp_util_aligned.cpp
|
|
||||||
+++ b/test/util/test_llarp_util_aligned.cpp
|
|
||||||
@@ -14,8 +14,7 @@ using TestSizes =
|
|
||||||
std::integral_constant< std::size_t, 8 >,
|
|
||||||
std::integral_constant< std::size_t, 16 >,
|
|
||||||
std::integral_constant< std::size_t, 32 >,
|
|
||||||
- std::integral_constant< std::size_t, 64 >,
|
|
||||||
- std::integral_constant< std::size_t, 1024 > >;
|
|
||||||
+ std::integral_constant< std::size_t, 64 > >;
|
|
||||||
|
|
||||||
template < typename T >
|
|
||||||
struct AlignedBufferTest : public ::testing::Test
|
|
@ -1,25 +0,0 @@
|
|||||||
From: Jason Rhinelander <jason@imaginary.ca>
|
|
||||||
Date: Sun, 15 Dec 2019 13:20:56 -0400
|
|
||||||
Subject: cherry-picked libabyss read fix
|
|
||||||
|
|
||||||
---
|
|
||||||
llarp/util/json.cpp | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/llarp/util/json.cpp b/llarp/util/json.cpp
|
|
||||||
index 9c9358c..ef569c1 100644
|
|
||||||
--- a/llarp/util/json.cpp
|
|
||||||
+++ b/llarp/util/json.cpp
|
|
||||||
@@ -23,9 +23,11 @@ namespace llarp
|
|
||||||
bool
|
|
||||||
FeedData(const char* buf, size_t sz) override
|
|
||||||
{
|
|
||||||
+ if(sz == 0)
|
|
||||||
+ return true;
|
|
||||||
if(m_Offset + sz > m_Buf.size() - 1)
|
|
||||||
return false;
|
|
||||||
- std::copy(buf, buf + sz, m_Buf.begin());
|
|
||||||
+ std::copy_n(buf, sz, m_Buf.data() + m_Offset);
|
|
||||||
m_Offset += sz;
|
|
||||||
m_Buf[m_Offset] = 0;
|
|
||||||
return true;
|
|
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -5,5 +5,3 @@
|
|||||||
0005-Move-default-user-group-into-deb-patch.patch
|
0005-Move-default-user-group-into-deb-patch.patch
|
||||||
0006-Add-no-resolvconf-hack-to-default-config.patch
|
0006-Add-no-resolvconf-hack-to-default-config.patch
|
||||||
0007-Pass-debian-version-as-GIT_VERSION.patch
|
0007-Pass-debian-version-as-GIT_VERSION.patch
|
||||||
0008-Disable-failing-1024-test.patch
|
|
||||||
0009-cherry-picked-libabyss-read-fix.patch
|
|
||||||
|
Loading…
Reference in New Issue
Block a user