From 18d6942ffb3e2373fbcd0e6c78d3f7881788a352 Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Wed, 10 Mar 2021 20:27:52 -0400
Subject: [PATCH] Rediff patches

Drop 0004-lokimq-rename-compatibility-fix.patch: <REASON>
---
 ...0004-lokimq-rename-compatibility-fix.patch | 60 -------------------
 ...ve-default-user-group-into-deb-patch.patch |  4 +-
 debian/patches/series                         |  1 -
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 debian/patches/0004-lokimq-rename-compatibility-fix.patch

diff --git a/debian/patches/0004-lokimq-rename-compatibility-fix.patch b/debian/patches/0004-lokimq-rename-compatibility-fix.patch
deleted file mode 100644
index 0de42f5c9..000000000
--- a/debian/patches/0004-lokimq-rename-compatibility-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Jason Rhinelander <jason@imaginary.ca>
-Date: Fri, 15 Jan 2021 14:39:33 -0400
-Subject: lokimq rename compatibility fix
-
----
- 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..f4c0357 100644
---- a/llarp/router/abstractrouter.hpp
-+++ b/llarp/router/abstractrouter.hpp
-@@ -23,9 +23,9 @@ struct llarp_dht_context;
- struct llarp_nodedb;
- struct llarp_threadpool;
- 
--namespace lokimq
-+namespace oxenmq
- {
--  class LokiMQ;
-+  class 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..2fb9cbf 100644
---- a/llarp/router_contact.hpp
-+++ b/llarp/router_contact.hpp
-@@ -17,10 +17,10 @@
- #define MAX_RC_SIZE (1024)
- #define NICKLEN (32)
- 
--namespace lokimq
-+namespace oxenmq
- {
-   class bt_list_consumer;
--}  // namespace lokimq
-+}  // namespace 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&
diff --git a/debian/patches/0005-Move-default-user-group-into-deb-patch.patch b/debian/patches/0005-Move-default-user-group-into-deb-patch.patch
index 7cee1d35d..2d8d9df9e 100644
--- a/debian/patches/0005-Move-default-user-group-into-deb-patch.patch
+++ b/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 cec1825..3783838 100644
+index 47a6014..8ef2af0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -108,6 +108,9 @@ include(cmake/unix.cmake)
+@@ -110,6 +110,9 @@ include(cmake/unix.cmake)
  include(cmake/check_for_std_optional.cmake)
  include(cmake/check_for_std_filesystem.cmake)
  
diff --git a/debian/patches/series b/debian/patches/series
index 7cf5dbc38..deec55d43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0004-Make-root-bootstraps-to-system-path.patch
 0005-Move-default-user-group-into-deb-patch.patch
 0007-Pass-debian-version-as-GIT_VERSION.patch
-0004-lokimq-rename-compatibility-fix.patch