From ee25930db802483df2c9742a173928a32340707f Mon Sep 17 00:00:00 2001 From: Vit Mojzis Date: Mon, 29 Jul 2024 20:43:21 +0200 Subject: [PATCH] libselinux-3.6-2 - restorecon: Include ^^ needed for libsemanage patch Resolves: RHEL-54385 --- ...x-restorecon-Include-selinux-label.h.patch | 48 +++++++++++++++++++ libselinux.spec | 6 ++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 0005-libselinux-restorecon-Include-selinux-label.h.patch diff --git a/0005-libselinux-restorecon-Include-selinux-label.h.patch b/0005-libselinux-restorecon-Include-selinux-label.h.patch new file mode 100644 index 0000000..b0a71b5 --- /dev/null +++ b/0005-libselinux-restorecon-Include-selinux-label.h.patch @@ -0,0 +1,48 @@ +From 3b2fc58d81f8b0fa017a79a91d38ce86e88e4d4d Mon Sep 17 00:00:00 2001 +From: Vit Mojzis +Date: Fri, 26 Jul 2024 17:59:15 +0200 +Subject: [PATCH] libselinux/restorecon: Include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +restorecon.h uses types defined in label.h, so it needs to include +label.h (or code using restorecon.h also needs to include label.h, +which is not practical). + +Fixes: + $ make DESTDIR=~/obj install > make.out +In file included from semanage_store.c:39: +/home/sdsmall/obj/usr/include/selinux/restorecon.h:137:52: error: +‘struct selabel_handle’ declared inside parameter list will not be +visible outside of this definition or declaration [-Werror] + 137 | extern void selinux_restorecon_set_sehandle(struct +selabel_handle *hndl); + | ^~~~~~~~~~~~~~ +cc1: all warnings being treated as errors +make[2]: *** [Makefile:111: semanage_store.o] Error 1 +make[1]: *** [Makefile:15: install] Error 2 +make: *** [Makefile:40: install] Error 1 + +Signed-off-by: Vit Mojzis +Acked-by: Stephen Smalley +--- + libselinux/include/selinux/restorecon.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libselinux/include/selinux/restorecon.h b/libselinux/include/selinux/restorecon.h +index 8df47445..210f65fd 100644 +--- a/libselinux/include/selinux/restorecon.h ++++ b/libselinux/include/selinux/restorecon.h +@@ -1,6 +1,8 @@ + #ifndef _RESTORECON_H_ + #define _RESTORECON_H_ + ++#include ++ + #include + #include + #include +-- +2.45.2 + diff --git a/libselinux.spec b/libselinux.spec index df8cc19..ebf1773 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -4,7 +4,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 3.6 -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain # https://github.com/SELinuxProject/selinux/wiki/Releases Source0: https://github.com/SELinuxProject/selinux/releases/download/3.6/libselinux-3.6.tar.gz @@ -20,6 +20,7 @@ Patch0001: 0001-Use-SHA-2-instead-of-SHA-1.patch Patch0002: 0002-Revert-Do-not-automatically-install-Russian-translat.patch Patch0003: 0003-Revert-libselinux-Remove-the-Russian-translations.patch Patch0004: 0004-Revert-libselinux-Remove-the-Russian-translations.patch +Patch0005: 0005-libselinux-restorecon-Include-selinux-label.h.patch # Patch list end BuildRequires: gcc make BuildRequires: ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre2-devel xz-devel @@ -218,6 +219,9 @@ rm -f %{buildroot}%{_mandir}/man8/togglesebool* %{ruby_vendorarchdir}/selinux.so %changelog +* Tue Aug 06 2024 Vit Mojzis - 3.6-2 +- restorecon: Include (RHEL-50821, RHEL-54385) + * Wed Dec 13 2023 Petr Lautrbach - 3.6-1 - SELinux userspace 3.6 release