Merge tag v14.6.1 into v14.x.x

Build.mak

@@ -1,6 +1,5 @@
 export ASSERT_ON_STOMPING_PREVENTION=1
 
-override LDFLAGS += -llzo2 -lebtree -lrt -lgcrypt -lgpg-error -lglib-2.0 -lpcre
 override DFLAGS  += -w
 
 ifeq ($(DVER),1)
@@ -15,6 +14,9 @@ $B/fakedht: override LDFLAGS += -llzo2 -lebtree -lrt -lpcre
 
 all += $B/fakedht
 
+$O/%unittests: override LDFLAGS += -llzo2 -lebtree -lrt -lpcre
+
+$O/test-fakedht: override LDFLAGS += -llzo2 -lebtree  -lrt -lpcre
 $O/test-fakedht: $B/fakedht
 
 $B/dhtapp: $C/src/dummydhtapp/main.d

README.rst

@@ -14,27 +14,6 @@ Table (DHT), including:
   The test is run, in this repo, on a fake node, but it can be reused in other
   repos to test real node implementations. (``src.dhttest``)
 
-A Tale of Two Protocols
------------------------
-
-The code in this repo is currently in transition. There exist two parallel
-client/server architectures in the repo, a new architecture (dubbed "neo") --
-based on the core code in the ``swarm/neo`` package -- and a legacy architecture
--- based on the core code located in the other packages of ``swarm``. The neo
-protocol is being introduced in stages, progressively adding features to the
-core client and server code over a series of alpha releases in a separate branch
-(named ``neo``).
-
-Note that the DHT client and node defined in this repo support *both* neo and
-legacy features.
-
-When the alpha releases are considered stable, the ``neo`` branch will be merged
-into the main release branch (currently ``v13.x.x``).
-
-When sufficient neo features have been implemented and the legacy protocol is no
-longer in active use, the legacy protocol will be deprecated and eventually
-removed.
-
 Dependencies
 ============
 

beaver.Dockerfile

@@ -1 +1 @@
-FROM sociomantictsunami/dlang:v3
+FROM sociomantictsunami/dlang:v2

docker/build

@@ -2,6 +2,7 @@
 set -xe
 
 # Install dependencies
+apt-get update
 apt-get install -y \
     liblzo2-dev \
     libebtree6-dev \