Rebase to the latest setools3 sources

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1266520
This commit is contained in:
Petr Lautrbach 2016-01-29 15:24:03 +01:00
parent e46f55812d
commit a4af57962c
3 changed files with 12 additions and 8 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
setools-3.3.7.tar.bz2 setools-3.3.7.tar.bz2
setools-3.3.8.tar.bz2 setools-3.3.8.tar.bz2
setools-3.3.8-f1e5b20.tar.bz2

View File

@ -1,5 +1,6 @@
%global setools_maj_ver 3.3 %global setools_maj_ver 3.3
%global setools_min_ver 8 %global setools_min_ver 8
%global gitver f1e5b20
Name: setools Name: setools
Version: %{setools_maj_ver}.%{setools_min_ver} Version: %{setools_maj_ver}.%{setools_min_ver}
@ -7,23 +8,25 @@ Release: 8%{?dist}
License: GPLv2 License: GPLv2
URL: http://oss.tresys.com/projects/setools URL: http://oss.tresys.com/projects/setools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Source: http://oss.tresys.com/projects/setools/chrome/site/dists/setools-%{version}/setools-%{version}.tar.bz2 # Source: http://oss.tresys.com/projects/setools/chrome/site/dists/setools-%{version}/setools-%{version}.tar.bz2
# git clone https://github.com/TresysTechnology/setools3.git
# cd setools3
# gitrev=`git rev-parse --verify --short HEAD`
# git archive --format=tar --prefix=setools-3.3.8/ HEAD | bzip2 > setools-3.3.8-$gitrev.tar.bz2
Source: setools-%{version}-%{gitver}.tar.bz2
Source1: setools.pam Source1: setools.pam
Source2: apol.desktop Source2: apol.desktop
Source3: seaudit.desktop Source3: seaudit.desktop
Patch1: 0001-Since-we-do-not-ship-neverallow-rules-all-always-fai.patch Patch1: 0001-Since-we-do-not-ship-neverallow-rules-all-always-fai.patch
Patch2: 0002-Fix-sepol-calls-to-work-with-latest-libsepol.patch Patch2: 0002-Fix-sepol-calls-to-work-with-latest-libsepol.patch
Patch3: 0003-mgrepl-patch-to-Fix-swig-coding-style-for-structures.patch
Patch4: 0004-Apply-selinux_current_policy_path-patch.patch Patch4: 0004-Apply-selinux_current_policy_path-patch.patch
Patch5: 0005-Apply-seaudit-patch-for-progress.c.patch Patch5: 0005-Apply-seaudit-patch-for-progress.c.patch
Patch6: 0006-Add-support-for-boolean-subs.patch Patch6: 0006-Add-support-for-boolean-subs.patch
Patch7: 0007-Setools-noship.patch Patch7: 0007-Setools-noship.patch
Patch8: 0008-Add-alias-support-to-seinfo-t.patch Patch8: 0008-Add-alias-support-to-seinfo-t.patch
Patch9: 0009-Fix-help-message-on-sesearch-D.patch Patch9: 0009-Fix-help-message-on-sesearch-D.patch
Patch10: 0010-Apply-swig-patch-to-make-apol-work-again.patch
Patch11: 0011-Fix-Wformat-security-issues.patch Patch11: 0011-Fix-Wformat-security-issues.patch
Patch12: 0012-Fix-configure.ac-to-use-SWIG-3.0.0.patch Patch12: 0012-Fix-configure.ac-to-use-SWIG-3.0.0.patch
Patch17: 0017-update-to-libsepool-2.4-parser.patch
Summary: Policy analysis tools for SELinux Summary: Policy analysis tools for SELinux
Group: System Environment/Base Group: System Environment/Base
@ -153,17 +156,14 @@ This package includes the following graphical tools:
%setup -q %setup -q
%patch1 -p 1 -b .neverallow %patch1 -p 1 -b .neverallow
%patch2 -p 1 -b .libsepol %patch2 -p 1 -b .libsepol
%patch3 -p 1 -b .swig
%patch4 -p 1 -b .current_policy %patch4 -p 1 -b .current_policy
%patch5 -p 1 -b .seaudit %patch5 -p 1 -b .seaudit
%patch6 -p 1 -b .boolean-subs %patch6 -p 1 -b .boolean-subs
%patch7 -p 1 -b .noship %patch7 -p 1 -b .noship
%patch8 -p 1 -b .seinfo-t %patch8 -p 1 -b .seinfo-t
%patch9 -p 1 -b .sesearch-D %patch9 -p 1 -b .sesearch-D
%patch10 -p 1 -b .wig-patch
%patch11 -p 1 -b .Wformat-security %patch11 -p 1 -b .Wformat-security
%patch12 -p 1 -b .version %patch12 -p 1 -b .version
%patch17 -p 1 -b .libsepool24
%ifarch sparc sparcv9 sparc64 s390 s390x %ifarch sparc sparcv9 sparc64 s390 s390x
for file in `find . -name Makefile.am`; do for file in `find . -name Makefile.am`; do
@ -283,6 +283,9 @@ rm -rf ${RPM_BUILD_ROOT}
%postun libs-tcl -p /sbin/ldconfig %postun libs-tcl -p /sbin/ldconfig
%changelog %changelog
* Fri Jan 29 2016 Petr Lautrbach <plautrba@redhat.com> 3.3.8-8
- Rebase to the latest setools3 sources (#1266520)
* Fri Sep 25 2015 David Sommerseth <davids@redhat.com> - 3.3.8-8 * Fri Sep 25 2015 David Sommerseth <davids@redhat.com> - 3.3.8-8
- Add patch for libsepool 2.4 support - Add patch for libsepool 2.4 support

View File

@ -1 +1 @@
d68d0d4e4da0f01da0f208782ff04b91 setools-3.3.8.tar.bz2 d262b1d4bacaa8c4890d644a03b5e73d setools-3.3.8-f1e5b20.tar.bz2