Update to 0^20230907.gee58f37

This commit is contained in:
Stefano Brivio 2023-09-07 21:03:19 +00:00
parent 715113152c
commit c9ced8401f
3 changed files with 24 additions and 9 deletions

1
.gitignore vendored
View File

@ -23,3 +23,4 @@
/passt-289301b39c40dfb9f48f54d9848fbc19a17523ba.tar.xz
/passt-0af928eaa020c1062fdc91598dfdc533966e2afe.tar.xz
/passt-a7e4bfb857cb5d0e111ab74b6ace47eea15d2078.tar.xz
/passt-ee58f37db060535bee298bc98f61497eac37f152.tar.xz

View File

@ -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

View File

@ -1 +1 @@
SHA512 (passt-a7e4bfb857cb5d0e111ab74b6ace47eea15d2078.tar.xz) = ac41622cc3c3685ba779bdc5112b10c5bfad09892ed5ca0a8f53b52d2662b8803426c3781ec0fd6a76c1bcce6982bf7952f5b1f81807ce4ca7e570b8f3645e13
SHA512 (passt-ee58f37db060535bee298bc98f61497eac37f152.tar.xz) = 3fb4e26e7a5d65ea8f1dd17df61e67971ae55451c99ee93abe9d79eb13ec4ba88dc9eb7967a417ac01a95d872958c4dc35d15f29ff01591fc0c37d44fe35e4d1