diff --git a/.gitignore b/.gitignore index 76898ba..2e2fa7c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ mcstrans-0.3.1.tgz /mcstrans-2.9-rc1.tar.gz /mcstrans-2.9-rc2.tar.gz /mcstrans-2.9.tar.gz +/mcstrans-3.0-rc1.tar.gz diff --git a/mcstrans.spec b/mcstrans.spec index f72ad9b..84526ac 100644 --- a/mcstrans.spec +++ b/mcstrans.spec @@ -1,11 +1,18 @@ Summary: SELinux Translation Daemon Name: mcstrans -Version: 2.9 -Release: 2%{?dist} +Version: 3.0 +Release: 0.rc1.1%{?dist} License: GPL+ Url: https://github.com/SELinuxProject/selinux/wiki -Source: https://github.com/SELinuxProject/selinux/releases/download/20190315/mcstrans-2.9.tar.gz +Source: https://github.com/SELinuxProject/selinux/releases/download/20191031/mcstrans-3.0-rc1.tar.gz Source2: secolor.conf.8 +# fedora-selinux/selinux: git format-patch -N mcstrans-3.0-rc1 -- mcstrans +# i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done +# Patch list start +Patch0001: 0001-mcstrans-Fir-RESOURCE_LEAK-and-USE_AFTER_FREE-coveri.patch +Patch0002: 0002-mcstrans-Fix-USER_AFTER_FREE-problem.patch +Patch0003: 0003-mcstrans-Do-not-accept-incomplete-contexts.patch +# Patch list end BuildRequires: gcc BuildRequires: libselinux-devel >= %{version} BuildRequires: libcap-devel pcre-devel libsepol-devel libsepol-static @@ -14,7 +21,6 @@ Requires: pcre %{?systemd_requires} Provides: setransd Provides: libsetrans -Obsoletes: libsetrans %description Security-enhanced Linux is a feature of the Linux® kernel and a number @@ -31,7 +37,7 @@ mcstrans provides an translation daemon to translate SELinux categories from internal representations to user defined representation. %prep -%autosetup -p 1 -n mcstrans-%{version} +%autosetup -p 2 -n mcstrans-%{version}-rc1 %build %set_build_flags @@ -66,10 +72,10 @@ install -m644 %{SOURCE2} %{buildroot}%{_mandir}/man8/ %files %{_mandir}/man8/mcs.8.gz %{_mandir}/man8/mcstransd.8.gz -%{_mandir}/man8/setrans.conf.8.gz +%{_mandir}/man5/setrans.conf.5.gz %{_mandir}/ru/man8/mcs.8.gz %{_mandir}/ru/man8/mcstransd.8.gz -%{_mandir}/ru/man8/setrans.conf.8.gz +%{_mandir}/ru/man5/setrans.conf.5.gz %{_mandir}/man8/secolor.conf.8.gz /usr/sbin/mcstransd %{_unitdir}/mcstrans.service @@ -87,6 +93,9 @@ install -m644 %{SOURCE2} %{buildroot}%{_mandir}/man8/ %{_usr}/share/mcstrans/util/* %changelog +* Mon Nov 11 2019 Petr Lautrbach - 3.0-0.rc1.1 +- SELinux userspace 3.0-rc1 release candidate + * Thu Jul 25 2019 Fedora Release Engineering - 2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index cf6e97e..c13f5a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcstrans-2.9.tar.gz) = 25a37c6dd7fa23b0599d7e92da78805e1da1605c998edf00777113c8467b1703f634223dff57627337da51e565cf2d1e475698a5a2310966f1f6dcf6687671d1 +SHA512 (mcstrans-3.0-rc1.tar.gz) = b5d5bb88488bed6ee2b09be4cc7439cdec24a644ec08c70748fc520bccc2ca22e9f944ab06e952dadd1010f7f7cec1f4e77c54a357bb1cfe5376bf2e20ff2139