From cdf174eb6413d129c17f3acc2e2156c930370f8f Mon Sep 17 00:00:00 2001
From: Stefano Brivio <sbrivio@redhat.com>
Date: Sat, 19 Aug 2023 10:20:10 +0000
Subject: [PATCH] Update to 0^20230818.g0af928e

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

diff --git a/.gitignore b/.gitignore
index a5ff9d2..cdd3abd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /passt-429e1a7e71ad9020f0e53bc467986c55bf5c0e38.tar.xz
 /passt-32660cea04f6e7c353435061b876575539ac8cd9.tar.xz
 /passt-289301b39c40dfb9f48f54d9848fbc19a17523ba.tar.xz
+/passt-0af928eaa020c1062fdc91598dfdc533966e2afe.tar.xz
diff --git a/passt.spec b/passt.spec
index b1e32c3..8be3902 100644
--- a/passt.spec
+++ b/passt.spec
@@ -7,12 +7,12 @@
 # Copyright (c) 2022 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio@redhat.com>
 
-%global git_hash 289301b39c40dfb9f48f54d9848fbc19a17523ba
+%global git_hash 0af928eaa020c1062fdc91598dfdc533966e2afe
 %global selinuxtype targeted
 
 Name:		passt
-Version:	0^20230627.g289301b
-Release:	2%{?dist}
+Version:	0^20230818.g0af928e
+Release:	1%{?dist}
 Summary:	User-mode networking daemons for virtual machines and namespaces
 License:	GPLv2+ and BSD
 Group:		System Environment/Daemons
@@ -54,10 +54,17 @@ This package adds SELinux enforcement to passt(1) and pasta(1).
 %make_build VERSION="%{version}-%{release}.%{_arch}"
 
 %install
+
 %make_install DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_bindir} mandir=%{_mandir} docdir=%{_docdir}/%{name}
+# The Makefile creates symbolic links for pasta, but we need hard links for
+# SELinux file contexts to work as intended. Same with pasta.avx2 if present.
+ln -f %{buildroot}%{_bindir}/passt %{buildroot}%{_bindir}/pasta
 %ifarch x86_64
+ln -f %{buildroot}%{_bindir}/passt.avx2 %{buildroot}%{_bindir}/pasta.avx2
+
 ln -sr %{buildroot}%{_mandir}/man1/passt.1 %{buildroot}%{_mandir}/man1/passt.avx2.1
 ln -sr %{buildroot}%{_mandir}/man1/pasta.1 %{buildroot}%{_mandir}/man1/pasta.avx2.1
+install -p -m 755 %{buildroot}%{_bindir}/passt.avx2 %{buildroot}%{_bindir}/pasta.avx2
 %endif
 
 pushd contrib/selinux
@@ -107,6 +114,10 @@ fi
 %{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp
 
 %changelog
+* Fri Aug 18 2023 Stefano Brivio <sbrivio@redhat.com> - 0^20230818.g0af928e-1
+- Install pasta as hard link to ensure SELinux file context match
+- Upstream changes: https://passt.top/passt/log/?qt=range&q=2023_06_27.289301b..2023_08_18.0af928e
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0^20230627.g289301b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 5547bba..4f9778b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (passt-289301b39c40dfb9f48f54d9848fbc19a17523ba.tar.xz) = 243fa2e99b705aee5d968410475032257003d17b6d27529bd55ab89ebed97ef5f6d93d4e784657e84c48b771d89bc8936ddbf801a3fa1a3871006883352f184f
+SHA512 (passt-0af928eaa020c1062fdc91598dfdc533966e2afe.tar.xz) = a09f9ef7e5d68f247da9f74e8794ca287d71cb80e330c34df486290722bc7db6547760afb549c5d8719e05b2eb8cab1971353d7ec80c1a1e40e986b4610ddde4