Skip to content

Commit

Permalink
Remove watermarking for hostnet, as it is the exact same version as v…
Browse files Browse the repository at this point in the history
…pnkit

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
  • Loading branch information
samoht committed Aug 3, 2017
1 parent a436f75 commit c2c2d60
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ src/bin/depends.ml: src/bin/depends.ml.in
cp src/bin/depends.ml src/bin/depends.tmp
sed -e 's/££VERSION££/$(shell git rev-parse HEAD)/g' src/bin/depends.tmp > src/bin/depends.ml
cp src/bin/depends.ml src/bin/depends.tmp
sed -e 's/££HOSTNET_PINNED££/$(shell opam info hostnet -f pinned)/g' src/bin/depends.tmp > src/bin/depends.ml
cp src/bin/depends.ml src/bin/depends.tmp
sed -e 's/££HVSOCK_PINNED££/$(shell opam info hvsock -f pinned)/g' src/bin/depends.tmp > src/bin/depends.ml

vpnkit.tgz: vpnkit.exe
Expand Down
2 changes: 0 additions & 2 deletions src/bin/depends.ml.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
let version = "££VERSION££"
let hostnet_version = "%{hostnet:version}%"
let hostnet_pinned = "££HOSTNET_PINNED££"
let uwt_version = "%{uwt:version}%"
let hvsock_version = "%{hvsock:version}%"
let hvsock_pinned = "££HVSOCK_PINNED££"
8 changes: 4 additions & 4 deletions src/bin/main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ module Main(Host: Sig.HOST) = struct
(try Sys.set_signal Sys.sigpipe Sys.Signal_ignore
with Invalid_argument _ -> ());
Log.info (fun f ->
f "vpnkit version %s with hostnet version %s %s uwt version %s hvsock \
version %s %s"
Depends.version Depends.hostnet_version Depends.hostnet_pinned
Depends.uwt_version Depends.hvsock_version Depends.hvsock_pinned
f "vpnkit version %s with uwt version %s hvsock version %s %s"
Depends.version
Depends.uwt_version
Depends.hvsock_version Depends.hvsock_pinned
);
Log.info (fun f -> f "System SOMAXCONN is %d" !Utils.somaxconn);
Utils.somaxconn :=
Expand Down

0 comments on commit c2c2d60

Please sign in to comment.