!43 update to 3.3 and add %set_build_flags for security build flags

From: @panxh_purple 
Reviewed-by: @zhujianwei001 
Signed-off-by: @zhujianwei001
This commit is contained in:
openeuler-ci-bot 2022-02-18 02:19:35 +00:00 committed by Gitee
commit c5d1429226
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
15 changed files with 38 additions and 32 deletions

View File

@ -4,13 +4,13 @@ Date: Fri, 4 Jun 2021 15:28:24 +0800
Subject: [PATCH] fix fixfiles -N date function 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(-) 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 index 8f5926a..21a1152 100755
--- a/policycoreutils-3.1/scripts/fixfiles --- a/policycoreutils-3.3/scripts/fixfiles
+++ b/policycoreutils-3.1/scripts/fixfiles +++ b/policycoreutils-3.3/scripts/fixfiles
@@ -151,7 +151,7 @@ newer() { @@ -151,7 +151,7 @@ newer() {
shift shift
LogReadOnly LogReadOnly

View File

@ -4,13 +4,13 @@ Date: Fri, 4 Jun 2021 15:26:41 +0800
Subject: [PATCH] fix fixfiles -N date function 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(-) 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 index 5d77703..8f5926a 100755
--- a/policycoreutils-3.1/scripts/fixfiles --- a/policycoreutils-3.3/scripts/fixfiles
+++ b/policycoreutils-3.1/scripts/fixfiles +++ b/policycoreutils-3.3/scripts/fixfiles
@@ -147,7 +147,7 @@ done @@ -147,7 +147,7 @@ done
# Find files newer then the passed in date and fix the label # Find files newer then the passed in date and fix the label
# #

Binary file not shown.

BIN
policycoreutils-3.3.tar.gz Normal file

Binary file not shown.

View File

@ -2,17 +2,17 @@
%bcond_with sandbox %bcond_with sandbox
Name: policycoreutils Name: policycoreutils
Version: 3.1 Version: 3.3
Release: 7 Release: 1
Summary: Policy core utilities of selinux Summary: Policy core utilities of selinux
License: GPLv2 License: GPLv2
URL: https://github.com/SELinuxProject URL: https://github.com/SELinuxProject
Source0: https://github.com/SELinuxProject/selinux/releases/download/20200710/policycoreutils-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/20200710/selinux-python-3.1.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/20200710/selinux-sandbox-3.1.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/20200710/selinux-dbus-3.1.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/20200710/semodule-utils-3.1.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/20200710/restorecond-3.1.tar.gz Source6: https://github.com/SELinuxProject/selinux/releases/download/3.3/restorecond-%{version}.tar.gz
Source7: selinux-autorelabel Source7: selinux-autorelabel
Source8: selinux-autorelabel.service Source8: selinux-autorelabel.service
Source9: selinux-autorelabel-mark.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 Patch1: fix-fixfiles-N-date-function-two.patch
BuildRequires: gcc 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: desktop-file-utils dbus-devel dbus-glib-devel python3-devel libcap-ng-devel
BuildRequires: systemd systemd-units 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} Provides: %{name}-restorecond = %{version}-%{release}
Obsoletes: %{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 Summary: python3 utilities for seLinux policy core
%{?python_provide:%python_provide python3-policycoreutils} %{?python_provide:%python_provide python3-policycoreutils}
Requires: policycoreutils = %{version}-%{release} 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: audit-libs-python3 >= 2.8.5
Requires: python3-IPy Requires: python3-IPy
Requires: checkpolicy Requires: checkpolicy
@ -112,27 +112,28 @@ This contains man files for the using of selinux.
%autopatch -p1 %autopatch -p1
%build %build
%set_build_flags
export PYTHON=%{__python3} 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 policycoreutils-%{version} 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 selinux-python-%{version} 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 semodule-utils-%{version} 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 restorecond-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
%if %{with sandbox} %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 %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 %install
mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}/ 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 policycoreutils-%{version} 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 selinux-python-%{version} 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 semodule-utils-%{version} 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 restorecond-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
%if %{with sandbox} %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 %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 rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/restorecond
@ -181,7 +182,7 @@ find %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \
%files -f %{name}.lang %files -f %{name}.lang
%license policycoreutils-3.1/COPYING %license policycoreutils-%{version}/COPYING
%doc %{_usr}/share/doc/%{name} %doc %{_usr}/share/doc/%{name}
%config(noreplace) %{_sysconfdir}/sestatus.conf %config(noreplace) %{_sysconfdir}/sestatus.conf
%config(noreplace) %{_sysconfdir}/pam.d/newrole %config(noreplace) %{_sysconfdir}/pam.d/newrole
@ -194,6 +195,7 @@ find %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \
%{_bindir}/semodule_link %{_bindir}/semodule_link
%{_bindir}/semodule_package %{_bindir}/semodule_package
%{_bindir}/semodule_unpackage %{_bindir}/semodule_unpackage
%{_bindir}/sestatus
%{_libexecdir}/selinux/hll %{_libexecdir}/selinux/hll
%dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion
%{_datadir}/bash-completion/completions/setsebool %{_datadir}/bash-completion/completions/setsebool
@ -266,6 +268,10 @@ find %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \
%{_mandir}/* %{_mandir}/*
%changelog %changelog
* Thu Feb 17 2022 panxiaohe <panxh.life@foxmail.com> - 3.3-1
- update to 3.3
- add "%%set_build_flags" for security build flags
* Fri Jun 4 2021 panxiaohe <panxiaohe@huawei.com> - 3.1-7 * Fri Jun 4 2021 panxiaohe <panxiaohe@huawei.com> - 3.1-7
- add gcc to BuildRequires - add gcc to BuildRequires
- fix fixfiles -N date function - fix fixfiles -N date function

Binary file not shown.

BIN
restorecond-3.3.tar.gz Normal file

Binary file not shown.

Binary file not shown.

BIN
selinux-dbus-3.3.tar.gz Normal file

Binary file not shown.

Binary file not shown.

BIN
selinux-python-3.3.tar.gz Normal file

Binary file not shown.

Binary file not shown.

BIN
selinux-sandbox-3.3.tar.gz Normal file

Binary file not shown.

Binary file not shown.

BIN
semodule-utils-3.3.tar.gz Normal file

Binary file not shown.