From 04c7f9b44ddb3840ab3ca58b9bcb8fce39a2a285 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Tue, 6 Aug 2019 19:11:33 +0200
Subject: [PATCH] [pkg] update depends
---
Makefile | 22 ++++++++++++----------
branding/templates/makefile/Makefile | 6 +++---
go.mod | 9 ++++++---
go.sum | 18 ++++++++++++++++++
pkg/config/config.go | 2 +-
5 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/Makefile b/Makefile
index 84ed31d3..fecaa7d6 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,8 @@ depends:
@go get -u golang.org/x/text/cmd/gotext github.com/cratonica/2goarray
dependsLinux:
- @sudo apt install libgtk-3-dev libappindicator3-dev golang pkg-config cmake
+ @sudo apt install libgtk-3-dev libappindicator3-dev golang pkg-config dh-golang golang-golang-x-text-dev cmake devscripts fakeroot debhelper
+ @# debian needs also: snap install snapcraft --classic; snap install multipass --beta --classic
dependsDarwin:
# TODO - bootstrap homebrew if not there
@@ -46,7 +47,7 @@ get:
build: $(foreach path,$(wildcard cmd/*),build_$(patsubst cmd/%,%,$(path)))
build_%:
- @go build -tags $(TAGS) -ldflags "-X main.version=`git describe --tags`" -o $* ./cmd/$*
+ go build -tags $(TAGS) -ldflags "-X main.version=`git describe --tags`" -o $* ./cmd/$*
-@strip $*
@mkdir -p build/bin
@mv $* build/bin/
@@ -141,19 +142,20 @@ gen_pkg_deb:
# packaging action
#########################################################################
-pkg: pkg_win pkg_osx pkg_deb pkg_snap
+packages: pkg_snap pkg_deb pkg_osx pkg_win
-pkg_win:
+package_snap:
+ @make -C build/${PROVIDER} pkg_snap
+
+package_deb:
+ @make -C build/${PROVIDER} pkg_deb
+
+package_win:
@make -C build/${PROVIDER} pkg_win
-pkg_osx:
+package_osx:
@make -C build/${PROVIDER} pkg_osx
-pkg_deb:
- @make -C build/${PROVIDER} pkg_deb
-
-pkg_snap:
- @make -C build/${PROVIDER} pkg_snap
#########################################################################
diff --git a/branding/templates/makefile/Makefile b/branding/templates/makefile/Makefile
index c66880cf..1b1bd704 100755
--- a/branding/templates/makefile/Makefile
+++ b/branding/templates/makefile/Makefile
@@ -81,11 +81,11 @@ pkg_osx:
# -----------------------------------------------------------------------------
pkg_snap:
- echo "[+] building snap..."
+ @echo "[+] building snap..."
snapcraft build
snapcraft snap
- mkdir -p dist
- mv $(BINNAME)* dist/
+ -@mkdir -p dist
+ @mv $(BINNAME)* dist/
pkg_deb:
echo "[+] building debian package version" ${DEB_VERSION}
diff --git a/go.mod b/go.mod
index 2318bdfc..5817b661 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ require (
github.com/AllenDang/w32 v0.0.0-20180428130237-ad0a36d80adc
github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a
github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2
+ github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa // indirect
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520
github.com/getlantern/errors v0.0.0-20180829142810-e24b7f4ff7c7
github.com/getlantern/golog v0.0.0-20170508214112-cca714f7feb5
@@ -20,7 +21,9 @@ require (
github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2
github.com/sevlyar/go-daemon v0.1.5 // indirect
github.com/skratchdot/open-golang v0.0.0-20190104022628-a2dfa6d0dab6
- golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 // indirect
- golang.org/x/text v0.3.0
- golang.org/x/tools v0.0.0-20190206221403-44bcb96178d3 // indirect
+ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
+ golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect
+ golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa // indirect
+ golang.org/x/text v0.3.2
+ golang.org/x/tools v0.0.0-20190806143415-35ef2682e516 // indirect
)
diff --git a/go.sum b/go.sum
index 2213cc33..d443f7d0 100644
--- a/go.sum
+++ b/go.sum
@@ -5,6 +5,8 @@ github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a h1:fXK2Ksf
github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4=
github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2 h1:E7mgGSu7JSN+ELgOq2Pddy8fVfAbMN8u1jUvpKpHtXg=
github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2/go.mod h1:69IHK2p7ZvTuKqxDx3vRWZRyBhLh2rNJN3b6XnjCVhY=
+github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa h1:Wg+722vs7a2zQH5lR9QWYsVbplKeffaQFIs5FTdfNNo=
+github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa/go.mod h1:6Arca19mRx58CA7OWEd7Wu1NpC1rd3uDnNs6s1pj/DI=
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
github.com/getlantern/errors v0.0.0-20180829142810-e24b7f4ff7c7 h1:pKm0g6hKvbd09FUAfFdlGBV/1L1e2KnXsapRNR6Z5/E=
@@ -35,9 +37,25 @@ github.com/sevlyar/go-daemon v0.1.5 h1:Zy/6jLbM8CfqJ4x4RPr7MJlSKt90f00kNM1D401C+
github.com/sevlyar/go-daemon v0.1.5/go.mod h1:6dJpPatBT9eUwM5VCw9Bt6CdX9Tk6UWvhW3MebLDRKE=
github.com/skratchdot/open-golang v0.0.0-20190104022628-a2dfa6d0dab6 h1:cGT4dcuEyBwwu/v6tosyqcDp2yoIo/LwjMGixUvg3nU=
github.com/skratchdot/open-golang v0.0.0-20190104022628-a2dfa6d0dab6/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 h1:LepdCS8Gf/MVejFIt8lsiexZATdoGVyp5bcyS+rYoUI=
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa h1:KIDDMLT1O0Nr7TSxp8xM5tJcdn8tgyAONntO829og1M=
+golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190206221403-44bcb96178d3 h1:M9mD7d4inzK0+YbTneZEs9Y+q1B1zLv8YxJDJ6hFgnY=
golang.org/x/tools v0.0.0-20190206221403-44bcb96178d3/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190806143415-35ef2682e516 h1:r360bnWZkNIjtDFjRC/LVCPgL7sVglqb4XuifefgtB8=
+golang.org/x/tools v0.0.0-20190806143415-35ef2682e516/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 0841e264..70da70cb 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -1,6 +1,6 @@
// Code generated by go generate; DO NOT EDIT.
// This file was generated by vendorize.py
-// At 2019-08-06 16:59:01
+// At 2019-08-06 17:57:48
package config
--
GitLab