Github messages for voidlinux
 help / color / mirror / Atom feed
From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: opensnitch-1.4.1
Date: Fri, 08 Oct 2021 07:23:02 +0200	[thread overview]
Message-ID: <20211008052302.UXtNJjcK5ku6dGh9bmxwZIfWaHYxQUp250ePCBlq-nE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32730@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1682 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages snitch
https://github.com/void-linux/void-packages/pull/32730

New package: opensnitch-1.4.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
---
Closes #28819. Picks up where #29849 left off before being closed by the author.

A patch file from https://github.com/void-linux/void-packages/pull/32730.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snitch-32730.patch --]
[-- Type: text/x-diff, Size: 8895 bytes --]

From 75ac22f85890fe0e068f1d64af2d3b20b75ed9e5 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 7 Oct 2021 14:52:40 -0400
Subject: [PATCH 1/3] New package: protobuf-go-1.27.1

---
 srcpkgs/protobuf-go/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/protobuf-go/template

diff --git a/srcpkgs/protobuf-go/template b/srcpkgs/protobuf-go/template
new file mode 100644
index 000000000000..8f4bddbbae8d
--- /dev/null
+++ b/srcpkgs/protobuf-go/template
@@ -0,0 +1,17 @@
+# Template file for 'protobuf-go'
+pkgname=protobuf-go
+version=1.27.1
+revision=1
+build_style=go
+go_import_path="google.golang.org/protobuf"
+go_package="${go_import_path}/cmd/protoc-gen-go"
+short_desc="Go support for Google's protocol buffers"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/protocolbuffers/protobuf-go"
+distfiles="https://github.com/protocolbuffers/protobuf-go/archive/refs/tags/v${version}.tar.gz"
+checksum=3ec41a8324431e72f85e0dc0c2c098cc14c3cb1ee8820996c8f46afca2d65609
+
+post_install() {
+	vlicense LICENSE
+}

From 32f2a9b8312923a12c314ab2f24a2509fb9e4be5 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 7 Oct 2021 15:01:18 -0400
Subject: [PATCH 2/3] New package: protoc-gen-go-grpc-1.1.0

---
 srcpkgs/protoc-gen-go-grpc/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/protoc-gen-go-grpc/template

diff --git a/srcpkgs/protoc-gen-go-grpc/template b/srcpkgs/protoc-gen-go-grpc/template
new file mode 100644
index 000000000000..456bd3d54a66
--- /dev/null
+++ b/srcpkgs/protoc-gen-go-grpc/template
@@ -0,0 +1,14 @@
+# Template file for 'protoc-gen-go-grpc'
+pkgname=protoc-gen-go-grpc
+version=1.1.0
+revision=1
+wrksrc="grpc-go-cmd-${pkgname}-v${version}"
+build_wrksrc="cmd/protoc-gen-go-grpc"
+build_style=go
+go_import_path="google.golang.org/grpc/cmd/protoc-gen-go-grpc"
+short_desc="Generates Go language bindings of protobuf services for gRPC"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/grpc/grpc-go/tree/master/cmd/protoc-gen-go-grpc"
+distfiles="https://github.com/grpc/grpc-go/archive/refs/tags/cmd/protoc-gen-go-grpc/v${version}.tar.gz"
+checksum=9aa1f1f82b45a409c25eb7c06c6b4d2a41eb3c9466ebd808fe6d3dc2fb9165b3

From beb6eeb3c4edfa31c2c54c93bad5fb6eb02590a2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 8 Oct 2021 01:22:43 -0400
Subject: [PATCH 3/3] New package: opensnitch-1.4.1

---
 srcpkgs/opensnitch/files/opensnitchd/run    |  4 +++
 srcpkgs/opensnitch/patches/cc-check.patch   | 13 ++++++++
 srcpkgs/opensnitch/patches/go-sum.patch     | 14 +++++++++
 srcpkgs/opensnitch/patches/musl-int.patch   | 16 ++++++++++
 srcpkgs/opensnitch/patches/protoc-gen.patch | 35 +++++++++++++++++++++
 srcpkgs/opensnitch/template                 | 32 +++++++++++++++++++
 6 files changed, 114 insertions(+)
 create mode 100644 srcpkgs/opensnitch/files/opensnitchd/run
 create mode 100644 srcpkgs/opensnitch/patches/cc-check.patch
 create mode 100644 srcpkgs/opensnitch/patches/go-sum.patch
 create mode 100644 srcpkgs/opensnitch/patches/musl-int.patch
 create mode 100644 srcpkgs/opensnitch/patches/protoc-gen.patch
 create mode 100644 srcpkgs/opensnitch/template

diff --git a/srcpkgs/opensnitch/files/opensnitchd/run b/srcpkgs/opensnitch/files/opensnitchd/run
new file mode 100644
index 000000000000..2c1855eef621
--- /dev/null
+++ b/srcpkgs/opensnitch/files/opensnitchd/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r conf ] && . ./conf
+exec opensnitchd ${OPTS:--rules-path /etc/opensnitchd/rules}
diff --git a/srcpkgs/opensnitch/patches/cc-check.patch b/srcpkgs/opensnitch/patches/cc-check.patch
new file mode 100644
index 000000000000..004f0861a7d9
--- /dev/null
+++ b/srcpkgs/opensnitch/patches/cc-check.patch
@@ -0,0 +1,13 @@
+diff --git a/daemon/netfilter/queue.go b/daemon/netfilter/queue.go
+index 3797486baf..4ee09d68b5 100644
+--- a/daemon/netfilter/queue.go
++++ b/daemon/netfilter/queue.go
+@@ -3,7 +3,7 @@ package netfilter
+ /*
+ #cgo pkg-config: libnetfilter_queue
+ #cgo CFLAGS: -Wall -I/usr/include
+-#cgo LDFLAGS: -L/usr/lib64/ -ldl
++#cgo LDFLAGS: -L/usr/lib64 -ldl
+
+ #include "queue.h"
+ */
diff --git a/srcpkgs/opensnitch/patches/go-sum.patch b/srcpkgs/opensnitch/patches/go-sum.patch
new file mode 100644
index 000000000000..19537e68545a
--- /dev/null
+++ b/srcpkgs/opensnitch/patches/go-sum.patch
@@ -0,0 +1,14 @@
+# Need to generate go.sum otherwise we get errors
+# https://github.com/evilsocket/opensnitch/commit/35975bc76018dbf37a68283463ab9d74948b6892
+diff --git a/daemon/Makefile b/daemon/Makefile
+index 1acfbb0d19..618e96d543 100644
+--- a/daemon/Makefile
++++ b/daemon/Makefile
+@@ -12,6 +12,7 @@ install:
+ 	@systemctl daemon-reload
+ 
+ opensnitchd: $(SRC)
++	@go get
+ 	@go build -o opensnitchd . 
+ 
+ clean:
diff --git a/srcpkgs/opensnitch/patches/musl-int.patch b/srcpkgs/opensnitch/patches/musl-int.patch
new file mode 100644
index 000000000000..99a23ff22674
--- /dev/null
+++ b/srcpkgs/opensnitch/patches/musl-int.patch
@@ -0,0 +1,16 @@
+diff --git a/daemon/netfilter/queue.h b/daemon/netfilter/queue.h
+index 64c3ea7c0c..2ced3bb39e 100644
+--- a/daemon/netfilter/queue.h
++++ b/daemon/netfilter/queue.h
+@@ -14,6 +14,11 @@
+ #include <linux/netfilter.h>
+ #include <libnetfilter_queue/libnetfilter_queue.h>
+
++typedef unsigned int uint;
++typedef uint8_t u_int8_t;
++typedef uint16_t u_int16_t;
++typedef uint32_t u_int32_t;
++
+ typedef struct {
+     uint verdict;
+     uint mark;
diff --git a/srcpkgs/opensnitch/patches/protoc-gen.patch b/srcpkgs/opensnitch/patches/protoc-gen.patch
new file mode 100644
index 000000000000..5210d9bf2d10
--- /dev/null
+++ b/srcpkgs/opensnitch/patches/protoc-gen.patch
@@ -0,0 +1,35 @@
+# Support newer version of protoc-gen-go
+diff --git a/proto/Makefile b/proto/Makefile
+index 2af601d599..2d4c3d6dcf 100644
+--- a/proto/Makefile
++++ b/proto/Makefile
+@@ -1,7 +1,7 @@
+ all: ../daemon/ui/protocol/ui.pb.go ../ui/opensnitch/ui_pb2.py
+ 
+ ../daemon/ui/protocol/ui.pb.go: ui.proto
+-	protoc -I. ui.proto --go_out=plugins=grpc:../daemon/ui/protocol/ --go_opt=paths=source_relative
++	protoc -I. ui.proto --go_out=../daemon/ui/protocol/ --go-grpc_out=../daemon/ui/protocol/ --go_opt=paths=source_relative --go-grpc_opt=paths=source_relative
+ 
+ ../ui/opensnitch/ui_pb2.py: ui.proto
+ 	python3 -m grpc_tools.protoc -I. --python_out=../ui/opensnitch/ --grpc_python_out=../ui/opensnitch/ ui.proto
+
+diff --git a/daemon/go.mod b/daemon/go.mod
+index ec21c04..77bdced 100644
+--- a/daemon/go.mod
++++ b/daemon/go.mod
+@@ -6,7 +6,6 @@ require (
+ 	github.com/evilsocket/ftrace v1.2.0
+ 	github.com/fsnotify/fsnotify v1.4.7
+ 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+-	github.com/golang/protobuf v1.5.0
+ 	github.com/google/gopacket v1.1.14
+ 	github.com/google/nftables v0.0.0-20210514154851-a285acebcad3
+ 	github.com/iovisor/gobpf v0.2.0
+@@ -16,6 +15,6 @@ require (
+ 	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
+ 	golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 // indirect
+ 	golang.org/x/text v0.3.0 // indirect
+-	google.golang.org/grpc v1.27.0
++	google.golang.org/grpc v1.32.0
+ 	google.golang.org/protobuf v1.26.0
+ )
diff --git a/srcpkgs/opensnitch/template b/srcpkgs/opensnitch/template
new file mode 100644
index 000000000000..b0df8f8f6bda
--- /dev/null
+++ b/srcpkgs/opensnitch/template
@@ -0,0 +1,32 @@
+# Template file for 'opensnitch'
+pkgname=opensnitch
+version=1.4.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="git go pkg-config protobuf protobuf-go protoc-gen-go-grpc
+ qt5-host-tools python3-grpcio-tools python3-pip python3-PyQt5-devel-tools
+ python3-setuptools"
+makedepends="libnetfilter_queue-devel libpcap-devel python3-devel python3-inotify
+ python3-slugify python3-Unidecode"
+depends="python3-googleapis-common-protos python3-grpcio python3-inotify
+ python3-PyQt5 python3-PyQt5-sql python3-slugify qt5-wayland qt5-plugin-sqlite"
+conf_files="/etc/opensnitchd/default-config.json
+ /etc/opensnitchd/system-fw.json"
+make_dirs="/etc/opensnitchd/rules/ 0755 root root
+ /etc/opensnitchd/ 0755 root root"
+short_desc="GNU/Linux port of the Little Snitch application firewall"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/evilsocket/opensnitch"
+distfiles="https://github.com/evilsocket/opensnitch/archive/refs/tags/v${version}.tar.gz"
+checksum=a0b89a5acc1880db114bbda52b5e7ac59bc1a4460122e071cb865adfa0c63618
+nopie_files="/usr/bin/opensnitchd"
+
+do_install() {
+	vbin daemon/opensnitchd
+	vinstall daemon/default-config.json 0644 etc/opensnitchd
+	vinstall daemon/system-fw.json 0644 etc/opensnitchd
+	cd ui
+	python3 setup.py install --prefix=/usr --root=${DESTDIR}
+	vsv opensnitchd
+}

  parent reply	other threads:[~2021-10-08  5:23 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-28  5:25 [PR PATCH] New package: opensnitch-1.3.6 cinerea0
2021-09-12 12:23 ` apirusKde
2021-09-13  3:57 ` [PR PATCH] [Updated] " cinerea0
2021-09-21 18:36 ` [PR PATCH] [Updated] New package: opensnitch-1.4.0 cinerea0
2021-09-21 18:40 ` cinerea0
2021-10-07 18:53 ` cinerea0
2021-10-07 19:01 ` [PR PATCH] [Updated] New package: opensnitch-1.4.1 cinerea0
2021-10-07 19:08 ` cinerea0
2021-10-08  5:23 ` cinerea0 [this message]
2021-10-12  3:42 ` cinerea0
2021-10-12  3:49 ` cinerea0
2021-10-12  3:56 ` cinerea0
2021-10-12  4:12 ` cinerea0
2021-10-12  4:26 ` cinerea0
2021-10-12 16:07 ` cinerea0
2021-10-12 17:52 ` cinerea0
2021-10-13  0:09 ` cinerea0
2021-10-13  0:19 ` cinerea0
2021-10-13  0:52 ` ericonr
2021-10-13  3:09 ` [PR PATCH] [Updated] " cinerea0
2021-10-13  4:50 ` cinerea0
2021-10-27 14:12 ` [PR PATCH] [Updated] " cinerea0
2021-10-27 14:17 ` cinerea0
2021-11-05  2:56 ` cinerea0
2021-11-12  4:54 ` New package: opensnitch-1.4.2 cinerea0
2021-11-25  0:20 ` [PR PATCH] [Updated] " cinerea0
2022-02-05  2:25 ` [PR PATCH] [Updated] New package: opensnitch-1.4.3 cinerea0
2022-02-05  3:12 ` [PR PATCH] [Updated] New package: opensnitch-1.5.0 cinerea0
2022-02-06 22:59 ` [PR REVIEW] " ericonr
2022-02-06 22:59 ` ericonr
2022-02-06 22:59 ` ericonr
2022-02-07  1:30 ` cinerea0
2022-02-07  2:27 ` ericonr
2022-02-07  2:27 ` ericonr
2022-02-07  4:23 ` [PR PATCH] [Updated] " cinerea0
2022-02-07  4:42 ` cinerea0
2022-02-07  4:52 ` [PR REVIEW] " cinerea0
2022-02-20  2:30 ` cinerea0
2022-06-03  2:11 ` github-actions
2022-06-04  2:40 ` [PR PATCH] [Updated] " cinerea0
2022-06-04  2:56 ` [PR PATCH] [Updated] New package: opensnitch-1.5.1 cinerea0
2022-06-04  3:11 ` cinerea0
2022-06-05 22:14 ` cinerea0
2022-09-04  2:16 ` github-actions
2022-09-05  3:02 ` cinerea0
2022-12-06  2:29 ` github-actions
2022-12-16  0:35 ` cinerea0
2023-03-16  1:57 ` github-actions
2023-06-16  1:59 ` github-actions
2023-06-29 14:24 ` [PR PATCH] [Updated] " cinerea0
2023-06-29 14:25 ` cinerea0
2023-09-29  1:45 ` New package: opensnitch-1.6.0 github-actions
2023-10-13  1:46 ` [PR PATCH] [Closed]: " github-actions
2024-01-26  2:41 ` jchook
2024-01-26  2:43 ` cinerea0

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211008052302.UXtNJjcK5ku6dGh9bmxwZIfWaHYxQUp250ePCBlq-nE@z \
    --to=cinerea0@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).