From fb11201bf1c07400c4c612766022f615694f3899 Mon Sep 17 00:00:00 2001 From: rhatdan Date: Sep 29 2012 10:38:56 +0000 Subject: Apply Lars Jensen patch to fix seaudit --- diff --git a/setools.spec b/setools.spec index 555fcfc..eb0cfcd 100644 --- a/setools.spec +++ b/setools.spec @@ -5,7 +5,7 @@ Name: setools Version: %{setools_maj_ver}.%{setools_min_ver} -Release: 29%{?dist} +Release: 30%{?dist} License: GPLv2 URL: http://oss.tresys.com/projects/setools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -24,6 +24,7 @@ Patch8: 0008-Fix-output-to-match-policy-lines.patch Patch9: 0009-Fix-swig-coding-style-for-structures.patch Patch10: 0010-selinux_current_policy_path.patch Patch11: 0011-setools-noship.patch +Patch12: 0012-seaudit.patch Summary: Policy analysis tools for SELinux Group: System Environment/Base @@ -32,7 +33,6 @@ Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{r # external requirements %define autoconf_ver 2.59 %define bwidget_ver 1.8 -%define java_ver 1.2 %define gtk_ver 2.8 %define python_ver 2.3 %define sepol_ver 2.1.5-3 @@ -53,6 +53,7 @@ License: LGPLv2 Summary: Policy analysis support libraries for SELinux Group: System Environment/Libraries Requires: libselinux >= %{selinux_ver} libsepol >= %{sepol_ver} sqlite >= %{sqlite_ver} +Obsoletes: setools-libs-java BuildRequires: flex bison pkgconfig BuildRequires: glibc-devel libstdc++-devel gcc gcc-c++ BuildRequires: libselinux-devel >= %{selinux_ver} libsepol-devel >= %{sepol_ver} @@ -92,25 +93,6 @@ This package includes Python bindings for the following libraries: libseaudit parse and filter SELinux audit messages in log files libsefs SELinux file contexts library -%package libs-java -License: LGPLv2 -Summary: Java bindings for SELinux policy analysis -Group: Development/Languages -Requires: setools-libs = %{version}-%{release} java >= %{java_ver} -BuildRequires: java-devel >= %{java_ver} swig >= %{swig_ver} - -%description libs-java -SETools is a collection of graphical tools, command-line tools, and -libraries designed to facilitate SELinux policy analysis. - -This package includes Java bindings for the following libraries: - - libapol policy analysis library - libpoldiff semantic policy difference library - libqpol library that abstracts policy internals - libseaudit parse and filter SELinux audit messages in log files - libsefs SELinux file contexts library - %package libs-tcl License: LGPLv2 Summary: Tcl bindings for SELinux policy analysis @@ -187,7 +169,6 @@ This package includes the following graphical tools: %define setoolsdir %{_datadir}/setools-%{setools_maj_ver} %define pkg_py_lib %{python_sitelib}/setools %define pkg_py_arch %{python_sitearch}/setools -%define javajardir %{_datadir}/java %define tcllibdir %{_libdir}/setools %prep @@ -203,6 +184,7 @@ This package includes the following graphical tools: %patch9 -p 1 -b .fixswig %patch10 -p 1 -b .current %patch11 -p 1 -b .noship +%patch12 -p 1 -b .seaudit %ifarch sparc sparcv9 sparc64 s390 s390x for file in `find . -name Makefile.am`; do @@ -217,7 +199,7 @@ autoreconf %build %configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check \ - --enable-swig-python --enable-swig-java --enable-swig-tcl --with-java-prefix=/usr/lib/jvm/java + --enable-swig-python --enable-swig-tcl # work around issue with gcc 4.3 + gnu99 + swig-generated code: sed -i -e 's:$(CC):gcc -std=gnu89:' libseaudit/swig/python/Makefile make %{?_smp_mflags} @@ -236,12 +218,6 @@ install -p -m 644 apol/apol.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/apol.png install -p -m 644 seaudit/seaudit.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/seaudit.png desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} ln -sf consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/seaudit -# replace absolute symlinks with relative symlinks -ln -sf ../setools-%{setools_maj_ver}/qpol.jar ${RPM_BUILD_ROOT}/%{javajardir}/qpol.jar -ln -sf ../setools-%{setools_maj_ver}/apol.jar ${RPM_BUILD_ROOT}/%{javajardir}/apol.jar -ln -sf ../setools-%{setools_maj_ver}/poldiff.jar ${RPM_BUILD_ROOT}/%{javajardir}/poldiff.jar -ln -sf ../setools-%{setools_maj_ver}/seaudit.jar ${RPM_BUILD_ROOT}/%{javajardir}/seaudit.jar -ln -sf ../setools-%{setools_maj_ver}/sefs.jar ${RPM_BUILD_ROOT}/%{javajardir}/sefs.jar # remove static libs rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.a # ensure permissions are correct @@ -274,16 +250,6 @@ rm -rf ${RPM_BUILD_ROOT} %endif %{python_sitearch}/setools*.egg-info -%files libs-java -%defattr(-,root,root,-) -%{_libdir}/libjqpol.so.* -%{_libdir}/libjapol.so.* -%{_libdir}/libjpoldiff.so.* -%{_libdir}/libjseaudit.so.* -%{_libdir}/libjsefs.so.* -%{setoolsdir}/*.jar -%{javajardir}/*.jar - %files libs-tcl %defattr(-,root,root,-) %dir %{tcllibdir} @@ -307,9 +273,7 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-,root,root,-) %{_bindir}/seinfo %{_bindir}/sesearch -%{_bindir}/sechecker %{_bindir}/sediff -%{_bindir}/seaudit-report %{_mandir}/man1/sediff.1.gz %{_mandir}/man1/seinfo.1.gz %{_mandir}/man1/sesearch.1.gz @@ -342,15 +306,14 @@ rm -rf ${RPM_BUILD_ROOT} %postun libs -p /sbin/ldconfig -%post libs-java -p /sbin/ldconfig - -%postun libs-java -p /sbin/ldconfig - %post libs-tcl -p /sbin/ldconfig %postun libs-tcl -p /sbin/ldconfig %changelog +* Fri Sep 28 2012 Dan Walsh - 3.3.7-30 +- Apply Lars Jensen patch to fix seaudit + * Mon Sep 16 2012 Dan Walsh - 3.3.7-29 - Remove tools that we do not want to support