Merge pull request #2052 from oxen-io/dev

v0.9.10
oxen-io · Nov 11, 2022 · 1e5e34b · 1e5e34b
2 parents 77fa34c + 7906fac
commit 1e5e34b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/cmake/macos.cmake b/cmake/macos.cmake
@@ -137,13 +137,13 @@ if(BUILD_PACKAGE)
     COMMAND create-dmg
       --volname "Lokinet ${PROJECT_VERSION}"
       --volicon lokinet.icns
-      #--background ... FIXME
+      --background "${PROJECT_SOURCE_DIR}/contrib/macos/installer.tiff"
       --text-size 16
       --icon-size 128
-      --window-size 500 300
-      --icon Lokinet.app 100 100
+      --window-size 555 440
+      --icon Lokinet.app 151 196
       --hide-extension Lokinet.app
-      --app-drop-link 350 100
+      --app-drop-link 403 196
       --eula "${PROJECT_SOURCE_DIR}/LICENSE"
       --no-internet-enable
       "${lokinet_installer}.dmg"

diff --git a/contrib/macos/installer.png b/contrib/macos/installer.png
diff --git a/contrib/macos/installer.tiff b/contrib/macos/installer.tiff
diff --git a/contrib/macos/installer@2x.png b/contrib/macos/installer@2x.png
diff --git a/llarp/bootstrap.cpp b/llarp/bootstrap.cpp
@@ -2,6 +2,7 @@
 #include "util/bencode.hpp"
 #include "util/logging.hpp"
 #include "util/logging/buffer.hpp"
+#include "util/fs.hpp"
 
 namespace llarp
 {

diff --git a/llarp/util/fs.hpp b/llarp/util/fs.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <fstream>
 #ifdef USE_GHC_FILESYSTEM
 #include <ghc/filesystem.hpp>
 namespace fs = ghc::filesystem;

diff --git a/llarp/vpn/linux.hpp b/llarp/vpn/linux.hpp
@@ -10,10 +10,7 @@
 #include <linux/if_tun.h>
 
 #include <cstring>
-#include <sys/types.h>
-#include <unistd.h>
 #include <arpa/inet.h>
-#include <sys/socket.h>
 #include <linux/rtnetlink.h>
 #include <llarp/net/net.hpp>
 #include <llarp/util/str.hpp>
@@ -24,6 +21,8 @@
 #include <llarp/router/abstractrouter.hpp>
 #include <llarp.hpp>
 
+#include <llarp/util/fs.hpp>
+
 namespace llarp::vpn
 {
   struct in6_ifreq