From 409faf97bc35c197bbbe993ac462446bccfdd1b3 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 28 Mar 2024 17:42:26 +0300 Subject: [PATCH] import libsepol-3.6-1.el9 --- .gitignore | 2 +- .libsepol.metadata | 2 +- ...-back-POLICYDB_CAPABILITY_-constants.patch | 8 +-- ...tomatically-install-Russian-translat.patch | 25 ++++++++ ...epol-Remove-the-Russian-translations.patch | 60 +++++++++++++++++++ SPECS/libsepol.spec | 14 ++++- 6 files changed, 102 insertions(+), 9 deletions(-) create mode 100644 SOURCES/0002-Revert-Do-not-automatically-install-Russian-translat.patch create mode 100644 SOURCES/0003-Revert-libsepol-Remove-the-Russian-translations.patch diff --git a/.gitignore b/.gitignore index 174cbdd..823e1f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libsepol-3.5.tar.gz +SOURCES/libsepol-3.6.tar.gz diff --git a/.libsepol.metadata b/.libsepol.metadata index bf3d638..339c3a6 100644 --- a/.libsepol.metadata +++ b/.libsepol.metadata @@ -1 +1 @@ -3089ffd091af5a284a230daf77192fccb0695c30 SOURCES/libsepol-3.5.tar.gz +9ce5d9fe7b674dd8fe7a488c7eee872a6e3da257 SOURCES/libsepol-3.6.tar.gz diff --git a/SOURCES/0001-libsepol-Bring-back-POLICYDB_CAPABILITY_-constants.patch b/SOURCES/0001-libsepol-Bring-back-POLICYDB_CAPABILITY_-constants.patch index 0bc995c..072aec8 100644 --- a/SOURCES/0001-libsepol-Bring-back-POLICYDB_CAPABILITY_-constants.patch +++ b/SOURCES/0001-libsepol-Bring-back-POLICYDB_CAPABILITY_-constants.patch @@ -1,4 +1,4 @@ -From 923849fa1cc36580086be542036c4935d7cbfe1c Mon Sep 17 00:00:00 2001 +From c2fc2fd53245db6899adcf2ad121cf25f200644b Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Mon, 23 May 2022 12:25:58 +0200 Subject: [PATCH] libsepol: Bring back POLICYDB_CAPABILITY_* constants @@ -14,10 +14,10 @@ Signed-off-by: Petr Lautrbach 1 file changed, 14 insertions(+) diff --git a/libsepol/include/sepol/policydb/polcaps.h b/libsepol/include/sepol/policydb/polcaps.h -index f5e32e60975d..e568733b3a33 100644 +index 14bcc6cb81d7..5bcd9a124c3f 100644 --- a/libsepol/include/sepol/policydb/polcaps.h +++ b/libsepol/include/sepol/policydb/polcaps.h -@@ -19,6 +19,20 @@ enum { +@@ -20,6 +20,20 @@ enum { }; #define POLICYDB_CAP_MAX (__POLICYDB_CAP_MAX - 1) @@ -39,5 +39,5 @@ index f5e32e60975d..e568733b3a33 100644 extern int sepol_polcap_getnum(const char *name); -- -2.39.0 +2.41.0 diff --git a/SOURCES/0002-Revert-Do-not-automatically-install-Russian-translat.patch b/SOURCES/0002-Revert-Do-not-automatically-install-Russian-translat.patch new file mode 100644 index 0000000..271ea48 --- /dev/null +++ b/SOURCES/0002-Revert-Do-not-automatically-install-Russian-translat.patch @@ -0,0 +1,25 @@ +From a87290f734ba136e7b648a9ce9754767cbb5eed3 Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +Date: Mon, 13 Nov 2023 13:37:36 +0100 +Subject: [PATCH] Revert "Do not automatically install Russian translations" +Content-type: text/plain + +This reverts commit 14f35fde50cd080650ac3b0136234464a3ea6fbe. +--- + libsepol/man/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsepol/man/Makefile b/libsepol/man/Makefile +index 0b410c198a34..f54e478d05ad 100644 +--- a/libsepol/man/Makefile ++++ b/libsepol/man/Makefile +@@ -1,5 +1,5 @@ + # Installation directories. +-LINGUAS ?= ++LINGUAS ?= ru + PREFIX ?= /usr + MANDIR ?= $(PREFIX)/share/man + MAN3SUBDIR ?= man3 +-- +2.41.0 + diff --git a/SOURCES/0003-Revert-libsepol-Remove-the-Russian-translations.patch b/SOURCES/0003-Revert-libsepol-Remove-the-Russian-translations.patch new file mode 100644 index 0000000..49ac753 --- /dev/null +++ b/SOURCES/0003-Revert-libsepol-Remove-the-Russian-translations.patch @@ -0,0 +1,60 @@ +From aeb1a559241c498b8dfcd6dd402be4259860b465 Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +Date: Mon, 13 Nov 2023 13:37:56 +0100 +Subject: [PATCH] Revert "libsepol: Remove the Russian translations" +Content-type: text/plain + +This reverts commit c3d13010734899a3afd9ae2d622ecab56cc74a69. +--- + libsepol/man/ru/man8/chkcon.8 | 39 +++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + create mode 100644 libsepol/man/ru/man8/chkcon.8 + +diff --git a/libsepol/man/ru/man8/chkcon.8 b/libsepol/man/ru/man8/chkcon.8 +new file mode 100644 +index 000000000000..2661afb05baa +--- /dev/null ++++ b/libsepol/man/ru/man8/chkcon.8 +@@ -0,0 +1,39 @@ ++.\" Hey, Emacs! This is an -*- nroff -*- source file. ++.\" Copyright (c) 1997 Manoj Srivastava ++.\" ++.\" This is free documentation; you can redistribute it and/or ++.\" modify it under the terms of the GNU General Public License as ++.\" published by the Free Software Foundation; either version 2 of ++.\" the License, or (at your option) any later version. ++.\" ++.\" The GNU General Public License's references to "object code" ++.\" and "executables" are to be interpreted as the output of any ++.\" document formatting or typesetting system, including ++.\" intermediate and printed output. ++.\" ++.\" This manual is distributed in the hope that it will be useful, ++.\" but WITHOUT ANY WARRANTY; without even the implied warranty of ++.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++.\" GNU General Public License for more details. ++.\" ++.\" You should have received a copy of the GNU General Public ++.\" License along with this manual; if not, write to the Free ++.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, ++.\" USA. ++.\" ++.TH CHKCON 8 "12 марта 2005" "SELinux" "Документация по командной строке SELinux" ++.SH ИМЯ ++chkcon \- определить, является ли контекст безопасности действительным для конкретной двоичной политики ++.SH ОБЗОР ++chkcon policy_file context ++.SH ОПИСАНИЕ ++Эта утилита проверяет контекст безопасности (его строковое представление), заданный аргументом ++.I context, ++относительно данных конфигурации, прочтённых из файла двоичного представления базы данных политик, заданного аргументом ++.I policy_file. ++.SH ФАЙЛЫ ++policy file ++.SH АВТОРЫ ++Эта страница руководства (и только она) была написана Manoj ++Srivastava . ++Перевод на русский язык выполнила Герасименко Олеся . +-- +2.41.0 + diff --git a/SPECS/libsepol.spec b/SPECS/libsepol.spec index 31fe698..47a556c 100644 --- a/SPECS/libsepol.spec +++ b/SPECS/libsepol.spec @@ -1,16 +1,18 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 3.5 +Version: 3.6 Release: 1%{?dist} License: LGPLv2+ -Source0: https://github.com/SELinuxProject/selinux/releases/download/3.5/libsepol-3.5.tar.gz +Source0: https://github.com/SELinuxProject/selinux/releases/download/3.6/libsepol-3.6.tar.gz URL: https://github.com/SELinuxProject/selinux/wiki # $ git clone https://github.com/fedora-selinux/selinux.git # $ cd selinux -# $ git format-patch -N libsepol-3.5 -- libsepol +# $ git format-patch -N libsepol-3.6 -- libsepol # $ i=1; for j in 0*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done # Patch list start Patch0001: 0001-libsepol-Bring-back-POLICYDB_CAPABILITY_-constants.patch +Patch0002: 0002-Revert-Do-not-automatically-install-Russian-translat.patch +Patch0003: 0003-Revert-libsepol-Remove-the-Russian-translations.patch # Patch list end BuildRequires: make BuildRequires: gcc @@ -107,6 +109,12 @@ rm -rf ${RPM_BUILD_ROOT}%{_mandir}/ru/man8 %{_mandir}/man8/chkcon.8.gz %changelog +* Wed Dec 13 2023 Petr Lautrbach - 3.6-1 +- SELinux userspace 3.6 release + +* Mon Nov 13 2023 Petr Lautrbach - 3.6-0.rc1.1 +- SELinux userspace 3.6-rc1 release + * Thu Feb 23 2023 Petr Lautrbach - 3.5-1 - SELinux userspace 3.5 release