From c9ced8401f8ad792ef6da439d204102f9a10e7db Mon Sep 17 00:00:00 2001
From: Stefano Brivio <sbrivio@redhat.com>
Date: Thu, 7 Sep 2023 21:03:19 +0000
Subject: [PATCH] Update to 0^20230907.gee58f37

---
 .gitignore |  1 +
 passt.spec | 30 ++++++++++++++++++++++--------
 sources    |  2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 260d543..eea4861 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /passt-289301b39c40dfb9f48f54d9848fbc19a17523ba.tar.xz
 /passt-0af928eaa020c1062fdc91598dfdc533966e2afe.tar.xz
 /passt-a7e4bfb857cb5d0e111ab74b6ace47eea15d2078.tar.xz
+/passt-ee58f37db060535bee298bc98f61497eac37f152.tar.xz
diff --git a/passt.spec b/passt.spec
index 3fbb668..65bba58 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 a7e4bfb857cb5d0e111ab74b6ace47eea15d2078
+%global git_hash ee58f37db060535bee298bc98f61497eac37f152
 %global selinuxtype targeted
 
 Name:		passt
-Version:	0^20230823.ga7e4bfb
+Version:	0^20230907.gee58f37
 Release:	1%{?dist}
 Summary:	User-mode networking daemons for virtual machines and namespaces
 License:	GPLv2+ and BSD
@@ -51,17 +51,27 @@ This package adds SELinux enforcement to passt(1) and pasta(1).
 
 %build
 %set_build_flags
-%make_build VERSION="%{version}-%{release}.%{_arch}"
+# The Makefile creates symbolic links for pasta, but we need actual copies for
+# SELinux file contexts to work as intended. Same with pasta.avx2 if present.
+# Build twice, changing the version string, to avoid duplicate Build-IDs.
+%make_build VERSION="%{version}-%{release}.%{_arch}-pasta"
+mv -f passt pasta
+%ifarch x86_64
+mv -f passt.avx2 pasta.avx2
+%make_build passt passt.avx2 VERSION="%{version}-%{release}.%{_arch}"
+%else
+%make_build passt VERSION="%{version}-%{release}.%{_arch}"
+%endif
 
 %install
+# Already built (not as symbolic links), see above
+touch pasta
+%ifarch x86_64
+touch pasta.avx2
+%endif
 
 %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
@@ -114,6 +124,10 @@ fi
 %{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp
 
 %changelog
+* Thu Sep  7 2023 Stefano Brivio <sbrivio@redhat.com> - 0^20230907.gee58f37-1
+- Replace pasta hard links by separate builds
+- Upstream changes: https://passt.top/passt/log/?qt=range&q=2023_08_23.a7e4bfb..2023_09_07.ee58f37
+
 * Wed Aug 23 2023 Stefano Brivio <sbrivio@redhat.com> - 0^20230823.ga7e4bfb-1
 - Upstream changes: https://passt.top/passt/log/?qt=range&q=2023_08_18.0af928e..2023_08_23.a7e4bfb
 
diff --git a/sources b/sources
index 85f486d..70119fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (passt-a7e4bfb857cb5d0e111ab74b6ace47eea15d2078.tar.xz) = ac41622cc3c3685ba779bdc5112b10c5bfad09892ed5ca0a8f53b52d2662b8803426c3781ec0fd6a76c1bcce6982bf7952f5b1f81807ce4ca7e570b8f3645e13
+SHA512 (passt-ee58f37db060535bee298bc98f61497eac37f152.tar.xz) = 3fb4e26e7a5d65ea8f1dd17df61e67971ae55451c99ee93abe9d79eb13ec4ba88dc9eb7967a417ac01a95d872958c4dc35d15f29ff01591fc0c37d44fe35e4d1