diff --git a/fix-fixfiles-N-date-function-two.patch b/fix-fixfiles-N-date-function-two.patch index 9b01e75..92cbd7c 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.3/scripts/fixfiles | 2 +- + policycoreutils/scripts/fixfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/policycoreutils-3.3/scripts/fixfiles b/policycoreutils-3.3/scripts/fixfiles +diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles index 8f5926a..21a1152 100755 ---- a/policycoreutils-3.3/scripts/fixfiles -+++ b/policycoreutils-3.3/scripts/fixfiles +--- a/policycoreutils/scripts/fixfiles ++++ b/policycoreutils/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 c2c429c..7e1f06d 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.3/scripts/fixfiles | 2 +- + policycoreutils/scripts/fixfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/policycoreutils-3.3/scripts/fixfiles b/policycoreutils-3.3/scripts/fixfiles +diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles index 5d77703..8f5926a 100755 ---- a/policycoreutils-3.3/scripts/fixfiles -+++ b/policycoreutils-3.3/scripts/fixfiles +--- a/policycoreutils/scripts/fixfiles ++++ b/policycoreutils/scripts/fixfiles @@ -147,7 +147,7 @@ done # Find files newer then the passed in date and fix the label # diff --git a/policycoreutils-3.3.tar.gz b/policycoreutils-3.3.tar.gz index df43368..bdd9652 100644 Binary files a/policycoreutils-3.3.tar.gz and b/policycoreutils-3.3.tar.gz differ diff --git a/policycoreutils.spec b/policycoreutils.spec index c553c19..8156c58 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -3,16 +3,11 @@ Name: policycoreutils Version: 3.3 -Release: 1 +Release: 2 Summary: Policy core utilities of selinux License: GPLv2 URL: https://github.com/SELinuxProject -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 +Source0: https://github.com/SELinuxProject/selinux/archive/refs/tags/policycoreutils-%{version}.tar.gz Source7: selinux-autorelabel Source8: selinux-autorelabel.service Source9: selinux-autorelabel-mark.service @@ -102,38 +97,31 @@ This contains man files for the using of selinux. %prep -%setup -q -c -n selinux -%setup -q -T -D -a 1 -n selinux -%setup -q -T -D -a 3 -n selinux -%setup -q -T -D -a 4 -n selinux -%setup -q -T -D -a 5 -n selinux -%setup -q -T -D -a 6 -n selinux - -%autopatch -p1 +%autosetup -p 1 -n selinux-policycoreutils-%{version} %build %set_build_flags export PYTHON=%{__python3} -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 +make -C policycoreutils LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="%{_sbindir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C python SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C semodule-utils SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C restorecond SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all %if %{with sandbox} -make -C selinux-sandbox-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C sandbox SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all %endif -make -C selinux-dbus-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C dbus SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all %install mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}/ -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 +make -C policycoreutils LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C python PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C semodule-utils PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C restorecond PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install %if %{with sandbox} -make -C selinux-sandbox-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C sandbox PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install %endif -make -C selinux-dbus-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C dbus PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/restorecond @@ -182,7 +170,7 @@ find %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \ %files -f %{name}.lang -%license policycoreutils-%{version}/COPYING +%license policycoreutils/COPYING %doc %{_usr}/share/doc/%{name} %config(noreplace) %{_sysconfdir}/sestatus.conf %config(noreplace) %{_sysconfdir}/pam.d/newrole @@ -268,8 +256,13 @@ find %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \ %{_mandir}/* %changelog +* Thu Jun 30 2022 lujie - 3.3-2 +- update policycoreutils tar.gz + * Thu Feb 17 2022 panxiaohe - 3.3-1 - update to 3.3 + +* Tue Sep 7 2021 yangzhuangzhuang - 3.1-8 - add "%%set_build_flags" for security build flags * Fri Jun 4 2021 panxiaohe - 3.1-7 diff --git a/restorecond-3.3.tar.gz b/restorecond-3.3.tar.gz deleted file mode 100644 index 59139d7..0000000 Binary files a/restorecond-3.3.tar.gz and /dev/null differ diff --git a/selinux-dbus-3.3.tar.gz b/selinux-dbus-3.3.tar.gz deleted file mode 100644 index c8064d3..0000000 Binary files a/selinux-dbus-3.3.tar.gz and /dev/null differ diff --git a/selinux-python-3.3.tar.gz b/selinux-python-3.3.tar.gz deleted file mode 100644 index dd3c207..0000000 Binary files a/selinux-python-3.3.tar.gz and /dev/null differ diff --git a/selinux-sandbox-3.3.tar.gz b/selinux-sandbox-3.3.tar.gz deleted file mode 100644 index 27e0da5..0000000 Binary files a/selinux-sandbox-3.3.tar.gz and /dev/null differ diff --git a/semodule-utils-3.3.tar.gz b/semodule-utils-3.3.tar.gz deleted file mode 100644 index e9192ab..0000000 Binary files a/semodule-utils-3.3.tar.gz and /dev/null differ