rpms/passt
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase from Fedora 39 to passt-0^20231204.gb86afe3-1.el9

Browse Source 
Resolves: RHEL-19590
This commit is contained in:
Stefano Brivio 2023-12-15 21:15:37 +01:00
parent 71e80c7335
commit f195ccc910
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/passt-4663ccc89a7fcbf9d901a80730ee925fc7f64c59.tar.xz /passt-4663ccc89a7fcbf9d901a80730ee925fc7f64c59.tar.xz
/passt-4ddbcb9c0c555838b123c018a9ebc9b7e14a87e5.tar.xz /passt-4ddbcb9c0c555838b123c018a9ebc9b7e14a87e5.tar.xz
/passt-0af928eaa020c1062fdc91598dfdc533966e2afe.tar.xz /passt-0af928eaa020c1062fdc91598dfdc533966e2afe.tar.xz
/passt-b86afe3559c0bd3d24bc6fed7c60466cf141224c.tar.xz

38
passt.spec
View File

@ -7,12 +7,12 @@
# Copyright (c) 2022 Red Hat GmbH # Copyright (c) 2022 Red Hat GmbH
# Author: Stefano Brivio <sbrivio@redhat.com> # Author: Stefano Brivio <sbrivio@redhat.com>
%global git_hash 0af928eaa020c1062fdc91598dfdc533966e2afe %global git_hash b86afe3559c0bd3d24bc6fed7c60466cf141224c
%global selinuxtype targeted %global selinuxtype targeted
Name: passt Name: passt
Version: 0^20230818.g0af928e Version: 0^20231204.gb86afe3
Release: 4%{?dist} Release: 1%{?dist}
Summary: User-mode networking daemons for virtual machines and namespaces Summary: User-mode networking daemons for virtual machines and namespaces
License: GPLv2+ and BSD License: GPLv2+ and BSD
Group: System Environment/Daemons Group: System Environment/Daemons
@ -53,25 +53,30 @@ This package adds SELinux enforcement to passt(1) and pasta(1).
%build %build
%set_build_flags %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 %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} %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.
#
# RHEL 9 note: switch from hard links to copies -- given that the behaviour
# differs depending on filesystems and how cpio builds archives. This leads to
# "Duplicate build-ids" warnings for rpmbuild at the moment, we need to find a
# better solution upstream.
rm %{buildroot}%{_bindir}/pasta
cp %{buildroot}%{_bindir}/passt %{buildroot}%{_bindir}/pasta
%ifarch x86_64 %ifarch x86_64
rm %{buildroot}%{_bindir}/pasta.avx2
cp %{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/passt.1 %{buildroot}%{_mandir}/man1/passt.avx2.1
ln -sr %{buildroot}%{_mandir}/man1/pasta.1 %{buildroot}%{_mandir}/man1/pasta.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 %endif
pushd contrib/selinux pushd contrib/selinux
@ -121,6 +126,9 @@ fi
%{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp %{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp
%changelog %changelog
* Fri Dec 15 2023 Stefano Brivio <sbrivio@redhat.com> - 0^20231204.gb86afe3-1
- Resolves: RHEL-19590
* Tue Aug 22 2023 Stefano Brivio <sbrivio@redhat.com> - 0^20230818.g0af928e-4 * Tue Aug 22 2023 Stefano Brivio <sbrivio@redhat.com> - 0^20230818.g0af928e-4
- Switch to copies instead of links for pasta: previous workaround unreliable - Switch to copies instead of links for pasta: previous workaround unreliable
- Resolves: RHELPLAN-155811 - Resolves: RHELPLAN-155811

2
sources
View File

@ -1 +1 @@
SHA512 (passt-0af928eaa020c1062fdc91598dfdc533966e2afe.tar.xz) = a09f9ef7e5d68f247da9f74e8794ca287d71cb80e330c34df486290722bc7db6547760afb549c5d8719e05b2eb8cab1971353d7ec80c1a1e40e986b4610ddde4 SHA512 (passt-b86afe3559c0bd3d24bc6fed7c60466cf141224c.tar.xz) = 3a0b73ad703eff4fae6ed128afdc9ceb3d4c4b00cc70bc06cdc30274c1a3ebffe4576a0e99ea66c962b59026400ea665473c337f85012d4c208b735e3030f059