Bump version to 1.4.0

2 files changed, 38 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e95e3507d7ce..3540418eeb54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opensnitch
 	pkgdesc = GNU/Linux port of the Little Snitch application firewall
-	pkgver = 1.3.6
-	pkgrel = 3
+	pkgver = 1.4.0
+	pkgrel = 1
 	url = https://github.com/evilsocket/opensnitch
 	arch = i686
 	arch = x86_64
@@ -23,7 +23,7 @@ pkgbase = opensnitch
 	optdepends = logrotate: for logfile rotation support
 	backup = etc/opensnitchd/default-config.json
 	backup = etc/opensnitchd/system-fw.json
-	source = https://github.com/evilsocket/opensnitch/archive/v1.3.6.tar.gz
-	sha512sums = 2a6b634fdd820d5b9083058d05f7895112e7d56b5c494be0f96d45a05da89d8ff784a978e61d4d48fbd72ba28ac866a56741dae8011694d5ecaf4deb6238fbad
+	source = https://github.com/evilsocket/opensnitch/archive/v1.4.0.tar.gz
+	sha512sums = 35d9811f9b8c3dc073231dfe20c21151280fdb90a0bc355617b5a2f2109e7f9590579f73ceed944447004bc0e8609c78c90bb0b21b95bb339cf4acbb8aca0fa7
 
 pkgname = opensnitch
diff --git a/PKGBUILD b/PKGBUILD
index 7d74cafad440..7a2ec2d895c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,31 @@
-# Maintainer: Vyacheslav Konovalov <🦀vk@protonmail.com>
+# Maintainer: Vyacheslav Konovalov <vk@protonmail.com>
+# Contributor: Echizen Ryoma <echizenryoma.zhang@gmail.com>
 
 pkgname=opensnitch
-pkgver=1.3.6
-pkgrel=3
+pkgver=1.4.0
+pkgrel=1
 pkgdesc='GNU/Linux port of the Little Snitch application firewall'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url='https://github.com/evilsocket/opensnitch'
 license=('GPL3')
-depends=(
-    'libnetfilter_queue' 'libpcap' 'python-grpcio' 'python-protobuf'
-    'python-pyinotify' 'python-slugify' 'python-pyqt5' 'abseil-cpp'
-)
-makedepends=('go' 'python-setuptools' 'python-grpcio-tools')
+depends=('libnetfilter_queue'
+    'libpcap'
+    'python-grpcio'
+    'python-protobuf'
+    'python-pyinotify'
+    'python-slugify'
+    'python-pyqt5'
+    'abseil-cpp')
+makedepends=('go'
+    'python-setuptools'
+    'python-grpcio-tools')
 optdepends=('logrotate: for logfile rotation support')
 backup=(
     'etc/opensnitchd/default-config.json'
     'etc/opensnitchd/system-fw.json'
 )
 source=("$url/archive/v$pkgver.tar.gz")
-sha512sums=(
-    '2a6b634fdd820d5b9083058d05f7895112e7d56b5c494be0f96d45a05da89d8ff784a978e61d4d48fbd72ba28ac866a56741dae8011694d5ecaf4deb6238fbad'
+sha512sums=('35d9811f9b8c3dc073231dfe20c21151280fdb90a0bc355617b5a2f2109e7f9590579f73ceed944447004bc0e8609c78c90bb0b21b95bb339cf4acbb8aca0fa7'
 )
 
 prepare() {
@@ -29,16 +35,25 @@ prepare() {
 
 build() {
     cd "$srcdir/opensnitch-$pkgver"
-    export CGO_CPPFLAGS="${CPPFLAGS}"
-    export CGO_CFLAGS="${CFLAGS}"
-    export CGO_CXXFLAGS="${CXXFLAGS}"
-    export CGO_LDFLAGS="${LDFLAGS}"
-    export GOFLAGS='-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=mod'
-    make -C daemon
-    make -C proto
 
-    cd ui
+    export PATH=${PATH}:$(go env GOPATH)/bin
+    go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@master
+
+    pushd proto
+    make
+    popd
+
+    pushd daemon
+    make
+    popd
+
+    pushd ui
+    pyrcc5 -o opensnitch/resources_rc.py opensnitch/res/resources.qrc
+    sed -i 's/^import ui_pb2/from . import ui_pb2/' opensnitch/ui_pb2*
     python setup.py build
+    popd
+
+    go clean -modcache
 }
 
 package() {
@@ -51,5 +66,5 @@ package() {
     install -Dm644 debian/opensnitch.logrotate "$pkgdir/etc/logrotate.d/opensnitch"
 
     cd ui
-    python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+    python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
 }