From 1018051a4a5380babd47b1f4742dc974b730363a Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Mar 24 2014 12:14:10 +0000 Subject: import setools-3.3.7-46.el7.src.rpm --- diff --git a/SOURCES/0011-setools-noship.patch b/SOURCES/0011-setools-noship.patch index b678d30..daedc2c 100644 --- a/SOURCES/0011-setools-noship.patch +++ b/SOURCES/0011-setools-noship.patch @@ -1,73 +1,69 @@ diff -up setools-3.3.7/Makefile.am.noship setools-3.3.7/Makefile.am --- setools-3.3.7/Makefile.am.noship 2008-02-22 14:06:28.000000000 -0500 -+++ setools-3.3.7/Makefile.am 2013-01-30 09:18:59.775157146 -0500 -@@ -8,9 +8,8 @@ endif - if BUILD_GUI - MAYBE_GUI = seaudit - endif --# sediffx is also built conditionally, from sediffx/Makefile.am - --SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) -+SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) - - #old indent opts - #INDENT_OPTS = -npro -nbad -bap -sob -ss -l132 -di1 -nbc -br -nbbb -c40 -cd40 -ncdb -ce -cli0 -cp40 -ncs -d0 -nfc1 -nfca -i8 -ts8 -ci8 -lp -ip0 -npcs -npsl -sc -@@ -49,12 +48,6 @@ seaudit: libqpol libapol libseaudit - sediff: libqpol libapol libpoldiff - $(MAKE) -C $(top_srcdir)/sediff sediff - --sediffx: libqpol libapol libpoldiff -- $(MAKE) -C $(top_srcdir)/sediff sediffx -- --sechecker: libqpol libapol libsefs -- $(MAKE) -C $(top_srcdir)/sechecker -- - help: - @echo "Make targets for SETools:" - @echo " all: build everything, but do not install" -@@ -65,8 +58,6 @@ help: - @echo " secmds: build command line tools" - @echo " seaudit: build audit log analysis tools" - @echo " sediff: build semantic policy diff command line tool" -- @echo " sediffx: build semantic policy diff graphical tool" -- @echo " sechecker: build policy checking tool" - @echo "" - @echo " install-logwatch: install LogWatch config files for seaudit-report" - @echo " (requires LogWatch and root privileges)" -@@ -78,9 +69,9 @@ install-logwatch: ++++ setools-3.3.7/Makefile.am 2013-11-27 09:30:01.467627063 -0500 +@@ -78,9 +78,9 @@ install-logwatch: $(MAKE) -C $(top_srcdir)/seaudit install-logwatch .PHONY: libqpol libapol libpoldiff libsefs libseaudit \ - apol secmds seaudit sediff sediffx sechecker \ -+ apol secmds seaudit sediff \ ++ apol secmds seaudit sediff sechecker\ install-logwatch help \ - seinfo sesearch indexcon findcon replcon searchcon \ -+ seinfo sesearch \ ++ seinfo sesearch findcon \ packages seinfo: libqpol libapol -@@ -89,18 +80,6 @@ seinfo: libqpol libapol - sesearch: libqpol libapol - $(MAKE) -C $(top_srcdir)/secmds sesearch - --indexcon: libqpol libapol libsefs -- $(MAKE) -C $(top_srcdir)/secmds indexcon -- --findcon: libqpol libapol libsefs -- $(MAKE) -C $(top_srcdir)/secmds findcon -- --replcon: libqpol libapol libsefs -- $(MAKE) -C $(top_srcdir)/secmds replcon -- --searchcon: libqpol libapol libsefs -- $(MAKE) -C $(top_srcdir)/secmds searchcon -- - packages: - $(MAKE) -C $(top_srcdir)/packages - +diff -up setools-3.3.7/configure.ac.noship setools-3.3.7/configure.ac +--- setools-3.3.7/configure.ac.noship 2013-11-27 09:27:14.279196042 -0500 ++++ setools-3.3.7/configure.ac 2013-11-27 09:27:14.309196384 -0500 +@@ -63,7 +63,7 @@ if test ${ac_cv_prog_cc_c99} = "no"; the + fi + AC_PROG_CXX + AC_LANG([C]) +-AC_PROG_LIBTOOL ++AC_PROG_RANLIB + AC_PROG_LN_S + AC_PROG_LEX + AC_PROG_YACC +@@ -194,7 +194,7 @@ AC_ARG_ENABLE(swig-java, + enable_jswig="$enableval") + if test "x${enable_jswig}" = xyes; then + if test ${do_swigify} = no; then +- AC_PROG_SWIG(1.3.28) ++ AC_PROG_SWIG(2.0.0) + fi + AC_JAVA_OPTIONS + if test "x$JAVAPREFIX" = x; then +@@ -222,7 +222,7 @@ AC_ARG_ENABLE(swig-python, + enable_pyswig="$enableval") + if test "x${enable_pyswig}" = xyes; then + if test ${do_swigify} = no; then +- AC_PROG_SWIG(1.3.28) ++ AC_PROG_SWIG(2.0.0) + fi + AM_PATH_PYTHON(2.3) + SWIG_PYTHON +@@ -230,7 +230,7 @@ if test "x${enable_pyswig}" = xyes; then + do_swigify=yes + fi + if test ${do_swigify} = "yes"; then +- AC_PROG_SWIG(1.3.28) ++ AC_PROG_SWIG(2.0.0) + fi + build_apol=yes + AC_ARG_ENABLE(swig-tcl, +@@ -239,7 +239,7 @@ AC_ARG_ENABLE(swig-tcl, + enable_tclswig="$enableval", enable_tclswig="yes") + if test "x${enable_tclswig}" = xyes; then + if test ${do_swigify} = no; then +- AC_PROG_SWIG(1.3.28) ++ AC_PROG_SWIG(2.0.0) + fi + TEA_INIT(3.5) + TEA_PATH_TCLCONFIG diff -up setools-3.3.7/man/Makefile.am.noship setools-3.3.7/man/Makefile.am --- setools-3.3.7/man/Makefile.am.noship 2007-08-02 17:16:33.000000000 -0400 -+++ setools-3.3.7/man/Makefile.am 2013-01-30 09:16:13.696871566 -0500 ++++ setools-3.3.7/man/Makefile.am 2013-11-27 09:27:14.306196350 -0500 @@ -1,19 +1,10 @@ if BUILD_GUI MAYBEMANS = apol.1 \ @@ -84,7 +80,7 @@ diff -up setools-3.3.7/man/Makefile.am.noship setools-3.3.7/man/Makefile.am -man_MANS = findcon.1 indexcon.1 replcon.1 \ - sechecker.1 \ - sediff.1 \ -+man_MANS = sediff.1 \ ++man_MANS = findcon.1 sediff.1 sechecker.1 \ seinfo.1 sesearch.1 $(MAYBEMANS) - -seaudit-report.8: seaudit-report.8.in Makefile @@ -93,7 +89,7 @@ diff -up setools-3.3.7/man/Makefile.am.noship setools-3.3.7/man/Makefile.am -CLEANFILES = seaudit-report.8 diff -up setools-3.3.7/seaudit/Makefile.am.noship setools-3.3.7/seaudit/Makefile.am --- setools-3.3.7/seaudit/Makefile.am.noship 2008-02-22 14:06:28.000000000 -0500 -+++ setools-3.3.7/seaudit/Makefile.am 2013-01-30 09:16:13.697871568 -0500 ++++ setools-3.3.7/seaudit/Makefile.am 2013-11-27 09:27:14.306196350 -0500 @@ -1,5 +1,4 @@ setoolsdir = @setoolsdir@ -bin_PROGRAMS = seaudit-report @@ -158,37 +154,18 @@ diff -up setools-3.3.7/seaudit/Makefile.am.noship setools-3.3.7/seaudit/Makefile +CLEANFILES = dot_seaudit diff -up setools-3.3.7/secmds/Makefile.am.noship setools-3.3.7/secmds/Makefile.am --- setools-3.3.7/secmds/Makefile.am.noship 2007-08-02 17:16:33.000000000 -0400 -+++ setools-3.3.7/secmds/Makefile.am 2013-01-30 09:16:13.698871569 -0500 ++++ setools-3.3.7/secmds/Makefile.am 2013-11-27 09:27:14.307196361 -0500 @@ -1,6 +1,6 @@ # various setools command line tools -bin_PROGRAMS = seinfo sesearch findcon replcon indexcon -+bin_PROGRAMS = seinfo sesearch ++bin_PROGRAMS = seinfo sesearch findcon # These are for indexcon so that it is usable on machines without setools STATICLIBS = ../libsefs/src/libsefs.a ../libapol/src/libapol.a ../libqpol/src/libqpol.a -lsqlite3 -@@ -18,18 +18,6 @@ seinfo_SOURCES = seinfo.c - - sesearch_SOURCES = sesearch.c - --indexcon_SOURCES = indexcon.cc --indexcon_LDADD = @SELINUX_LIB_FLAG@ $(STATICLIBS) --indexcon_DEPENDENCIES = $(DEPENDENCIES) $(top_builddir)/libsefs/src/libsefs.so -- --findcon_SOURCES = findcon.cc --findcon_LDADD = @SEFS_LIB_FLAG@ $(LDADD) --findcon_DEPENDENCIES = $(DEPENDENCIES) $(top_builddir)/libsefs/src/libsefs.so -- --replcon_SOURCES = replcon.cc --replcon_LDADD = @SEFS_LIB_FLAG@ $(LDADD) --replcon_DEPENDENCIES = $(DEPENDENCIES) $(top_builddir)/libsefs/src/libsefs.so -- - $(top_builddir)/libapol/src/libapol.so: - $(MAKE) -C $(top_builddir)/libapol/src $(notdir $@) - diff -up setools-3.3.7/sediff/Makefile.am.noship setools-3.3.7/sediff/Makefile.am --- setools-3.3.7/sediff/Makefile.am.noship 2007-04-25 15:20:20.000000000 -0400 -+++ setools-3.3.7/sediff/Makefile.am 2013-01-30 09:16:13.698871569 -0500 ++++ setools-3.3.7/sediff/Makefile.am 2013-11-27 09:27:14.307196361 -0500 @@ -1,13 +1,6 @@ setoolsdir = @setoolsdir@ @@ -241,15 +218,3 @@ diff -up setools-3.3.7/sediff/Makefile.am.noship setools-3.3.7/sediff/Makefile.a $(top_builddir)/libpoldiff/src/libpoldiff.so: $(MAKE) -C $(top_builddir)/libpoldiff/src $(notdir $@) -diff -up setools-3.3.7/configure.ac~ setools-3.3.7/configure.ac ---- setools-3.3.7/configure.ac~ 2013-01-30 09:52:05.689136955 -0500 -+++ setools-3.3.7/configure.ac 2013-01-30 09:56:26.853722063 -0500 -@@ -63,7 +63,7 @@ if test ${ac_cv_prog_cc_c99} = "no"; the - fi - AC_PROG_CXX - AC_LANG([C]) --AC_PROG_LIBTOOL -+AC_PROG_RANLIB - AC_PROG_LN_S - AC_PROG_LEX - AC_PROG_YACC diff --git a/SOURCES/apol.desktop b/SOURCES/apol.desktop index 6cc82cc..727733a 100644 --- a/SOURCES/apol.desktop +++ b/SOURCES/apol.desktop @@ -2,11 +2,10 @@ Name=SELinux Policy Analysis GenericName=SELinux Policy Analysis Tool Comment=This tool can examine, search, and relate policy components and policy rules -Icon=apol.png +Icon=apol Exec=/usr/bin/apol Type=Application Terminal=false -Encoding=UTF-8 Categories=System; X-Desktop-File-Install-Version=0.2 StartupNotify=true diff --git a/SOURCES/seaudit.desktop b/SOURCES/seaudit.desktop index e07e62b..d3a277e 100644 --- a/SOURCES/seaudit.desktop +++ b/SOURCES/seaudit.desktop @@ -6,7 +6,6 @@ Icon=seaudit.png Exec=/usr/bin/seaudit Type=Application Terminal=false -Encoding=UTF-8 Categories=System; X-Desktop-File-Install-Version=0.2 StartupNotify=true diff --git a/SPECS/setools.spec b/SPECS/setools.spec index da53ce9..3b7c58a 100644 --- a/SPECS/setools.spec +++ b/SPECS/setools.spec @@ -3,7 +3,7 @@ Name: setools Version: %{setools_maj_ver}.%{setools_min_ver} -Release: 40%{?dist} +Release: 46%{?dist} License: GPLv2 URL: http://oss.tresys.com/projects/setools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -162,12 +162,12 @@ This package includes the following graphical tools: %patch8 -p 1 -b .fixoutput %patch9 -p 1 -b .fixswig %patch10 -p 1 -b .current -%patch11 -p 1 -b .noship %patch12 -p 1 -b .seaudit %patch13 -p 1 -b .swig %patch14 -p 2 -b .boolsub %patch15 -p 1 -b .aliases %patch16 -p 1 -b .cmdline +%patch11 -p 1 -b .noship %ifarch sparc sparcv9 sparc64 s390 s390x for file in `find . -name Makefile.am`; do sed -i -e 's:-fpic:-fPIC:' $file; @@ -221,6 +221,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libpoldiff.so.* %{_libdir}/libsefs.so.* %{_libdir}/libseaudit.so.* +%{tcllibdir}/apol_tcl/ %dir %{setoolsdir} %files libs-tcl @@ -247,6 +248,12 @@ rm -rf ${RPM_BUILD_ROOT} %{_bindir}/seinfo %{_bindir}/sesearch %{_bindir}/sediff +%{_bindir}/findcon +%{_bindir}/sechecker +%{setoolsdir}/sechecker-profiles/ +%{setoolsdir}/sechecker_help.txt +%{_mandir}/man1/findcon.1.gz +%{_mandir}/man1/sechecker.1.gz %{_mandir}/man1/sediff.1.gz %{_mandir}/man1/seinfo.1.gz %{_mandir}/man1/sesearch.1.gz @@ -255,7 +262,6 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-,root,root,-) %{_bindir}/seaudit %{_bindir}/apol -%{tcllibdir}/apol_tcl/ %{setoolsdir}/apol_help.txt %{setoolsdir}/domaintrans_help.txt %{setoolsdir}/file_relabel_help.txt @@ -284,6 +290,27 @@ rm -rf ${RPM_BUILD_ROOT} %postun libs-tcl -p /sbin/ldconfig %changelog +* Tue Mar 18 2014 Dan Walsh - 3.3.7-46 +- Move apol_tcl to setools-lib package +Resolves: #1076429 + +* Thu Feb 13 2014 Dan Walsh - 3.3.7-45 +- Fix sesearch --all + +* Fri Jan 24 2014 Daniel Mach - 3.3.7-44 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 3.3.7-43 +- Mass rebuild 2013-12-27 + +* Wed Nov 27 2013 Dan Walsh - 3.3.7-42 +- Add back in findcon and sechecker for RHEL customer request +Resolves: 927522 + +* Mon Sep 16 2013 Dan Walsh - 3.3.7-41 +- Cleanup Destop files. +Resolves: 884174 + * Fri Jul 19 2013 Dan Walsh - 3.3.7-40 - Fix help message on sesearch -D