Rediff patches

debian/patches/0004-lokimq-rename-compatibility-fix.patch

@@ -3,32 +3,40 @@ Date: Fri, 15 Jan 2021 14:39:33 -0400
 Subject: lokimq rename compatibility fix
 
 ---
- llarp/router/abstractrouter.hpp | 3 ++-
- llarp/router_contact.hpp        | 5 +++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
+ llarp/router/abstractrouter.hpp | 6 +++---
+ llarp/router_contact.hpp        | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/llarp/router/abstractrouter.hpp b/llarp/router/abstractrouter.hpp
-index ca53fc9..e532812 100644
+index ca53fc9..f4c0357 100644
 --- a/llarp/router/abstractrouter.hpp
 +++ b/llarp/router/abstractrouter.hpp
-@@ -23,10 +23,11 @@ struct llarp_dht_context;
+@@ -23,9 +23,9 @@ struct llarp_dht_context;
  struct llarp_nodedb;
  struct llarp_threadpool;
  
 -namespace lokimq
 +namespace oxenmq
  {
-   class LokiMQ;
+-  class LokiMQ;
++  class OxenMQ;
  }
-+namespace lokimq = oxenmq;
  
  namespace llarp
- {
+@@ -75,7 +75,7 @@ namespace llarp
+     class ThreadPool;
+   }
+ 
+-  using LMQ_ptr = std::shared_ptr<lokimq::LokiMQ>;
++  using LMQ_ptr = std::shared_ptr<oxenmq::OxenMQ>;
+ 
+   struct AbstractRouter
+   {
 diff --git a/llarp/router_contact.hpp b/llarp/router_contact.hpp
-index be29e76..16ce479 100644
+index be29e76..2fb9cbf 100644
 --- a/llarp/router_contact.hpp
 +++ b/llarp/router_contact.hpp
-@@ -17,10 +17,11 @@
+@@ -17,10 +17,10 @@
  #define MAX_RC_SIZE (1024)
  #define NICKLEN (32)
  
@@ -38,7 +46,15 @@ index be29e76..16ce479 100644
    class bt_list_consumer;
 -}  // namespace lokimq
 +}  // namespace oxenmq
-+namespace lokimq = oxenmq;
  
  namespace llarp
  {
+@@ -230,7 +230,7 @@ namespace llarp
+     DecodeVersion_0(llarp_buffer_t* buf);
+ 
+     bool
+-    DecodeVersion_1(lokimq::bt_list_consumer& btlist);
++    DecodeVersion_1(oxenmq::bt_list_consumer& btlist);
+   };
+ 
+   inline std::ostream&