From 9e05e245e0f20adfa20dfc985799f023aed9e0f1 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Wed, 14 Apr 2021 12:53:53 -0400
Subject: [PATCH] rebrand and bump version

---
 CMakeLists.txt                   |   2 +-
 cmake/StaticBuild.cmake          |   5 ++++-
 cmake/win32_installer_deps.cmake |   4 ++--
 contrib/windows.sh               |   2 +-
 win32-setup/lokinet.ico          | Bin 4286 -> 1094 bytes
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47a6014bb..020172203 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ if(CCACHE_PROGRAM)
 endif()
 
 project(lokinet
-    VERSION 0.8.4
+    VERSION 0.8.5
     DESCRIPTION "lokinet - IP packet onion router"
     LANGUAGES C CXX)
 
diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake
index ebac3a402..95909a140 100644
--- a/cmake/StaticBuild.cmake
+++ b/cmake/StaticBuild.cmake
@@ -278,7 +278,10 @@ add_static_target(sqlite3 sqlite3_external libsqlite3.a)
 
 
 if(ARCH_TRIPLET MATCHES mingw)
-  set(zmq_extra --with-poller=wepoll)
+  option(WITH_WEPOLL "use wepoll zmq poller (crashy)" OFF)
+  if(WITH_WEPOLL)
+    set(zmq_extra --with-poller=wepoll)
+  endif()
 endif()
 
 if(CMAKE_CROSSCOMPILING AND ARCH_TRIPLET MATCHES mingw)
diff --git a/cmake/win32_installer_deps.cmake b/cmake/win32_installer_deps.cmake
index 241c088e7..028d3445f 100644
--- a/cmake/win32_installer_deps.cmake
+++ b/cmake/win32_installer_deps.cmake
@@ -1,6 +1,6 @@
 if(NOT GUI_ZIP_URL)
-  set(GUI_ZIP_URL "https://oxen.rocks/oxen-io/loki-network-control-panel/lokinet-gui-windows-32bit-v0.3.6.zip")
-  set(GUI_ZIP_HASH_OPTS EXPECTED_HASH SHA256=6feeb4df1983f00ee686b3de8b56e3e73c55d7d1a8a41b746a37234a426add31)
+  set(GUI_ZIP_URL "https://oxen.rocks/oxen-io/loki-network-control-panel/lokinet-gui-windows-32bit-v0.3.7.zip")
+  set(GUI_ZIP_HASH_OPTS EXPECTED_HASH SHA256=faafb5c7c8b9831f572ed78bb2cf8454bfa0d5f79897ce31e64e4a4331d55045)
 endif()
 
 set(TUNTAP_URL "https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe")
diff --git a/contrib/windows.sh b/contrib/windows.sh
index dddecd94a..cf8a94e7f 100755
--- a/contrib/windows.sh
+++ b/contrib/windows.sh
@@ -3,5 +3,5 @@ set -e
 set +x
 mkdir -p build-windows
 cd build-windows
-cmake -G Ninja -DCMAKE_EXE_LINKER_FLAGS=-fstack-protector -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_TOOLCHAIN_FILE=../contrib/cross/mingw64.cmake -DBUILD_STATIC_DEPS=ON -DBUILD_PACKAGE=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DWITH_TESTS=OFF -DNATIVE_BUILD=OFF -DSTATIC_LINK=ON -DWITH_SYSTEMD=OFF -DFORCE_LOKIMQ_SUBMODULE=ON -DSUBMODULE_CHECK=OFF -DWITH_LTO=OFF -DCMAKE_BUILD_TYPE=Release ..
+cmake -G Ninja -DCMAKE_EXE_LINKER_FLAGS=-fstack-protector -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_TOOLCHAIN_FILE=../contrib/cross/mingw64.cmake -DBUILD_STATIC_DEPS=ON -DBUILD_PACKAGE=ON -DBUILD_LIBLOKINET=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DWITH_TESTS=OFF -DNATIVE_BUILD=OFF -DSTATIC_LINK=ON -DWITH_SYSTEMD=OFF -DFORCE_OXENMQ_SUBMODULE=ON -DSUBMODULE_CHECK=OFF -DWITH_LTO=OFF -DCMAKE_BUILD_TYPE=Release $@ ..
 ninja package
diff --git a/win32-setup/lokinet.ico b/win32-setup/lokinet.ico
index 274d3b3a2618bad8931f59cc97d877e40393ba48..6efad98330dbd4c475032aabe89ba01d8aebcde7 100644
GIT binary patch
literal 1094
zcmeHEF;2uV5FB5Sf)K(Kh-;8SNl8g{xhL@eBwONP7b>1W8;Ry53Vaoo$a$D`(((du
zw3$qHvzeU*oUZM5Rq_4=xCU^i*easJ^1mIDH6<(xJ5#8@+|QWSGw%J2Lpx(^W`qm&
zP$DXyfXXw_+lvI$27AQXAUV_qxrsGDwL@oh#qSNsE`^G_Z-Xy(N4}9C++}`}FOyF}
z4Px<QF9mpX!;K3iJ~Z(HoN#ILgbeXB^r_~t-b3}9=m$5oDWH{j^^1+PsQ=)kZAXq6
zoc=F9HpM696P~0GZANa!4ZQk0oTDqaMLgAn#;-JSta)-!eQ@M^@tM!$f!!gz+9c{P
z{hIG+cT#yfrpM6cF-&guBdr#{u=oX3|Kx9Hb!G8a`wPao_%HF5a$NS4<d&UWKi3bt
SN?H0D85X|K|NZ~L{r>;}&bSN!

literal 4286
zcmeH~ZERCj7{@R2vPFh_ZE1V&ZOhipu`w3gZr#S(u689%6x<>V1czZv#Wf**kOTs;
z7|o0y6cZyZK;}zeXo8?7)<Cxs{R9EYJ{Tk6HDS|efN9K}T6_FI9j7~MMo3@S2g6y;
z&h9zS`Tw4C&OOg_CrPvLV>V0lTRM^_Nm@yg%2ClJHK9^Jl>o->m;c8O6ciL>DT?v|
zYA^ntJCm!b4z%PH*Del$&2HDPi;9YJX2OTseQR{SLH{}X?v+eY<9zbtv{tLt+)E#p
zeY~*@>`SQ3H_**$Ut2v6?q9+_{HW9E%=f|v_pwd~xWB~M#2@sJdcNrLs3j&J_`eH2
zjOg|H>P-6J`Re({!TUpCU-x|3wUjf!vw{D!;KQiFU})mw>9pRHFLr_ZkHG%k`RTL9
zL{03w1^kPG4}Z$C{8XY{GSAI}-2rf;0{h$gzV-Q}k)NMG4=lQWCseDYi24?y;Q5^3
zLj*o_(^#^_dt&S61olz;-nMMgDJ(3^Aui{X)Ghv@?)`QXjcGKR1?Ug)F|<+m@EnaL
zQ@{=i>%QVX-kC-7p|64FnYcdgpnca$dLOU5j&80Z8@vzmF+Rd=j3wp}^(Rw&1OBkU
zC;edMhK4F=Uf{ZD$7=#l{0dtdr+Tw~@0u3$2e}Q_&K`Mbc{mw1*(UOxeH)pnqU2w$
zi}p8JRlE)R*O!8OnfRX1yO_nbBpSED-q^OUK&<em#cz1Gof$1=9&4FmRDY6H*~-^c
zw||}9`QbA|#rB6MZA>bweSLK-PNl<l^t3Y7Y>ewJvX(K|M;*h?{!Ov7CLi<$eHDBf
z=IcgGV)gH=<!6%e`fWQ}ro?#5vdXCE*cPsP)BRbeOJ1b9z`e!Urt;#y8xL&YHWO_M
z`)_-BMOcxi<d>7SosU^@&J*z;=k0i-bqqOZjI+^RD)lZchs}GalW`*jzOmFC5_Crp
zPv_HK*Y`b5`R{zqtE;B$4Q$UN2I|Ph(Yy8m*qlY>`w*o5WD4%hR%lMX%Zd`u@%Fb`
zbIZKdgMxoy<lbD;uiVi*58QsdbA0_#U)Y~?{2?v)uni3H&Yj^oURS2j_s>DpK74z`
zVw3gFRk>gf2<s*vdPpnP0w30aL3y6vfoXHRqqp4v){wxCVBIOj{zPBlLo@hdjvp3t
zeB+^x3UIFq?6KxhcUz)PI?vPO_*=3`aXSxhY6SO&z`pTl@C9c&tUJw}F2_51o*Wa{
z*P4!RskqbpO!Ong>u?s|#oq_Sc;q0uXG4ws9dafZchf)$ehB;l?n7}+`8PFhx5e(?
z-R5R$9N!@P|Bp{JTJ3|G(!H-Uvpc}V5^*y&ZenaSm$9o^jGdaz*q%L%%|6AVbIh+q
nvh&=Lyli(wk|ye`fIC8!Khqd&$d=~B=8^_!ktS&qLn!|N2GMF7