From 11c19d2c50cad8a8abbec410d97790671d357674 Mon Sep 17 00:00:00 2001 From: evilsocket Date: Sat, 7 Apr 2018 15:52:58 +0200 Subject: [PATCH] misc: small fix or general refactoring i did not bother commenting --- Makefile | 4 ++++ README.md | 3 +++ daemon/Makefile | 3 +++ daemon/glide.lock | 15 +++++++++++++-- ui/Makefile | 3 +++ ui/requirements.txt | 1 - 6 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5e2c620d..fa571bf0 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,10 @@ daemon/daemon: ui/resources_rc.py: @cd ui && make +deps: + @cd daemon && make deps + @cd ui && make deps + clean: @rm -rf rules @cd daemon && make clean diff --git a/README.md b/README.md index 56b2cf37..ae37610b 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,9 @@ The user interface is a python script running as a `gRPC` server on a unix socke cd ui pip install -r requirements.txt +You will also need to install the package `python-pyqt5` for your system (if anyone finds a way to make this work from +the `requirements.txt` file feel free to send a PR). + ### Running First, you need to decide in which folder opensnitch rules will be saved, it is suggested that you just: diff --git a/daemon/Makefile b/daemon/Makefile index a621a1c6..9e5de5d7 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -1,5 +1,8 @@ all: daemon +deps: + @glide up + daemon: @go build . diff --git a/daemon/glide.lock b/daemon/glide.lock index f2e89449..d04562eb 100644 --- a/daemon/glide.lock +++ b/daemon/glide.lock @@ -1,11 +1,22 @@ hash: 450575a91ccfb9a4eb1aff9f3c75b3531498f4bcafdff47192f4adcce9224ffe -updated: 2018-04-07T14:00:39.674764084+02:00 +updated: 2018-04-07T15:43:09.388912073+02:00 imports: - name: github.com/evilsocket/go-netfilter-queue version: 55dcf9df835d721bb14d69ebf8682e0c9c3e0f18 - name: github.com/evilsocket/opensnitch - version: 3662e7db86a3f72efc40f059dbea94737a641160 + version: 549ec9bb5da4dbaa1c70c3ec43e8f0dac39f0ca6 subpackages: + - daemon/conman + - daemon/core + - daemon/dns + - daemon/firewall + - daemon/log + - daemon/netstat + - daemon/procmon + - daemon/rule + - daemon/statistics + - daemon/ui + - daemon/ui/protocol - proto - name: github.com/golang/protobuf version: 6a1fa9404c0aebf36c879bc50152edcc953910d2 diff --git a/ui/Makefile b/ui/Makefile index ddac074c..a0e25817 100644 --- a/ui/Makefile +++ b/ui/Makefile @@ -3,6 +3,9 @@ all: resources_rc.py resources_rc.py: @pyrcc5 -o resources_rc.py res/resources.qrc +deps: + @pip install -r requirements.txt + clean: @rm -rf *.pyc @rm -rf resources_rc.py diff --git a/ui/requirements.txt b/ui/requirements.txt index 135d76ac..9dda41da 100644 --- a/ui/requirements.txt +++ b/ui/requirements.txt @@ -1,6 +1,5 @@ grpcio==1.10.0 pyinotify==0.9.6 -PyQt5==5.10.1 futures==3.2.0 grpc==0.3-19 unicode_slugify==0.1.3