Move default user/group define into a debian patch

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

@@ -0,0 +1,23 @@
+From: Jason Rhinelander <jason@imaginary.ca>
+Date: Mon, 9 Sep 2019 22:12:03 -0300
+Subject: Move default user/group into deb patch
+
+Rather than cramming it into CXXFLAGS in debian/rules.
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 49ebccb..728b806 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,6 +45,9 @@ set(ABYSS_EXE ${ABYSS_LIB}-main)
+ get_filename_component(TT_ROOT "vendor/libtuntap-master" ABSOLUTE)
+ add_definitions(-D${CMAKE_SYSTEM_NAME})
+ 
++# Unique user for system lokinet; _loki group is intentionally shared with the loki-core debs.
++add_definitions(-DDEFAULT_LOKINET_USER=\"_lokinet\" -DDEFAULT_LOKINET_GROUP=\"_loki\")
++
+ get_filename_component(CORE_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include" ABSOLUTE)
+ get_filename_component(ABYSS_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include" ABSOLUTE)
+ 

debian/patches/series

@@ -2,3 +2,4 @@
 0002-Remove-setcap.patch
 0003-Remove-ccache.patch
 0004-Make-root-bootstraps-to-system-path.patch
+0005-Move-default-user-group-into-deb-patch.patch

debian/rules

@@ -26,7 +26,7 @@ endif
 override_dh_auto_configure:
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DRELEASE_MOTTO="$(shell cat motto.txt)" \
 		-DGIT_VERSION="$(DEB_VERSION)" \
-		-DCMAKE_CXX_FLAGS="-march=westmere -mtune=haswell -DDEFAULT_LOKINET_USER=\\\"_lokinet\\\" -DDEFAULT_LOKINET_GROUP=\\\"_loki\\\"" \
+		-DCMAKE_CXX_FLAGS="-march=westmere -mtune=haswell" \
 		-DCMAKE_C_FLAGS="-march=westmere -mtune=haswell" \
 		-DUSE_AVX2=OFF