diff --git a/fix-fixfiles-N-date-function-two.patch b/fix-fixfiles-N-date-function-two.patch index 08b5973b7c07ac4a149ecc1c826a2e73210ba02c..9b01e75980e63571f17a52640afd5c4ec23e1cc7 100644 --- a/fix-fixfiles-N-date-function-two.patch +++ b/fix-fixfiles-N-date-function-two.patch @@ -4,13 +4,13 @@ Date: Fri, 4 Jun 2021 15:28:24 +0800 Subject: [PATCH] fix fixfiles -N date function --- - policycoreutils-3.1/scripts/fixfiles | 2 +- + policycoreutils-3.3/scripts/fixfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/policycoreutils-3.1/scripts/fixfiles b/policycoreutils-3.1/scripts/fixfiles +diff --git a/policycoreutils-3.3/scripts/fixfiles b/policycoreutils-3.3/scripts/fixfiles index 8f5926a..21a1152 100755 ---- a/policycoreutils-3.1/scripts/fixfiles -+++ b/policycoreutils-3.1/scripts/fixfiles +--- a/policycoreutils-3.3/scripts/fixfiles ++++ b/policycoreutils-3.3/scripts/fixfiles @@ -151,7 +151,7 @@ newer() { shift LogReadOnly diff --git a/fix-fixfiles-N-date-function.patch b/fix-fixfiles-N-date-function.patch index 6c25eb0240a3fefe037844cff8ab20fee596e0a1..c2c429cb977a1d821a2b6630cec427ff290d65dd 100644 --- a/fix-fixfiles-N-date-function.patch +++ b/fix-fixfiles-N-date-function.patch @@ -4,13 +4,13 @@ Date: Fri, 4 Jun 2021 15:26:41 +0800 Subject: [PATCH] fix fixfiles -N date function --- - policycoreutils-3.1/scripts/fixfiles | 2 +- + policycoreutils-3.3/scripts/fixfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/policycoreutils-3.1/scripts/fixfiles b/policycoreutils-3.1/scripts/fixfiles +diff --git a/policycoreutils-3.3/scripts/fixfiles b/policycoreutils-3.3/scripts/fixfiles index 5d77703..8f5926a 100755 ---- a/policycoreutils-3.1/scripts/fixfiles -+++ b/policycoreutils-3.1/scripts/fixfiles +--- a/policycoreutils-3.3/scripts/fixfiles ++++ b/policycoreutils-3.3/scripts/fixfiles @@ -147,7 +147,7 @@ done # Find files newer then the passed in date and fix the label # diff --git a/policycoreutils-3.1.tar.gz b/policycoreutils-3.3.tar.gz similarity index 31% rename from policycoreutils-3.1.tar.gz rename to policycoreutils-3.3.tar.gz index 761ceb91b4a555698fdee318dc215d0e96ea8452..df43368c638de05573c4ed46b72a9636fff4a65a 100644 Binary files a/policycoreutils-3.1.tar.gz and b/policycoreutils-3.3.tar.gz differ diff --git a/policycoreutils.spec b/policycoreutils.spec index d000e6e532c129acebf5a3c6fd192cc70d54cdf1..c553c190c61dec594e2241d4c7fb191ebd5061e2 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -2,17 +2,17 @@ %bcond_with sandbox Name: policycoreutils -Version: 3.1 -Release: 7 +Version: 3.3 +Release: 1 Summary: Policy core utilities of selinux License: GPLv2 URL: https://github.com/SELinuxProject -Source0: https://github.com/SELinuxProject/selinux/releases/download/20200710/policycoreutils-3.1.tar.gz -Source1: https://github.com/SELinuxProject/selinux/releases/download/20200710/selinux-python-3.1.tar.gz -Source3: https://github.com/SELinuxProject/selinux/releases/download/20200710/selinux-sandbox-3.1.tar.gz -Source4: https://github.com/SELinuxProject/selinux/releases/download/20200710/selinux-dbus-3.1.tar.gz -Source5: https://github.com/SELinuxProject/selinux/releases/download/20200710/semodule-utils-3.1.tar.gz -Source6: https://github.com/SELinuxProject/selinux/releases/download/20200710/restorecond-3.1.tar.gz +Source0: https://github.com/SELinuxProject/selinux/releases/download/3.3/policycoreutils-%{version}.tar.gz +Source1: https://github.com/SELinuxProject/selinux/releases/download/3.3/selinux-python-%{version}.tar.gz +Source3: https://github.com/SELinuxProject/selinux/releases/download/3.3/selinux-sandbox-%{version}.tar.gz +Source4: https://github.com/SELinuxProject/selinux/releases/download/3.3/selinux-dbus-%{version}.tar.gz +Source5: https://github.com/SELinuxProject/selinux/releases/download/3.3/semodule-utils-%{version}.tar.gz +Source6: https://github.com/SELinuxProject/selinux/releases/download/3.3/restorecond-%{version}.tar.gz Source7: selinux-autorelabel Source8: selinux-autorelabel.service Source9: selinux-autorelabel-mark.service @@ -23,10 +23,10 @@ Patch0: fix-fixfiles-N-date-function.patch Patch1: fix-fixfiles-N-date-function-two.patch BuildRequires: gcc -BuildRequires: pam-devel libsepol-static >= 3.1 libsemanage-static >= 3.1 libselinux-devel >= 3.1 libcap-devel audit-libs-devel gettext +BuildRequires: pam-devel libsepol-static >= 3.3 libsemanage-static >= 3.3 libselinux-devel >= 3.3 libcap-devel audit-libs-devel gettext BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel python3-devel libcap-ng-devel BuildRequires: systemd systemd-units -Requires: libsepol >= 3.1 libselinux-utils util-linux grep gawk diffutils rpm sed coreutils +Requires: libsepol >= 3.3 libselinux-utils util-linux grep gawk diffutils rpm sed coreutils Provides: %{name}-restorecond = %{version}-%{release} Obsoletes: %{name}-restorecond < %{version}-%{release} @@ -43,7 +43,7 @@ It contains the selinux policy core utilities Summary: python3 utilities for seLinux policy core %{?python_provide:%python_provide python3-policycoreutils} Requires: policycoreutils = %{version}-%{release} -Requires: python3-libselinux python3-libsemanage >= 3.1 +Requires: python3-libselinux python3-libsemanage >= 3.3 Requires: audit-libs-python3 >= 2.8.5 Requires: python3-IPy Requires: checkpolicy @@ -112,27 +112,28 @@ This contains man files for the using of selinux. %autopatch -p1 %build +%set_build_flags export PYTHON=%{__python3} -make -C policycoreutils-3.1 LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="%{_sbindir}" LIBSEPOLA="%{_libdir}/libsepol.a" all -make -C selinux-python-3.1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all -make -C semodule-utils-3.1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all -make -C restorecond-3.1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C policycoreutils-%{version} LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="%{_sbindir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C selinux-python-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C semodule-utils-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C restorecond-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all %if %{with sandbox} -make -C selinux-sandbox-3.1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C selinux-sandbox-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all %endif -make -C selinux-dbus-3.1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C selinux-dbus-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all %install mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}/ -make -C policycoreutils-3.1 LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C selinux-python-3.1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C semodule-utils-3.1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C restorecond-3.1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C policycoreutils-%{version} LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C selinux-python-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C semodule-utils-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C restorecond-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install %if %{with sandbox} -make -C selinux-sandbox-3.1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C selinux-sandbox-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install %endif -make -C selinux-dbus-3.1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C selinux-dbus-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/restorecond @@ -181,7 +182,7 @@ find %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \ %files -f %{name}.lang -%license policycoreutils-3.1/COPYING +%license policycoreutils-%{version}/COPYING %doc %{_usr}/share/doc/%{name} %config(noreplace) %{_sysconfdir}/sestatus.conf %config(noreplace) %{_sysconfdir}/pam.d/newrole @@ -194,6 +195,7 @@ find %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \ %{_bindir}/semodule_link %{_bindir}/semodule_package %{_bindir}/semodule_unpackage +%{_bindir}/sestatus %{_libexecdir}/selinux/hll %dir %{_datadir}/bash-completion %{_datadir}/bash-completion/completions/setsebool @@ -266,6 +268,10 @@ find %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \ %{_mandir}/* %changelog +* Thu Feb 17 2022 panxiaohe - 3.3-1 +- update to 3.3 +- add "%%set_build_flags" for security build flags + * Fri Jun 4 2021 panxiaohe - 3.1-7 - add gcc to BuildRequires - fix fixfiles -N date function diff --git a/restorecond-3.1.tar.gz b/restorecond-3.1.tar.gz deleted file mode 100644 index 90f701e461374c15b975e910c0a4005c4070064f..0000000000000000000000000000000000000000 Binary files a/restorecond-3.1.tar.gz and /dev/null differ diff --git a/restorecond-3.3.tar.gz b/restorecond-3.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..59139d7835e070ab670b351eda4182c8555c3e2b Binary files /dev/null and b/restorecond-3.3.tar.gz differ diff --git a/selinux-dbus-3.1.tar.gz b/selinux-dbus-3.1.tar.gz deleted file mode 100644 index 0fe9a9e0884df0eee7923ff75402de49ca760928..0000000000000000000000000000000000000000 Binary files a/selinux-dbus-3.1.tar.gz and /dev/null differ diff --git a/selinux-dbus-3.3.tar.gz b/selinux-dbus-3.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c8064d37251948a1aedb433d34e941e40c3e57d8 Binary files /dev/null and b/selinux-dbus-3.3.tar.gz differ diff --git a/selinux-python-3.1.tar.gz b/selinux-python-3.1.tar.gz deleted file mode 100644 index 0f99365fd62e7df01cbda7b82146518436ae11aa..0000000000000000000000000000000000000000 Binary files a/selinux-python-3.1.tar.gz and /dev/null differ diff --git a/selinux-python-3.3.tar.gz b/selinux-python-3.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..dd3c2079ed3b53e2a23bf2eb231929d97c92b359 Binary files /dev/null and b/selinux-python-3.3.tar.gz differ diff --git a/selinux-sandbox-3.1.tar.gz b/selinux-sandbox-3.1.tar.gz deleted file mode 100644 index a61be1f91690f110982a09bdf785fba7e6c12a42..0000000000000000000000000000000000000000 Binary files a/selinux-sandbox-3.1.tar.gz and /dev/null differ diff --git a/selinux-sandbox-3.3.tar.gz b/selinux-sandbox-3.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..27e0da5adbafd3cca2b8555c282a33ebf4273186 Binary files /dev/null and b/selinux-sandbox-3.3.tar.gz differ diff --git a/semodule-utils-3.1.tar.gz b/semodule-utils-3.1.tar.gz deleted file mode 100644 index 14293ee820b92b639d7f72066ab32b8c5368b581..0000000000000000000000000000000000000000 Binary files a/semodule-utils-3.1.tar.gz and /dev/null differ diff --git a/semodule-utils-3.3.tar.gz b/semodule-utils-3.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e9192ab88300ed6d822602be119316bcc553063a Binary files /dev/null and b/semodule-utils-3.3.tar.gz differ