From 6bfe6cef8de6774ca37620c07b38043fb3130cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20I=C3=B1iguez=20Goia?= <gooffy1@gmail.com>
Date: Tue, 15 Nov 2022 00:52:23 +0100
Subject: [PATCH] Bump versions to 1.6.0-rc.3

---
 daemon/core/version.go                      | 2 +-
 ui/opensnitch/version.py                    | 2 +-
 utils/packaging/daemon/deb/debian/NEWS      | 2 +-
 utils/packaging/daemon/deb/debian/changelog | 6 ++++++
 utils/packaging/daemon/rpm/opensnitch.spec  | 8 ++++----
 utils/packaging/ui/deb/debian/changelog     | 6 ++++++
 utils/packaging/ui/rpm/opensnitch-ui.spec   | 4 ++--
 7 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/daemon/core/version.go b/daemon/core/version.go
index d65e54ca..f7f543fe 100644
--- a/daemon/core/version.go
+++ b/daemon/core/version.go
@@ -3,7 +3,7 @@ package core
 // version related consts
 const (
 	Name    = "opensnitch-daemon"
-	Version = "1.6.0rc2"
+	Version = "1.6.0rc3"
 	Author  = "Simone 'evilsocket' Margaritelli"
 	Website = "https://github.com/evilsocket/opensnitch"
 )
diff --git a/ui/opensnitch/version.py b/ui/opensnitch/version.py
index 60753f7b..4a5dc7cd 100644
--- a/ui/opensnitch/version.py
+++ b/ui/opensnitch/version.py
@@ -1 +1 @@
-version = '1.6.0rc2'
+version = '1.6.0rc3'
diff --git a/utils/packaging/daemon/deb/debian/NEWS b/utils/packaging/daemon/deb/debian/NEWS
index 5f48e74b..837c9958 100644
--- a/utils/packaging/daemon/deb/debian/NEWS
+++ b/utils/packaging/daemon/deb/debian/NEWS
@@ -7,7 +7,7 @@ opensnitch (1.6.0-rc.3-1) unstable; urgency=medium
     - /usr/local/lib/opensnitchd/ebpf/
     - /usr/lib/opensnitchd/ebpf/
 
-    Modules under /etc/opensnitchd/ will still ne loaded if found, but it's 
+    Modules under /etc/opensnitchd/ will still be loaded if found, but it's
     deprecated and will be removed in the future.
 
     There's a new module to intercept processes execution. It may cause some
diff --git a/utils/packaging/daemon/deb/debian/changelog b/utils/packaging/daemon/deb/debian/changelog
index fffdb3c5..a018ec2c 100644
--- a/utils/packaging/daemon/deb/debian/changelog
+++ b/utils/packaging/daemon/deb/debian/changelog
@@ -1,3 +1,9 @@
+opensnitch (1.6.0-rc.3-1) unstable; urgency=medium
+
+  * eBPF modules are now installed under /usr/lib/opensnitchd/.
+
+ -- gustavo-iniguez-goya <gustavo.iniguez.goya@gmail.com>  ga <ga@ono-sendai>  Tue, 15 Nov 2022 00:13:09 +0100
+
 opensnitch (1.6.0-rc.2-1) unstable; urgency=medium
 
   * New eBPF module to receive events (new execs, etc).
diff --git a/utils/packaging/daemon/rpm/opensnitch.spec b/utils/packaging/daemon/rpm/opensnitch.spec
index 301ab43f..070fcff0 100644
--- a/utils/packaging/daemon/rpm/opensnitch.spec
+++ b/utils/packaging/daemon/rpm/opensnitch.spec
@@ -1,5 +1,5 @@
 Name:           opensnitch
-Version:        1.6.0rc2
+Version:        1.6.0rc3
 Release:        1%{?dist}
 Summary:        OpenSnitch is a GNU/Linux application firewall
 
@@ -59,9 +59,9 @@ if [ -f /etc/opensnitchd/system-fw.json ]; then
 fi
 install -m 644 -b $B daemon/system-fw.json %{buildroot}/etc/opensnitchd/system-fw.json
 
-install -m 644 ebpf_prog/opensnitch.o %{buildroot}/etc/opensnitchd/opensnitch.o
-install -m 644 ebpf_prog/opensnitch-dns.o %{buildroot}/etc/opensnitchd/opensnitch-dns.o
-install -m 644 ebpf_prog/opensnitch-procs.o %{buildroot}/etc/opensnitchd/opensnitch-procs.o
+install -m 644 ebpf_prog/opensnitch.o %{buildroot}/usr/lib/opensnitchd/opensnitch.o
+install -m 644 ebpf_prog/opensnitch-dns.o %{buildroot}/usr/lib/opensnitchd/opensnitch-dns.o
+install -m 644 ebpf_prog/opensnitch-procs.o %{buildroot}/usr/lib/opensnitchd/opensnitch-procs.o
 
 # upgrade, uninstall
 %preun
diff --git a/utils/packaging/ui/deb/debian/changelog b/utils/packaging/ui/deb/debian/changelog
index c541e85d..388b0b3f 100644
--- a/utils/packaging/ui/deb/debian/changelog
+++ b/utils/packaging/ui/deb/debian/changelog
@@ -1,3 +1,9 @@
+opensnitch-ui (1.6.0-rc.3-1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+ -- Gustavo Iñiguez Goia <gooffy1@gmail.com>  Tue, 15 Nov 2022 00:14:48 +0100
+
 opensnitch-ui (1.6.0-rc.2-1) unstable; urgency=medium
 
   * Bugfixes.
diff --git a/utils/packaging/ui/rpm/opensnitch-ui.spec b/utils/packaging/ui/rpm/opensnitch-ui.spec
index 6fa879f1..94a81779 100644
--- a/utils/packaging/ui/rpm/opensnitch-ui.spec
+++ b/utils/packaging/ui/rpm/opensnitch-ui.spec
@@ -1,6 +1,6 @@
 %define name opensnitch-ui
-%define version 1.6.0rc2
-%define unmangled_version 1.6.0rc2
+%define version 1.6.0rc3
+%define unmangled_version 1.6.0rc3
 %define release 1
 %define __python python3
 %define desktop_file opensnitch_ui.desktop