From ddf812afd5d42be03da4acf6bed87826c1a879d4 Mon Sep 17 00:00:00 2001
From: Stefano Brivio <sbrivio@redhat.com>
Date: Wed, 29 Mar 2023 20:28:13 +0000
Subject: [PATCH] Update to 0^20230329.gb10b983

---
 .gitignore |  1 +
 passt.spec | 28 +++++++++++++++-------------
 sources    |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13cdebd..e2ac973 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /passt-70c0765b49e19b76639908a7686d8f795ba3ed24.tar.xz
 /passt-dd2349661933c4e9756e524ae9465f38b53b7557.tar.xz
 /passt-1ee2f7cada9e6f739a00d39bb9821f1ce3493d92.tar.xz
+/passt-b10b983fbd00634e275083c37446a538dbff0dbe.tar.xz
diff --git a/passt.spec b/passt.spec
index 9918221..fd3dea3 100644
--- a/passt.spec
+++ b/passt.spec
@@ -7,11 +7,11 @@
 # Copyright (c) 2022 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio@redhat.com>
 
-%global git_hash 1ee2f7cada9e6f739a00d39bb9821f1ce3493d92
+%global git_hash b10b983fbd00634e275083c37446a538dbff0dbe
 %global selinuxtype targeted
 
 Name:		passt
-Version:	0^20230321.g1ee2f7c
+Version:	0^20230329.gb10b983
 Release:	1%{?dist}
 Summary:	User-mode networking daemons for virtual machines and namespaces
 License:	AGPLv3+ and BSD
@@ -62,18 +62,17 @@ ln -sr %{buildroot}%{_mandir}/man1/pasta.1 %{buildroot}%{_mandir}/man1/pasta.avx
 
 pushd contrib/selinux
 make -f %{_datadir}/selinux/devel/Makefile
-install -p -m 644 -D passt.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/passt.pp
-install -p -m 644 -D passt.if %{buildroot}%{_datadir}/selinux/devel/include/contrib/passt.if
-install -p -m 644 -D pasta.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/pasta.pp
-install -p -m 644 -D pasta.if %{buildroot}%{_datadir}/selinux/devel/include/contrib/pasta.if
+install -p -m 644 -D passt.pp %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/passt.pp
+install -p -m 644 -D passt.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/passt.if
+install -p -m 644 -D pasta.pp %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp
 popd
 
 %pre selinux
 %selinux_relabel_pre -s %{selinuxtype}
 
 %post selinux
-%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{name}/passt.pp
-%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{name}/pasta.pp
+%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/passt.pp
+%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp
 
 %postun selinux
 if [ $1 -eq 0 ]; then
@@ -103,13 +102,16 @@ fi
 %endif
 
 %files selinux
-%dir %{_datadir}/selinux/packages/%{name}
-%{_datadir}/selinux/packages/%{name}/passt.pp
-%{_datadir}/selinux/devel/include/contrib/passt.if
-%{_datadir}/selinux/packages/%{name}/pasta.pp
-%{_datadir}/selinux/devel/include/contrib/pasta.if
+%{_datadir}/selinux/packages/%{selinuxtype}/passt.pp
+%{_datadir}/selinux/devel/include/distributed/passt.if
+%{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp
 
 %changelog
+* Wed Mar 29 2023 Stefano Brivio <sbrivio@redhat.com> - 0^20230329.gb10b983-1
+- Adjust path for SELinux policy and interface file to latest guidelines
+- Don't install useless SELinux interface file for pasta
+- Upstream changes: https://passt.top/passt/log/?qt=range&q=2023_03_21.1ee2f7c..2023_03_29.b10b983
+
 * Tue Mar 21 2023 Stefano Brivio <sbrivio@redhat.com> - 0^20230321.g1ee2f7c-1
 - Upstream changes: https://passt.top/passt/log/?qt=range&q=2023_03_17.dd23496..2023_03_21.1ee2f7c
 
diff --git a/sources b/sources
index fa1c7e9..eaba8a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (passt-1ee2f7cada9e6f739a00d39bb9821f1ce3493d92.tar.xz) = 58f6dadaba325c22de4b0d0268e15a2203245725c382887171a8cc26fc73438de0dc6506f55704127ee507ce9ca18833de05f506ff5049c50f18c08bed2a2773
+SHA512 (passt-b10b983fbd00634e275083c37446a538dbff0dbe.tar.xz) = 8f39005ff334f3d1a1cdc89becc6f0d6f59a8fbb4c970ea52f070c62c304822f961c2ce3f6b111fc0681132112f31fb262028d2ff2061ed0ee773b1557758370