Rediff patches

Drop 0001-make-check-runs-test-suite.patch: <REASON>

debian/patches/0001-make-check-runs-test-suite.patch

@@ -1,38 +0,0 @@
-From: Jason Rhinelander <jason@imaginary.ca>
-Date: Thu, 25 Jul 2019 18:32:13 -0300
-Subject: 'make check' runs test suite
-
-debhelper prefers a make test target, but that target is heavily
-restricted in cmake; this removes it and adds a check target that works
-instead to run the test suite in the build.
----
- CMakeLists.txt      | 4 ----
- test/CMakeLists.txt | 3 +++
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2a8a950..3faea51 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -260,10 +260,6 @@ add_subdirectory(llarp)
- add_subdirectory(libabyss)
- add_subdirectory(daemon)
- 
--if(WITH_TESTS)
--  enable_testing()
--endif()
--
- if (NOT SHADOW)
-   if(WITH_TESTS)
-     add_subdirectory(test)
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 7dea76f..a8e155e 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -72,3 +72,6 @@ endif(NOT WIN32)
- if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-   target_link_directories(${TEST_EXE} PRIVATE /usr/local/lib)
- endif()
-+
-+add_custom_target(check COMMAND ${TEST_EXE})
-+

debian/patches/0002-Remove-setcap.patch

@@ -9,7 +9,7 @@ doesn't work with debian's temporary install location).
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
-index 329e39d..d25b81b 100644
+index 051ada2..2cb7793 100644
 --- a/daemon/CMakeLists.txt
 +++ b/daemon/CMakeLists.txt
 @@ -36,7 +36,7 @@ else()

debian/patches/0003-Remove-ccache.patch

@@ -10,7 +10,7 @@ log.
  1 file changed, 5 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3faea51..db091b5 100644
+index cc04800..532d77a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,10 +1,5 @@

debian/patches/0005-Move-default-user-group-into-deb-patch.patch

@@ -8,10 +8,10 @@ Rather than cramming it into CXXFLAGS in debian/rules.
  1 file changed, 3 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index db091b5..952ad01 100644
+index 532d77a..349d198 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -43,6 +43,9 @@ endif()
+@@ -41,6 +41,9 @@ endif()
  
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
  

debian/patches/0006-Add-no-resolvconf-hack-to-default-config.patch

@@ -7,10 +7,10 @@ Subject: Add no-resolvconf hack to default config
  1 file changed, 5 insertions(+)
 
 diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp
-index be5634f..4384650 100644
+index 32aa359..de8c646 100644
 --- a/llarp/config/config.cpp
 +++ b/llarp/config/config.cpp
-@@ -654,6 +654,11 @@ llarp_generic_ensure_config(std::ofstream &f, std::string basepath,
+@@ -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";

debian/patches/series

@@ -1,4 +1,3 @@
-0001-make-check-runs-test-suite.patch
 0002-Remove-setcap.patch
 0003-Remove-ccache.patch
 0004-Make-root-bootstraps-to-system-path.patch