From f3900773032c33220b6dd406ab02f03674658b2f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 19:22:32 +0000 Subject: [PATCH 01/12] makefile update to properly grab makefile.common --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fcbd83b..a87a580 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,19 @@ NAME := setools SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From 6b527a4cc387328ed6cbb3a581d8da24f79a84cf Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Wed, 17 Oct 2007 18:08:46 +0000 Subject: [PATCH 02/12] update rawhide setools to 3.3.1. --- .cvsignore | 14 +- apol.desktop | 2 +- seaudit.desktop | 2 +- sediffx.desktop | 2 +- setools.spec | 463 ++++++++++++++++++++---------------------------- sources | 2 +- 6 files changed, 193 insertions(+), 292 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7bcd7b9..304a002 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,13 +1 @@ -setools-1.4.1.tgz -setools-1.5.tgz -setools-1.5.1.tgz -setools-2.0.0.tar.bz2 -setools-2.1.0.tar.bz2 -setools-2.1.1.tar.bz2 -setools-2.1.2.tar.bz2 -setools-2.1.3.tar.bz2 -setools-2.2.tar.bz2 -setools-2.3.tar.bz2 -setools-2.4.tar.bz2 -setools-3.1.tar.bz2 -setools-3.2.tar.bz2 +setools-3.3.1.tar.gz diff --git a/apol.desktop b/apol.desktop index 230e94b..6cc82cc 100644 --- a/apol.desktop +++ b/apol.desktop @@ -7,6 +7,6 @@ Exec=/usr/bin/apol Type=Application Terminal=false Encoding=UTF-8 -Categories=Application;System;X-Red-Hat-Base; +Categories=System; X-Desktop-File-Install-Version=0.2 StartupNotify=true diff --git a/seaudit.desktop b/seaudit.desktop index 077c131..e07e62b 100644 --- a/seaudit.desktop +++ b/seaudit.desktop @@ -7,6 +7,6 @@ Exec=/usr/bin/seaudit Type=Application Terminal=false Encoding=UTF-8 -Categories=Application;System;X-Red-Hat-Base; +Categories=System; X-Desktop-File-Install-Version=0.2 StartupNotify=true diff --git a/sediffx.desktop b/sediffx.desktop index 0294381..fe115cc 100644 --- a/sediffx.desktop +++ b/sediffx.desktop @@ -6,7 +6,7 @@ Exec=/usr/bin/sediffx Type=Application Terminal=false Encoding=UTF-8 -Categories=Application;System;X-Red-Hat-Base; +Categories=System; X-Desktop-File-Install-Version=0.2 StartupNotify=true Icon=sediffx.png diff --git a/setools.spec b/setools.spec index 6eb8c24..3906fa0 100644 --- a/setools.spec +++ b/setools.spec @@ -1,23 +1,34 @@ +%define setools_maj_ver 3.3 +%define setools_min_ver 1 +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + Name: setools -Version: 3.2 -Release: 4%{?dist} -License: GPL +Version: %{setools_maj_ver}.%{setools_min_ver} +Release: 6%{?dist} +License: GPLv2 URL: http://oss.tresys.com/projects/setools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Source: setools-%{version}.tar.bz2 -AutoReqProv: no +Source: http://oss.tresys.com/projects/setools/chrome/site/dists/setools-%{version}/setools-%{version}.tar.gz +Source1: setools.pam +Source2: apol.desktop +Source3: seaudit.desktop +Source4: sediffx.desktop Summary: Policy analysis tools for SELinux Group: System Environment/Base -Requires: setools-libs = %{version} setools-gui = %{version} setools-console = %{version} +Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{release} setools-gui = %{version}-%{release} setools-console = %{version}-%{release} -# disable auto dependency generation because they are explicitly listed -%define __find_requires %{nil} - -%define libqpol_ver 1.2 -%define libapol_ver 4.0 -%define libpoldiff_ver 1.2 -%define libsefs_ver 3.1 -%define libseaudit_ver 4.1 +# 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 1.12.27 +%define selinux_ver 1.30 +%define sqlite_ver 3.2.0 +%define swig_ver 1.3.28 +%define tcltk_ver 8.4.9 %description SETools is a collection of graphical tools, command-line tools, and @@ -27,16 +38,16 @@ This meta-package depends upon the main packages necessary to run SETools. %package libs -License: LGPL +License: LGPLv2 Summary: Policy analysis support libraries for SELinux Group: System Environment/Libraries -Requires: libselinux >= 1.30 libsepol >= 1.12.27 libxml2 -Provides: libqpol = %{libqpol_ver} libapol = %{libapol_ver} libpoldiff = %{libpoldiff_ver} libsefs = %{libsefs_ver} libseaudit = %{libseaudit_ver} -BuildRequires: flex, bison, pkgconfig -BuildRequires: libselinux-devel >= 1.30 libsepol-devel >= 1.12.27 libxml2-devel -BuildRequires: tk-devel >= 8.4.9 tcl-devel >= 8.4.9 -BuildRequires: gtk2-devel >= 2.8 libglade2-devel libxml2-devel -BuildRequires: autoconf >= 2.59 automake +Requires: libselinux >= %{selinux_ver} libsepol >= %{sepol_ver} sqlite >= %{sqlite_ver} libstdc++.so.6 +BuildRequires: flex bison pkgconfig +BuildRequires: glibc-devel libstdc++-devel gcc gcc-c++ +BuildRequires: libselinux-devel >= %{selinux_ver} libsepol-devel >= %{sepol_ver} +BuildRequires: sqlite-devel >= %{sqlite_ver} libxml2-devel +BuildRequires: tcl-devel >= %{tcltk_ver} +BuildRequires: autoconf >= %{autoconf_ver} automake %description libs SETools is a collection of graphical tools, command-line tools, and @@ -48,15 +59,14 @@ This package includes the following run-time libraries: libpoldiff semantic policy difference library libqpol library that abstracts policy internals libseaudit parse and filter SELinux audit messages in log files - libsefs SELinux filesystem database library + libsefs SELinux file contexts library %package libs-python -License: LGPL +License: LGPLv2 Summary: Python bindings for SELinux policy analysis Group: Development/Languages -Requires: setools-libs = %{version} python2 >= 2.3 -Provides: libqpol-python = %{libqpol_ver} libapol-python = %{libapol_ver} libpoldiff-python = %{libpoldiff_ver} libseaudit-python = %{libseaudit_ver} -BuildRequires: python2-devel >= 2.3 swig >= 1.3.28 +Requires: setools-libs = %{version}-%{release} python2 >= %{python_ver} +BuildRequires: python2-devel >= %{python_ver} swig >= %{swig_ver} %description libs-python SETools is a collection of graphical tools, command-line tools, and @@ -68,14 +78,14 @@ This package includes Python bindings for the following libraries: 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-java -License: LGPL +License: LGPLv2 Summary: Java bindings for SELinux policy analysis Group: Development/Languages -Requires: setools-libs = %{version} java >= 1.2 -Provides: libqpol-java = %{libqpol_ver} libapol-java = %{libapol_ver} libpoldiff-java = %{libpoldiff_ver} libseaudit-java = %{libseaudit_ver} -BuildRequires: java-devel >= 1.2 swig >= 1.3.28 +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 @@ -87,12 +97,33 @@ This package includes Java bindings for the following libraries: 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 +Group: Development/Languages +Requires: setools-libs = %{version}-%{release} tcl >= %{tcltk_ver} +BuildRequires: tcl-devel >= %{tcltk_ver} swig >= %{swig_ver} + +%description libs-tcl +SETools is a collection of graphical tools, command-line tools, and +libraries designed to facilitate SELinux policy analysis. + +This package includes Tcl 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 devel -License: LGPL +License: LGPLv2 Summary: Policy analysis development files for SELinux Group: Development/Libraries -Requires: libselinux-devel >= 1.30 libsepol-devel >= 1.12.27 libxml2-devel setools-libs = %{version} +Requires: libselinux-devel >= %{selinux_ver} libsepol-devel >= %{sepol_ver} setools-libs = %{version}-%{release} +BuildRequires: sqlite-devel >= %{sqlite_ver} libxml2-devel %description devel SETools is a collection of graphical tools, command-line tools, and @@ -101,20 +132,18 @@ libraries designed to facilitate SELinux policy analysis. This package includes header files and archives for the following libraries: - awish customized wish interpreter for apol development libapol policy analysis library - libapol-tcl bindings between apol and libapol libpoldiff semantic policy difference library libqpol library that abstracts policy internals libseaudit parse and filter SELinux audit messages in log files - libsefs SELinux filesystem database library + libsefs SELinux file contexts library %package console -AutoReqProv: no Summary: Policy analysis command-line tools for SELinux Group: System Environment/Base -Requires: libqpol >= 1.1 libapol >= 4.0 libpoldiff >= 1.2 libsefs >= 3.1 libseaudit >= 4.0 -Requires: libselinux >= 1.30 +License: GPLv2 +Requires: setools-libs = %{version}-%{release} +Requires: libselinux >= %{selinux_ver} %description console SETools is a collection of graphical tools, command-line tools, and @@ -125,16 +154,17 @@ This package includes the following console tools: seaudit-report audit log analysis tool sechecker SELinux policy checking tool secmds command line tools: seinfo, sesearch, findcon, - replcon, indexcon, and searchcon + replcon, and indexcon sediff semantic policy difference tool %package gui -AutoReqProv: no Summary: Policy analysis graphical tools for SELinux Group: System Environment/Base -Requires: libqpol >= 1.1 libapol >= 4.0 libpoldiff >= 1.2 libsefs >= 3.0 libseaudit >= 4.1 -Requires: tcl >= 8.4.9 tk >= 8.4.9 bwidget >= 1.8 -Requires: glib2 gtk2 >= 2.8 usermode +Requires: tcl >= %{tcltk_ver} tk >= %{tcltk_ver} bwidget >= %{bwidget_ver} +Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{release} +Requires: glib2 gtk2 >= %{gtk_ver} usermode +BuildRequires: gtk2-devel >= %{gtk_ver} libglade2-devel libxml2-devel tk-devel >= %{tcltk_ver} +BuildRequires: desktop-file-utils %description gui SETools is a collection of graphical tools, command-line tools, and @@ -142,232 +172,124 @@ libraries designed to facilitate SELinux policy analysis. This package includes the following graphical tools: - apol Tcl/Tk-based policy analysis tool + apol policy analysis tool seaudit audit log analysis tool sediffx semantic policy difference tool -%define setoolsdir %{_datadir}/setools-%{version} -%define pkgpyexecdir %{_libdir}/python?.?/site-packages/setools -%define pkgpythondir %{_exec_prefix}/lib*/python?.?/site-packages/setools -%define javalibdir %{_libdir}/setools +%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 %setup -q %build -%configure --disable-bwidget-check --disable-selinux-check --enable-swig-python --enable-swig-java +%configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check --enable-swig-python --enable-swig-java --enable-swig-tcl make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} -make DESTDIR=${RPM_BUILD_ROOT} install -mkdir -p ${RPM_BUILD_ROOT}/usr/share/pixmaps +make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" install +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d -install -m 644 packages/rpm/seaudit.pam ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit +install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps -install -m 644 packages/rpm/seaudit.console ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit +install -p -m 644 packages/rpm/seaudit.console ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit install -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/applications -install -m 664 packages/rpm/apol.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop -install -m 664 packages/rpm/seaudit.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop -install -m 664 packages/rpm/sediffx.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop -install -m 664 apol/apol.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/apol.png -install -m 664 seaudit/seaudit.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/seaudit.png -install -m 664 sediff/sediffx.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/sediffx.png -cd $RPM_BUILD_ROOT/%{_bindir}/ -ln -sf consolehelper seaudit +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 +install -p -m 644 sediff/sediffx.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/sediffx.png +desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} %{SOURCE3} %{SOURCE4} +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 +chmod 0755 ${RPM_BUILD_ROOT}/%{_libdir}/*.so.* +chmod 0755 ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/*/*.so.* +chmod 0755 ${RPM_BUILD_ROOT}/%{pkg_py_arch}/*.so.* +chmod 0755 ${RPM_BUILD_ROOT}/%{_bindir}/* +chmod 0755 ${RPM_BUILD_ROOT}/%{_sbindir}/* +chmod 0755 ${RPM_BUILD_ROOT}/%{setoolsdir}/seaudit-report-service +chmod 0644 ${RPM_BUILD_ROOT}/%{tcllibdir}/*/pkgIndex.tcl %clean rm -rf ${RPM_BUILD_ROOT} %files -%doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL KNOWN-BUGS NEWS README +%defattr(-,root,root,-) %files libs -%defattr(755,root,root) -%{_libdir}/libqpol.so.%{libqpol_ver} -%{_libdir}/libqpol.so.1 -%{_libdir}/libapol.so.%{libapol_ver} -%{_libdir}/libapol.so.4 -%{_libdir}/libpoldiff.so.%{libpoldiff_ver} -%{_libdir}/libpoldiff.so.1 -%{_libdir}/libsefs.so.%{libsefs_ver} -%{_libdir}/libsefs.so.3 -%{_libdir}/libseaudit.so.%{libseaudit_ver} -%{_libdir}/libseaudit.so.4 -%defattr(-, root, root) -%{setoolsdir}/seaudit-report.conf -%{setoolsdir}/seaudit-report.css +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL KNOWN-BUGS NEWS README +%{_libdir}/libqpol.so.* +%{_libdir}/libapol.so.* +%{_libdir}/libpoldiff.so.* +%{_libdir}/libsefs.so.* +%{_libdir}/libseaudit.so.* +%dir %{setoolsdir} %files libs-python -%defattr(-,root,root) -%{pkgpythondir}/__init__.py -%{pkgpythondir}/__init__.pyc -%{pkgpythondir}/__init__.pyo -%{pkgpythondir}/qpol.py -%{pkgpythondir}/qpol.pyc -%{pkgpythondir}/qpol.pyo -%{pkgpyexecdir}/_qpol.so.%{libqpol_ver} -%{pkgpyexecdir}/_qpol.so.1 -%attr(755,root,root) %{pkgpyexecdir}/_qpol.so -%{pkgpythondir}/apol.py -%{pkgpythondir}/apol.pyc -%{pkgpythondir}/apol.pyo -%{pkgpyexecdir}/_apol.so.%{libapol_ver} -%{pkgpyexecdir}/_apol.so.4 -%attr(755,root,root) %{pkgpyexecdir}/_apol.so -%{pkgpythondir}/poldiff.py -%{pkgpythondir}/poldiff.pyc -%{pkgpythondir}/poldiff.pyo -%{pkgpyexecdir}/_poldiff.so.%{libpoldiff_ver} -%{pkgpyexecdir}/_poldiff.so.1 -%attr(755,root,root) %{pkgpyexecdir}/_poldiff.so -%{pkgpythondir}/seaudit.py -%{pkgpythondir}/seaudit.pyc -%{pkgpythondir}/seaudit.pyo -%{pkgpyexecdir}/_seaudit.so.%{libseaudit_ver} -%{pkgpyexecdir}/_seaudit.so.4 -%attr(755,root,root) %{pkgpyexecdir}/_seaudit.so +%defattr(-,root,root,-) +%{pkg_py_lib}/ +%ifarch x86_64 ppc64 +%{pkg_py_arch}/ +%endif %files libs-java -%defattr(-,root,root) -%{_libdir}/libjqpol.so.%{libqpol_ver} -%{_libdir}/libjqpol.so.1 -%{_libdir}/libjqpol.so -%{_libdir}/libjapol.so.%{libapol_ver} -%{_libdir}/libjapol.so.4 -%{_libdir}/libjapol.so -%{_libdir}/libjpoldiff.so.%{libpoldiff_ver} -%{_libdir}/libjpoldiff.so.1 -%{_libdir}/libjpoldiff.so -%{_libdir}/libjseaudit.so.%{libseaudit_ver} -%{_libdir}/libjseaudit.so.4 -%{_libdir}/libjseaudit.so -%{javalibdir}/qpol.jar -%{javalibdir}/apol.jar -%{javalibdir}/poldiff.jar -%{javalibdir}/seaudit.jar +%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,-) +%{tcllibdir}/qpol/ +%{tcllibdir}/apol/ +%{tcllibdir}/poldiff/ +%{tcllibdir}/seaudit/ +%{tcllibdir}/sefs/ %files devel -%defattr(-,root,root) -%{_bindir}/awish -%{_libdir}/libqpol.a -%{_libdir}/libqpol.so -%{_libdir}/libapol.so -%{_libdir}/libapol.a -%{_libdir}/libpoldiff.a -%{_libdir}/libpoldiff.so -%{_libdir}/libsefs.a -%{_libdir}/libsefs.so -%{_libdir}/libseaudit.a -%{_libdir}/libseaudit.so -%{_libdir}/libapol-tcl.a -%{_includedir}/qpol/avrule_query.h -%{_includedir}/qpol/bool_query.h -%{_includedir}/qpol/class_perm_query.h -%{_includedir}/qpol/cond_query.h -%{_includedir}/qpol/constraint_query.h -%{_includedir}/qpol/context_query.h -%{_includedir}/qpol/fs_use_query.h -%{_includedir}/qpol/genfscon_query.h -%{_includedir}/qpol/isid_query.h -%{_includedir}/qpol/iterator.h -%{_includedir}/qpol/mls_query.h -%{_includedir}/qpol/mlsrule_query.h -%{_includedir}/qpol/module.h -%{_includedir}/qpol/netifcon_query.h -%{_includedir}/qpol/nodecon_query.h -%{_includedir}/qpol/policy.h -%{_includedir}/qpol/policy_extend.h -%{_includedir}/qpol/portcon_query.h -%{_includedir}/qpol/rbacrule_query.h -%{_includedir}/qpol/role_query.h -%{_includedir}/qpol/syn_rule_query.h -%{_includedir}/qpol/terule_query.h -%{_includedir}/qpol/type_query.h -%{_includedir}/qpol/user_query.h -%{_includedir}/qpol/util.h -%{_includedir}/apol/avl-util.h -%{_includedir}/apol/avrule-query.h -%{_includedir}/apol/bool-query.h -%{_includedir}/apol/bst.h -%{_includedir}/apol/class-perm-query.h -%{_includedir}/apol/condrule-query.h -%{_includedir}/apol/constraint-query.h -%{_includedir}/apol/context-query.h -%{_includedir}/apol/domain-trans-analysis.h -%{_includedir}/apol/fscon-query.h -%{_includedir}/apol/infoflow-analysis.h -%{_includedir}/apol/isid-query.h -%{_includedir}/apol/mls-query.h -%{_includedir}/apol/netcon-query.h -%{_includedir}/apol/perm-map.h -%{_includedir}/apol/policy.h -%{_includedir}/apol/policy-path.h -%{_includedir}/apol/policy-query.h -%{_includedir}/apol/range_trans-query.h -%{_includedir}/apol/rbacrule-query.h -%{_includedir}/apol/relabel-analysis.h -%{_includedir}/apol/render.h -%{_includedir}/apol/role-query.h -%{_includedir}/apol/terule-query.h -%{_includedir}/apol/type-query.h -%{_includedir}/apol/types-relation-analysis.h -%{_includedir}/apol/user-query.h -%{_includedir}/apol/util.h -%{_includedir}/apol/vector.h -%{_includedir}/poldiff/poldiff.h -%{_includedir}/poldiff/attrib_diff.h -%{_includedir}/poldiff/avrule_diff.h -%{_includedir}/poldiff/bool_diff.h -%{_includedir}/poldiff/cat_diff.h -%{_includedir}/poldiff/class_diff.h -%{_includedir}/poldiff/level_diff.h -%{_includedir}/poldiff/range_diff.h -%{_includedir}/poldiff/range_trans_diff.h -%{_includedir}/poldiff/rbac_diff.h -%{_includedir}/poldiff/role_diff.h -%{_includedir}/poldiff/terule_diff.h -%{_includedir}/poldiff/user_diff.h -%{_includedir}/poldiff/type_diff.h -%{_includedir}/poldiff/type_map.h -%{_includedir}/poldiff/util.h -%{_includedir}/sefs/file_contexts.h -%{_includedir}/sefs/fsdata.h -%{_includedir}/sefs/fshash.h -%{_includedir}/sefs/util.h -%{_includedir}/seaudit/avc_message.h -%{_includedir}/seaudit/bool_message.h -%{_includedir}/seaudit/filter.h -%{_includedir}/seaudit/load_message.h -%{_includedir}/seaudit/log.h -%{_includedir}/seaudit/message.h -%{_includedir}/seaudit/model.h -%{_includedir}/seaudit/parse.h -%{_includedir}/seaudit/report.h -%{_includedir}/seaudit/sort.h -%{_includedir}/seaudit/util.h +%defattr(-,root,root,-) +%{_libdir}/*.so +%{_libdir}/pkgconfig/* +%{_includedir}/qpol/ +%{_includedir}/apol/ +%{_includedir}/poldiff/ +%{_includedir}/seaudit/ +%{_includedir}/sefs/ %files console -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/seinfo %{_bindir}/sesearch %{_bindir}/indexcon %{_bindir}/findcon %{_bindir}/replcon -%{_bindir}/searchcon %{_bindir}/sechecker %{_bindir}/sediff %{_bindir}/seaudit-report -%{setoolsdir}/sechecker-profiles/all-checks.sechecker -%{setoolsdir}/sechecker-profiles/analysis-checks.sechecker -%{setoolsdir}/sechecker-profiles/devel-checks.sechecker -%{setoolsdir}/sechecker-profiles/sechecker.dtd +%{setoolsdir}/sechecker-profiles/ %{setoolsdir}/sechecker_help.txt %{setoolsdir}/seaudit-report-service +%{setoolsdir}/seaudit-report.conf +%{setoolsdir}/seaudit-report.css %{_mandir}/man1/findcon.1.gz %{_mandir}/man1/indexcon.1.gz %{_mandir}/man1/replcon.1.gz -%{_mandir}/man1/searchcon.1.gz %{_mandir}/man1/sechecker.1.gz %{_mandir}/man1/sediff.1.gz %{_mandir}/man1/seinfo.1.gz @@ -375,57 +297,48 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/seaudit-report.8.gz %files gui -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/seaudit %{_bindir}/sediffx %{_bindir}/apol +%{tcllibdir}/apol_tcl/ %{setoolsdir}/sediff_help.txt -%{setoolsdir}/sediffx.glade -%{setoolsdir}/sediffx.png -%{setoolsdir}/sediffx-small.png %{setoolsdir}/apol_help.txt %{setoolsdir}/domaintrans_help.txt %{setoolsdir}/file_relabel_help.txt %{setoolsdir}/infoflow_help.txt %{setoolsdir}/types_relation_help.txt -%{setoolsdir}/apol_perm_mapping_ver12 -%{setoolsdir}/apol_perm_mapping_ver15 -%{setoolsdir}/apol_perm_mapping_ver16 -%{setoolsdir}/apol_perm_mapping_ver17 -%{setoolsdir}/apol_perm_mapping_ver18 -%{setoolsdir}/apol_perm_mapping_ver19 -%{setoolsdir}/apol_perm_mapping_ver20 -%{setoolsdir}/apol_perm_mapping_ver21 -%{setoolsdir}/apol.gif -%{setoolsdir}/apol.tcl -%{setoolsdir}/seaudit.glade +%{setoolsdir}/apol_perm_mapping_* %{setoolsdir}/seaudit_help.txt -%{setoolsdir}/seaudit.png -%{setoolsdir}/seaudit-small.png +%{setoolsdir}/*.glade +%{setoolsdir}/*.png +%{setoolsdir}/apol.gif %{setoolsdir}/dot_seaudit %{_mandir}/man1/apol.1.gz %{_mandir}/man1/sediffx.1.gz %{_mandir}/man8/seaudit.8.gz %{_sbindir}/seaudit - %config(noreplace) %{_sysconfdir}/pam.d/seaudit %config(noreplace) %{_sysconfdir}/security/console.apps/seaudit -%{_datadir}/applications/apol.desktop -%{_datadir}/applications/seaudit.desktop -%{_datadir}/applications/sediffx.desktop -%attr(0644,root,root) /usr/share/pixmaps/apol.png -%attr(0644,root,root) /usr/share/pixmaps/seaudit.png -%attr(0644,root,root) /usr/share/pixmaps/sediffx.png - -%post libs-java -p /sbin/ldconfig - -%postun libs-java -p /sbin/ldconfig +%{_datadir}/applications/* +%attr(0644,root,root) %{_datadir}/pixmaps/*.png %post libs -p /sbin/ldconfig %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 +* Wed Oct 17 2007 Chris PeBenito 3.3.1-6.fc8 +- Update for 3.3.1. + * Tue Aug 28 2007 Fedora Release Engineering - 3.2-4 - Rebuild for selinux ppc32 issue. @@ -478,31 +391,31 @@ rm -rf ${RPM_BUILD_ROOT} * Tue Jan 31 2006 Dan Walsh 2.3-1 - Update from upstream * apol: - added new MLS components tab for sensitivities, - levels, and categories. - Changed users tab to support ranges and default - levels. - added range transition tab for searching range - Transition rules. - added new tab for network context components. - added new tab for file system context components. + added new MLS components tab for sensitivities, + levels, and categories. + Changed users tab to support ranges and default + levels. + added range transition tab for searching range + Transition rules. + added new tab for network context components. + added new tab for file system context components. * libapol: - added binpol support for MLS, network contexts, - and file system contexts. + added binpol support for MLS, network contexts, + and file system contexts. * seinfo: - added command line options for MLS components. - added command line options for network contexts - and file system contexts. + added command line options for MLS components. + added command line options for network contexts + and file system contexts. * sesearch: - added command line option for searching for rules - by conditional boolean name. + added command line option for searching for rules + by conditional boolean name. * seaudit: - added new column in the log view for the 'comm' - field found in auditd log files. - added filters for the 'comm' field and 'message' - field. + added new column in the log view for the 'comm' + field found in auditd log files. + added filters for the 'comm' field and 'message' + field. * manpages: - added manpages for all tools. + added manpages for all tools. diff --git a/sources b/sources index aca44bb..1c8976e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -699988ceb2d996cf172aa66bf24d7c0b setools-3.2.tar.bz2 +d14b6c52d16016c69d2b3a7bbd7c8c50 setools-3.3.1.tar.gz From c80613e626f1bb37b0a00b7f3d9edb5aa32d4bb3 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Thu, 18 Oct 2007 15:08:40 +0000 Subject: [PATCH 03/12] bump to fix incorrect explicit libstdc++ requiring. --- setools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setools.spec b/setools.spec index 3906fa0..2c1ad44 100644 --- a/setools.spec +++ b/setools.spec @@ -5,7 +5,7 @@ Name: setools Version: %{setools_maj_ver}.%{setools_min_ver} -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 URL: http://oss.tresys.com/projects/setools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -41,7 +41,7 @@ SETools. License: LGPLv2 Summary: Policy analysis support libraries for SELinux Group: System Environment/Libraries -Requires: libselinux >= %{selinux_ver} libsepol >= %{sepol_ver} sqlite >= %{sqlite_ver} libstdc++.so.6 +Requires: libselinux >= %{selinux_ver} libsepol >= %{sepol_ver} sqlite >= %{sqlite_ver} BuildRequires: flex bison pkgconfig BuildRequires: glibc-devel libstdc++-devel gcc gcc-c++ BuildRequires: libselinux-devel >= %{selinux_ver} libsepol-devel >= %{sepol_ver} @@ -336,6 +336,9 @@ rm -rf ${RPM_BUILD_ROOT} %postun libs-tcl -p /sbin/ldconfig %changelog +* Thu Oct 18 2007 Chris PeBenito 3.3.1-7.fc8 +- Rebuild to fix ppc64 issue. + * Wed Oct 17 2007 Chris PeBenito 3.3.1-6.fc8 - Update for 3.3.1. From 2cee763101d4369ca333cc6d0f9bcd6b4535a59d Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Wed, 28 Nov 2007 20:03:41 +0000 Subject: [PATCH 04/12] bump rawhide setools to newest upstream release. --- .cvsignore | 2 +- setools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 304a002..05e739f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -setools-3.3.1.tar.gz +setools-3.3.2.tar.gz diff --git a/setools.spec b/setools.spec index 2c1ad44..7c3422a 100644 --- a/setools.spec +++ b/setools.spec @@ -1,11 +1,11 @@ %define setools_maj_ver 3.3 -%define setools_min_ver 1 +%define setools_min_ver 2 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: setools Version: %{setools_maj_ver}.%{setools_min_ver} -Release: 7%{?dist} +Release: 1%{?dist} License: GPLv2 URL: http://oss.tresys.com/projects/setools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -336,6 +336,9 @@ rm -rf ${RPM_BUILD_ROOT} %postun libs-tcl -p /sbin/ldconfig %changelog +* Wed Nov 28 2007 Chris Pebenito 3.3.2-1.fc9 +- Update for 3.3.2. + * Thu Oct 18 2007 Chris PeBenito 3.3.1-7.fc8 - Rebuild to fix ppc64 issue. diff --git a/sources b/sources index 1c8976e..bd243dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d14b6c52d16016c69d2b3a7bbd7c8c50 setools-3.3.1.tar.gz +17c1bec7fb4ad62fbb6177eb34b8e4a1 setools-3.3.2.tar.gz From 90ce747941e67aed011ef3148db585e9a934fb41 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Tue, 29 Jan 2008 16:22:36 +0000 Subject: [PATCH 05/12] rebuild for policy 22. --- setools.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/setools.spec b/setools.spec index 7c3422a..ceaa180 100644 --- a/setools.spec +++ b/setools.spec @@ -5,7 +5,7 @@ Name: setools Version: %{setools_maj_ver}.%{setools_min_ver} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://oss.tresys.com/projects/setools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -45,6 +45,7 @@ Requires: libselinux >= %{selinux_ver} libsepol >= %{sepol_ver} sqlite >= %{sqli BuildRequires: flex bison pkgconfig BuildRequires: glibc-devel libstdc++-devel gcc gcc-c++ BuildRequires: libselinux-devel >= %{selinux_ver} libsepol-devel >= %{sepol_ver} +BuildRequires: libsepol-static >= %{sepol_ver} BuildRequires: sqlite-devel >= %{sqlite_ver} libxml2-devel BuildRequires: tcl-devel >= %{tcltk_ver} BuildRequires: autoconf >= %{autoconf_ver} automake @@ -216,8 +217,6 @@ rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.a chmod 0755 ${RPM_BUILD_ROOT}/%{_libdir}/*.so.* chmod 0755 ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/*/*.so.* chmod 0755 ${RPM_BUILD_ROOT}/%{pkg_py_arch}/*.so.* -chmod 0755 ${RPM_BUILD_ROOT}/%{_bindir}/* -chmod 0755 ${RPM_BUILD_ROOT}/%{_sbindir}/* chmod 0755 ${RPM_BUILD_ROOT}/%{setoolsdir}/seaudit-report-service chmod 0644 ${RPM_BUILD_ROOT}/%{tcllibdir}/*/pkgIndex.tcl @@ -336,6 +335,9 @@ rm -rf ${RPM_BUILD_ROOT} %postun libs-tcl -p /sbin/ldconfig %changelog +* Tue Jan 29 2008 Chris Pebenito 3.3.2-2.fc9 +- Bump to pick up new libsepol and policy 22. + * Wed Nov 28 2007 Chris Pebenito 3.3.2-1.fc9 - Update for 3.3.2. From 770c8738948e66a5de236db83e99bbe0f5730c02 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 17:54:47 +0000 Subject: [PATCH 06/12] - Autorebuild for GCC 4.3 --- setools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setools.spec b/setools.spec index ceaa180..f318c3e 100644 --- a/setools.spec +++ b/setools.spec @@ -5,7 +5,7 @@ Name: setools Version: %{setools_maj_ver}.%{setools_min_ver} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://oss.tresys.com/projects/setools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -335,6 +335,9 @@ rm -rf ${RPM_BUILD_ROOT} %postun libs-tcl -p /sbin/ldconfig %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 3.3.2-3 +- Autorebuild for GCC 4.3 + * Tue Jan 29 2008 Chris Pebenito 3.3.2-2.fc9 - Bump to pick up new libsepol and policy 22. From 67d45ca5a2f8bee1016e5e88fbb0bf9fd086c22f Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Wed, 2 Apr 2008 13:34:41 +0000 Subject: [PATCH 07/12] setools: bump to upstream bugfix release 3.3.4, which fixes gcc 4.3, glibc 2.7, tcl 8.5, and libsepol 2.0.20 issues. --- .cvsignore | 2 +- setools-rhat.patch | 121 --------------------------------------------- setools.spec | 10 +++- sources | 2 +- 4 files changed, 10 insertions(+), 125 deletions(-) delete mode 100644 setools-rhat.patch diff --git a/.cvsignore b/.cvsignore index 05e739f..f3ffa63 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -setools-3.3.2.tar.gz +setools-3.3.4.tar.gz diff --git a/setools-rhat.patch b/setools-rhat.patch deleted file mode 100644 index 388a93c..0000000 --- a/setools-rhat.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- setools-3.1/packages/Makefile.am.rhat 2007-02-06 15:43:29.000000000 -0500 -+++ setools-3.1/packages/Makefile.am 2007-02-15 11:20:09.000000000 -0500 -@@ -8,7 +8,7 @@ - tar jxf BWidget-1.8.0.tar.bz2 - test -z "$(bwidget_destdir)" || $(mkdir_p) "$(bwidget_destdir)" - cd BWidget-1.8.0 && find . -type d -exec $(mkdir_p) "$(bwidget_destdir)/{}" \; -- cd BWidget-1.8.0 && find . -type f -exec $(INSTALL_DATA) '{}' $(bwidget_destdir) \; -+ cd BWidget-1.8.0 && find . -type f -exec $(INSTALL_DATA) '{}' $(bwidget_destdir)/'{}'\; - - uninstall-local: - -rm -rf $(bwidget_destdir)/BWidget-1.8.0 ---- setools-3.1/packages/Makefile.in.rhat 2007-02-15 11:21:11.000000000 -0500 -+++ setools-3.1/packages/Makefile.in 2007-02-15 11:21:24.000000000 -0500 -@@ -381,7 +381,7 @@ - tar jxf BWidget-1.8.0.tar.bz2 - test -z "$(bwidget_destdir)" || $(mkdir_p) "$(bwidget_destdir)" - cd BWidget-1.8.0 && find . -type d -exec $(mkdir_p) "$(bwidget_destdir)/{}" \; -- cd BWidget-1.8.0 && find . -type f -exec $(INSTALL_DATA) '{}' $(bwidget_destdir) \; -+ cd BWidget-1.8.0 && find . -type f -exec $(INSTALL_DATA) '{}' $(bwidget_destdir)/'{}' \; - - uninstall-local: - -rm -rf $(bwidget_destdir)/BWidget-1.8.0 ---- setools-3.1/libqpol/src/policy_parse.y.rhat 2007-02-06 15:43:26.000000000 -0500 -+++ setools-3.1/libqpol/src/policy_parse.y 2007-02-15 11:19:06.000000000 -0500 -@@ -1098,11 +1098,11 @@ - ret = hashtab_insert(policydbp->p_commons.table, - (hashtab_key_t) id, (hashtab_datum_t) comdatum); - -- if (ret == HASHTAB_PRESENT) { -+ if (ret == SEPOL_EEXIST) { - yyerror("duplicate common definition"); - goto bad; - } -- if (ret == HASHTAB_OVERFLOW) { -+ if (ret == SEPOL_ENOMEM) { - yyerror("hash table overflow"); - goto bad; - } -@@ -1130,14 +1130,14 @@ - (hashtab_key_t) perm, - (hashtab_datum_t) perdatum); - -- if (ret == HASHTAB_PRESENT) { -+ if (ret == SEPOL_EEXIST) { - sprintf(errormsg, - "duplicate permission %s in common %s", perm, - id); - yyerror(errormsg); - goto bad_perm; - } -- if (ret == HASHTAB_OVERFLOW) { -+ if (ret == SEPOL_ENOMEM) { - yyerror("hash table overflow"); - goto bad_perm; - } -@@ -1259,12 +1259,12 @@ - (hashtab_key_t) id, - (hashtab_datum_t) perdatum); - -- if (ret == HASHTAB_PRESENT) { -+ if (ret == SEPOL_EEXIST) { - sprintf(errormsg, "duplicate permission %s", id); - yyerror(errormsg); - goto bad; - } -- if (ret == HASHTAB_OVERFLOW) { -+ if (ret == SEPOL_ENOMEM) { - yyerror("hash table overflow"); - goto bad; - } ---- setools-3.1/libqpol/src/policy_extend.c.rhat 2007-02-07 14:16:52.000000000 -0500 -+++ setools-3.1/libqpol/src/policy_extend.c 2007-02-15 11:19:06.000000000 -0500 -@@ -167,7 +167,7 @@ - - retv = hashtab_insert(db->p_types.table, (hashtab_key_t) tmp_name, (hashtab_datum_t) tmp_type); - if (retv) { -- if (retv == HASHTAB_OVERFLOW) -+ if (retv == SEPOL_ENOMEM) - error = db->p_types.table ? ENOMEM : EINVAL; - else - error = EEXIST; -@@ -243,7 +243,7 @@ - - retv = hashtab_insert(db->p_types.table, (hashtab_key_t) tmp_name, (hashtab_datum_t) tmp_type); - if (retv) { -- if (retv == HASHTAB_OVERFLOW) -+ if (retv == SEPOL_ENOMEM) - error = db->p_types.table ? ENOMEM : EINVAL; - else - error = EEXIST; ---- setools-3.1/configure.ac.rhat 2007-02-07 10:48:44.000000000 -0500 -+++ setools-3.1/configure.ac 2007-02-15 11:19:06.000000000 -0500 -@@ -20,7 +20,7 @@ - libseaudit_version=4.0.0 - libseaudit_soname=libseaudit.so.4 - --setoolsdir='${prefix}/share/setools-3.1' -+setoolsdir='${prefix}/share/setools' - - version_min_sepol_major=1 - version_min_sepol_minor=12 -@@ -88,6 +88,7 @@ - fi - AC_MSG_RESULT(disabled) - fi -+AC_SUBST(YFLAGS) - AC_SUBST(DEBUGCFLAGS) - AC_SUBST(DEBUGLDFLAGS) - QPOL_CFLAGS='-I$(top_srcdir)/libqpol/include' -@@ -227,7 +228,10 @@ - AC_SUBST(BWIDGET_DESTDIR) - fi - else -- copy_bwidget=no -+ -+ BWIDGET_DESTDIR="\$(DESTDIR)/\${datadir}/tcl8.4/BWidget-1.8.0" -+ AC_SUBST(BWIDGET_DESTDIR) -+ copy_bwidget=yes - bwidget_ver=1.8 - fi - diff --git a/setools.spec b/setools.spec index f318c3e..db3bb33 100644 --- a/setools.spec +++ b/setools.spec @@ -1,11 +1,11 @@ %define setools_maj_ver 3.3 -%define setools_min_ver 2 +%define setools_min_ver 4 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: setools Version: %{setools_maj_ver}.%{setools_min_ver} -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2 URL: http://oss.tresys.com/projects/setools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -188,6 +188,8 @@ This package includes the following graphical tools: %build %configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check --enable-swig-python --enable-swig-java --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} %install @@ -335,6 +337,10 @@ rm -rf ${RPM_BUILD_ROOT} %postun libs-tcl -p /sbin/ldconfig %changelog +* Wed Feb 27 2008 Chris PeBenito 3.3.4-1 +- Fixes gcc 4.3, glibc 2.7, tcl 8.5, and libsepol 2.0.20 issues. +- Fix policy loading when policy on disk is higher version than the kernel. + * Tue Feb 19 2008 Fedora Release Engineering - 3.3.2-3 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index bd243dc..71ecd31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17c1bec7fb4ad62fbb6177eb34b8e4a1 setools-3.3.2.tar.gz +a5fecca4f0a12a5d2a42f9e7e63c78d1 setools-3.3.4.tar.gz From af00e8b0e79060538feb21d0b96b1b1c9760950d Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Tue, 26 Aug 2008 14:23:07 +0000 Subject: [PATCH 08/12] setools: update to upstream version 3.3.5. --- .cvsignore | 2 +- setools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f3ffa63..2175af9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -setools-3.3.4.tar.gz +setools-3.3.5.tar.gz diff --git a/setools.spec b/setools.spec index db3bb33..22c0b53 100644 --- a/setools.spec +++ b/setools.spec @@ -1,5 +1,5 @@ %define setools_maj_ver 3.3 -%define setools_min_ver 4 +%define setools_min_ver 5 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -337,6 +337,9 @@ rm -rf ${RPM_BUILD_ROOT} %postun libs-tcl -p /sbin/ldconfig %changelog +* Tue Aug 26 2008 Chris PeBenito 3.3.5-1 +- Update to upstream version 3.3.5. + * Wed Feb 27 2008 Chris PeBenito 3.3.4-1 - Fixes gcc 4.3, glibc 2.7, tcl 8.5, and libsepol 2.0.20 issues. - Fix policy loading when policy on disk is higher version than the kernel. diff --git a/sources b/sources index 71ecd31..1308bb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5fecca4f0a12a5d2a42f9e7e63c78d1 setools-3.3.4.tar.gz +4b4b9048d25425efaf645c5fa2696d35 setools-3.3.5.tar.gz From 60a222ac3f1340b110f2e651a6cf732e04cb7050 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Sep 2008 03:11:00 +0000 Subject: [PATCH 09/12] allow building on sparc and s390 --- setools.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/setools.spec b/setools.spec index 22c0b53..5751dc0 100644 --- a/setools.spec +++ b/setools.spec @@ -5,7 +5,7 @@ Name: setools Version: %{setools_maj_ver}.%{setools_min_ver} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://oss.tresys.com/projects/setools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -190,6 +190,11 @@ This package includes the following graphical tools: %configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check --enable-swig-python --enable-swig-java --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 +%ifarch sparc sparcv9 sparc64 s390 s390x + for file in `find . -name Makefile`; do + sed -i -e 's:-fpic:-fPIC:' $file; + done +%endif make %{?_smp_mflags} %install @@ -241,7 +246,7 @@ rm -rf ${RPM_BUILD_ROOT} %files libs-python %defattr(-,root,root,-) %{pkg_py_lib}/ -%ifarch x86_64 ppc64 +%ifarch x86_64 ppc64 sparc64 %{pkg_py_arch}/ %endif @@ -337,6 +342,9 @@ rm -rf ${RPM_BUILD_ROOT} %postun libs-tcl -p /sbin/ldconfig %changelog +* Wed Sep 17 2008 Dennis Gilmore 3.3.5-2 +- fix building in sparc and s390 arches + * Tue Aug 26 2008 Chris PeBenito 3.3.5-1 - Update to upstream version 3.3.5. From e9b699b8e36d543a622ad13e7690d9fdea561b5f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 05:07:05 +0000 Subject: [PATCH 10/12] Initialize branch F-10 for setools --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 5fb9f79fcf04b569c3be01e7d6c1ff401af5d17f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:54 +0000 Subject: [PATCH 11/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a87a580..613fc88 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := setools SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 7f763d2e031197e21d3d2005e4900ad1ef804074 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:37:47 +0000 Subject: [PATCH 12/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 613fc88..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: setools -# $Id$ -NAME := setools -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10