Rediff patches

Drop 0002-oxenc-compatibility.patch: <REASON>

debian/patches/0002-oxenc-compatibility.patch

@@ -1,109 +0,0 @@
-From: Jason Rhinelander <jason@imaginary.ca>
-Date: Fri, 29 Apr 2022 18:20:33 -0300
-Subject: oxenc compatibility
-
----
- llarp/dht/messages/findname.cpp | 1 +
- llarp/dht/messages/gotname.cpp  | 1 +
- llarp/handlers/tun.cpp          | 3 +++
- llarp/peerstats/types.cpp       | 1 +
- llarp/quic/connection.cpp       | 1 +
- llarp/router_contact.hpp        | 4 ++--
- llarp/rpc/lokid_rpc_client.cpp  | 2 ++
- 7 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/llarp/dht/messages/findname.cpp b/llarp/dht/messages/findname.cpp
-index 929db0e..49753fb 100644
---- a/llarp/dht/messages/findname.cpp
-+++ b/llarp/dht/messages/findname.cpp
-@@ -1,5 +1,6 @@
- #include "findname.hpp"
- #include <oxenmq/bt_serialize.h>
-+#include <oxenmq/bt_value.h>
- #include <llarp/dht/context.hpp>
- #include "gotname.hpp"
- #include <llarp/router/abstractrouter.hpp>
-diff --git a/llarp/dht/messages/gotname.cpp b/llarp/dht/messages/gotname.cpp
-index 47efe58..a3231f1 100644
---- a/llarp/dht/messages/gotname.cpp
-+++ b/llarp/dht/messages/gotname.cpp
-@@ -1,5 +1,6 @@
- #include "gotname.hpp"
- #include <oxenmq/bt_serialize.h>
-+#include <oxenmq/bt_value.h>
- #include <llarp/dht/context.hpp>
- #include <llarp/router/abstractrouter.hpp>
- #include <llarp/path/path_context.hpp>
-diff --git a/llarp/handlers/tun.cpp b/llarp/handlers/tun.cpp
-index 5677fc1..f24864e 100644
---- a/llarp/handlers/tun.cpp
-+++ b/llarp/handlers/tun.cpp
-@@ -30,6 +30,9 @@
- 
- #include <llarp/dns/srv_data.hpp>
- 
-+#include <oxenmq/bt_serialize.h>
-+#include <oxenmq/bt_value.h>
-+
- namespace llarp
- {
-   namespace handlers
-diff --git a/llarp/peerstats/types.cpp b/llarp/peerstats/types.cpp
-index e66918b..7390801 100644
---- a/llarp/peerstats/types.cpp
-+++ b/llarp/peerstats/types.cpp
-@@ -2,6 +2,7 @@
- 
- #include <llarp/util/str.hpp>
- #include <oxenmq/bt_serialize.h>
-+#include <oxenmq/bt_value.h>
- #include <stdexcept>
- 
- namespace llarp
-diff --git a/llarp/quic/connection.cpp b/llarp/quic/connection.cpp
-index 7789083..045832b 100644
---- a/llarp/quic/connection.cpp
-+++ b/llarp/quic/connection.cpp
-@@ -17,6 +17,7 @@
- #include <iterator>
- #include <oxenmq/hex.h>
- #include <oxenmq/bt_serialize.h>
-+#include <oxenmq/bt_value.h>
- 
- extern "C"
- {
-diff --git a/llarp/router_contact.hpp b/llarp/router_contact.hpp
-index bb500df..28b3e89 100644
---- a/llarp/router_contact.hpp
-+++ b/llarp/router_contact.hpp
-@@ -18,7 +18,7 @@
- #define MAX_RC_SIZE (1024)
- #define NICKLEN (32)
- 
--namespace oxenmq
-+namespace oxenc
- {
-   class bt_list_consumer;
- }  // namespace oxenmq
-@@ -226,7 +226,7 @@ namespace llarp
-     DecodeVersion_0(llarp_buffer_t* buf);
- 
-     bool
--    DecodeVersion_1(oxenmq::bt_list_consumer& btlist);
-+    DecodeVersion_1(oxenc::bt_list_consumer& btlist);
-   };
- 
-   inline std::ostream&
-diff --git a/llarp/rpc/lokid_rpc_client.cpp b/llarp/rpc/lokid_rpc_client.cpp
-index ea7122e..90ceb56 100644
---- a/llarp/rpc/lokid_rpc_client.cpp
-+++ b/llarp/rpc/lokid_rpc_client.cpp
-@@ -9,6 +9,8 @@
- 
- #include <llarp/util/time.hpp>
- 
-+#include <oxenmq/bt_serialize.h>
-+
- namespace llarp
- {
-   namespace rpc

debian/patches/0007-Pass-debian-version-as-GIT_VERSION.patch

@@ -3,26 +3,30 @@ Date: Fri, 13 Dec 2019 17:23:41 -0400
 Subject: Pass debian version as GIT_VERSION
 
 ---
- cmake/Version.cmake | 5 +++++
- 1 file changed, 5 insertions(+)
+ cmake/Version.cmake | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/cmake/Version.cmake b/cmake/Version.cmake
-index 45037a0..d9fdaef 100644
+index a017995..068e271 100644
 --- a/cmake/Version.cmake
 +++ b/cmake/Version.cmake
-@@ -1,4 +1,8 @@
+@@ -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)
++find_package(Git QUIET)
  set(GIT_INDEX_FILE "${PROJECT_SOURCE_DIR}/.git/index")
- if(EXISTS ${GIT_INDEX_FILE} AND ( GIT_FOUND OR Git_FOUND) )
-@@ -18,5 +22,6 @@ else()
-   set(VERSIONTAG "nogit")
-   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp")
+ 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()
  
- add_custom_target(genversion DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp")
+ 
+ if(WIN32)

debian/patches/series

@@ -1,2 +1 @@
 0007-Pass-debian-version-as-GIT_VERSION.patch
-0002-oxenc-compatibility.patch