|
 |
25bb7d |
diff -up setools-3.3.7/Makefile.am.noship setools-3.3.7/Makefile.am
|
|
|
25bb7d |
--- setools-3.3.7/Makefile.am.noship 2008-02-22 14:06:28.000000000 -0500
|
|
|
101805 |
+++ setools-3.3.7/Makefile.am 2013-11-27 09:30:01.467627063 -0500
|
|
|
101805 |
@@ -78,9 +78,9 @@ install-logwatch:
|
|
|
25bb7d |
$(MAKE) -C $(top_srcdir)/seaudit install-logwatch
|
|
|
25bb7d |
|
|
|
25bb7d |
.PHONY: libqpol libapol libpoldiff libsefs libseaudit \
|
|
|
25bb7d |
- apol secmds seaudit sediff sediffx sechecker \
|
|
|
101805 |
+ apol secmds seaudit sediff sechecker\
|
|
|
25bb7d |
install-logwatch help \
|
|
|
25bb7d |
- seinfo sesearch indexcon findcon replcon searchcon \
|
|
|
101805 |
+ seinfo sesearch findcon \
|
|
|
25bb7d |
packages
|
|
|
25bb7d |
|
|
|
25bb7d |
seinfo: libqpol libapol
|
|
|
101805 |
diff -up setools-3.3.7/configure.ac.noship setools-3.3.7/configure.ac
|
|
|
101805 |
--- setools-3.3.7/configure.ac.noship 2013-11-27 09:27:14.279196042 -0500
|
|
|
101805 |
+++ setools-3.3.7/configure.ac 2013-11-27 09:27:14.309196384 -0500
|
|
|
101805 |
@@ -63,7 +63,7 @@ if test ${ac_cv_prog_cc_c99} = "no"; the
|
|
|
101805 |
fi
|
|
|
101805 |
AC_PROG_CXX
|
|
|
101805 |
AC_LANG([C])
|
|
|
101805 |
-AC_PROG_LIBTOOL
|
|
|
101805 |
+AC_PROG_RANLIB
|
|
|
101805 |
AC_PROG_LN_S
|
|
|
101805 |
AC_PROG_LEX
|
|
|
101805 |
AC_PROG_YACC
|
|
|
101805 |
@@ -194,7 +194,7 @@ AC_ARG_ENABLE(swig-java,
|
|
|
101805 |
enable_jswig="$enableval")
|
|
|
101805 |
if test "x${enable_jswig}" = xyes; then
|
|
|
101805 |
if test ${do_swigify} = no; then
|
|
|
101805 |
- AC_PROG_SWIG(1.3.28)
|
|
|
101805 |
+ AC_PROG_SWIG(2.0.0)
|
|
|
101805 |
fi
|
|
|
101805 |
AC_JAVA_OPTIONS
|
|
|
101805 |
if test "x$JAVAPREFIX" = x; then
|
|
|
101805 |
@@ -222,7 +222,7 @@ AC_ARG_ENABLE(swig-python,
|
|
|
101805 |
enable_pyswig="$enableval")
|
|
|
101805 |
if test "x${enable_pyswig}" = xyes; then
|
|
|
101805 |
if test ${do_swigify} = no; then
|
|
|
101805 |
- AC_PROG_SWIG(1.3.28)
|
|
|
101805 |
+ AC_PROG_SWIG(2.0.0)
|
|
|
101805 |
fi
|
|
|
101805 |
AM_PATH_PYTHON(2.3)
|
|
|
101805 |
SWIG_PYTHON
|
|
|
101805 |
@@ -230,7 +230,7 @@ if test "x${enable_pyswig}" = xyes; then
|
|
|
101805 |
do_swigify=yes
|
|
|
101805 |
fi
|
|
|
101805 |
if test ${do_swigify} = "yes"; then
|
|
|
101805 |
- AC_PROG_SWIG(1.3.28)
|
|
|
101805 |
+ AC_PROG_SWIG(2.0.0)
|
|
|
101805 |
fi
|
|
|
101805 |
build_apol=yes
|
|
|
101805 |
AC_ARG_ENABLE(swig-tcl,
|
|
|
101805 |
@@ -239,7 +239,7 @@ AC_ARG_ENABLE(swig-tcl,
|
|
|
101805 |
enable_tclswig="$enableval", enable_tclswig="yes")
|
|
|
101805 |
if test "x${enable_tclswig}" = xyes; then
|
|
|
101805 |
if test ${do_swigify} = no; then
|
|
|
101805 |
- AC_PROG_SWIG(1.3.28)
|
|
|
101805 |
+ AC_PROG_SWIG(2.0.0)
|
|
|
101805 |
fi
|
|
|
101805 |
TEA_INIT(3.5)
|
|
|
101805 |
TEA_PATH_TCLCONFIG
|
|
|
25bb7d |
diff -up setools-3.3.7/man/Makefile.am.noship setools-3.3.7/man/Makefile.am
|
|
|
25bb7d |
--- setools-3.3.7/man/Makefile.am.noship 2007-08-02 17:16:33.000000000 -0400
|
|
|
101805 |
+++ setools-3.3.7/man/Makefile.am 2013-11-27 09:27:14.306196350 -0500
|
|
|
25bb7d |
@@ -1,19 +1,10 @@
|
|
|
25bb7d |
if BUILD_GUI
|
|
|
25bb7d |
MAYBEMANS = apol.1 \
|
|
|
25bb7d |
- seaudit.8 seaudit-report.8 \
|
|
|
25bb7d |
- sediffx.1
|
|
|
25bb7d |
+ seaudit.8
|
|
|
25bb7d |
endif
|
|
|
25bb7d |
|
|
|
25bb7d |
EXTRA_DIST=$(man_MANS) apol.1 \
|
|
|
25bb7d |
- seaudit.8 seaudit-report.8.in \
|
|
|
25bb7d |
- sediffx.1
|
|
|
25bb7d |
+ seaudit.8
|
|
|
25bb7d |
|
|
|
25bb7d |
-man_MANS = findcon.1 indexcon.1 replcon.1 \
|
|
|
25bb7d |
- sechecker.1 \
|
|
|
25bb7d |
- sediff.1 \
|
|
|
101805 |
+man_MANS = findcon.1 sediff.1 sechecker.1 \
|
|
|
25bb7d |
seinfo.1 sesearch.1 $(MAYBEMANS)
|
|
|
25bb7d |
-
|
|
|
25bb7d |
-seaudit-report.8: seaudit-report.8.in Makefile
|
|
|
25bb7d |
- sed -e 's|\@setoolsdir\@|$(setoolsdir)|g' $< > $@
|
|
|
25bb7d |
-
|
|
|
25bb7d |
-CLEANFILES = seaudit-report.8
|
|
|
25bb7d |
diff -up setools-3.3.7/seaudit/Makefile.am.noship setools-3.3.7/seaudit/Makefile.am
|
|
|
25bb7d |
--- setools-3.3.7/seaudit/Makefile.am.noship 2008-02-22 14:06:28.000000000 -0500
|
|
|
101805 |
+++ setools-3.3.7/seaudit/Makefile.am 2013-11-27 09:27:14.306196350 -0500
|
|
|
25bb7d |
@@ -1,5 +1,4 @@
|
|
|
25bb7d |
setoolsdir = @setoolsdir@
|
|
|
25bb7d |
-bin_PROGRAMS = seaudit-report
|
|
|
25bb7d |
sbin_PROGRAMS = seaudit
|
|
|
25bb7d |
|
|
|
25bb7d |
AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
|
|
|
25bb7d |
@@ -20,13 +19,10 @@ LDADD = @SELINUX_LIB_FLAG@ @SEAUDIT_LIB_
|
|
|
25bb7d |
dist_setools_DATA = \
|
|
|
25bb7d |
seaudit.glade \
|
|
|
25bb7d |
seaudit_help.txt \
|
|
|
25bb7d |
- seaudit-report.conf \
|
|
|
25bb7d |
- seaudit-report.css \
|
|
|
25bb7d |
seaudit.png seaudit-small.png
|
|
|
25bb7d |
|
|
|
25bb7d |
nodist_setools_DATA = \
|
|
|
25bb7d |
- dot_seaudit \
|
|
|
25bb7d |
- seaudit-report-service
|
|
|
25bb7d |
+ dot_seaudit
|
|
|
25bb7d |
|
|
|
25bb7d |
seaudit_SOURCES = \
|
|
|
25bb7d |
filter_view.c filter_view.h \
|
|
|
25bb7d |
@@ -50,31 +46,12 @@ seaudit_DEPENDENCIES = $(top_builddir)/l
|
|
|
25bb7d |
dot_seaudit: dot_seaudit.in Makefile
|
|
|
25bb7d |
sed -e 's|\@setoolsdir\@|$(setoolsdir)|g' $< > $@
|
|
|
25bb7d |
|
|
|
25bb7d |
-seaudit_report_SOURCES = seaudit-report.c
|
|
|
25bb7d |
-seaudit_report_DEPENDENCIES = $(top_builddir)/libseaudit/src/libseaudit.so \
|
|
|
25bb7d |
- $(top_builddir)/libapol/src/libapol.so \
|
|
|
25bb7d |
- $(top_builddir)/libqpol/src/libqpol.so
|
|
|
25bb7d |
-
|
|
|
25bb7d |
logwatch = $(DESTDIR)/etc/logwatch
|
|
|
25bb7d |
LOGWATCH_GROUP = $(logwatch)/conf/logfiles
|
|
|
25bb7d |
LOGWATCH_SERVICE = $(logwatch)/conf/services
|
|
|
25bb7d |
LOGWATCH_FILTER = $(logwatch)/scripts/services
|
|
|
25bb7d |
|
|
|
25bb7d |
-dist_noinst_DATA = dot_seaudit.in \
|
|
|
25bb7d |
- seaudit-report-group.conf \
|
|
|
25bb7d |
- seaudit-report-service.conf \
|
|
|
25bb7d |
- seaudit-report-service.in
|
|
|
25bb7d |
-
|
|
|
25bb7d |
-seaudit-report-service: seaudit-report-service.in Makefile
|
|
|
25bb7d |
- sed -e 's|\@bindir\@|$(bindir)|g' $< > $@
|
|
|
25bb7d |
-
|
|
|
25bb7d |
-install-logwatch: $(dist_noinst_DATA) seaudit-report-service
|
|
|
25bb7d |
- mkdir -p -- $(LOGWATCH_GROUP)
|
|
|
25bb7d |
- install -m 644 seaudit-report-group.conf $(LOGWATCH_GROUP)
|
|
|
25bb7d |
- mkdir -p -- $(LOGWATCH_SERVICE)
|
|
|
25bb7d |
- install -m 644 seaudit-report-service.conf $(LOGWATCH_SERVICE)
|
|
|
25bb7d |
- mkdir -p -- $(LOGWATCH_FILTER)
|
|
|
25bb7d |
- install -m 755 seaudit-report-service $(LOGWATCH_FILTER)
|
|
|
25bb7d |
+dist_noinst_DATA = dot_seaudit.in
|
|
|
25bb7d |
|
|
|
25bb7d |
$(top_builddir)/libapol/src/libapol.so:
|
|
|
25bb7d |
$(MAKE) -C $(top_builddir)/libapol/src $(notdir $@)
|
|
|
25bb7d |
@@ -85,6 +62,4 @@ $(top_builddir)/libqpol/src/libqpol.so:
|
|
|
25bb7d |
$(top_builddir)/libsefs/src/libsefs.so:
|
|
|
25bb7d |
$(MAKE) -C $(top_builddir)/libsefs/src $(notdir $@)
|
|
|
25bb7d |
|
|
|
25bb7d |
-.PHONY: install-logwatch
|
|
|
25bb7d |
-
|
|
|
25bb7d |
-CLEANFILES = dot_seaudit seaudit-report-service
|
|
|
25bb7d |
+CLEANFILES = dot_seaudit
|
|
|
25bb7d |
diff -up setools-3.3.7/secmds/Makefile.am.noship setools-3.3.7/secmds/Makefile.am
|
|
|
25bb7d |
--- setools-3.3.7/secmds/Makefile.am.noship 2007-08-02 17:16:33.000000000 -0400
|
|
|
101805 |
+++ setools-3.3.7/secmds/Makefile.am 2013-11-27 09:27:14.307196361 -0500
|
|
|
25bb7d |
@@ -1,6 +1,6 @@
|
|
|
25bb7d |
# various setools command line tools
|
|
|
25bb7d |
|
|
|
25bb7d |
-bin_PROGRAMS = seinfo sesearch findcon replcon indexcon
|
|
|
101805 |
+bin_PROGRAMS = seinfo sesearch findcon
|
|
|
25bb7d |
|
|
|
25bb7d |
# These are for indexcon so that it is usable on machines without setools
|
|
|
25bb7d |
STATICLIBS = ../libsefs/src/libsefs.a ../libapol/src/libapol.a ../libqpol/src/libqpol.a -lsqlite3
|
|
|
25bb7d |
diff -up setools-3.3.7/sediff/Makefile.am.noship setools-3.3.7/sediff/Makefile.am
|
|
|
25bb7d |
--- setools-3.3.7/sediff/Makefile.am.noship 2007-04-25 15:20:20.000000000 -0400
|
|
|
101805 |
+++ setools-3.3.7/sediff/Makefile.am 2013-11-27 09:27:14.307196361 -0500
|
|
|
25bb7d |
@@ -1,13 +1,6 @@
|
|
|
25bb7d |
setoolsdir = @setoolsdir@
|
|
|
25bb7d |
|
|
|
25bb7d |
-dist_setools_DATA = sediff_help.txt sediffx.glade \
|
|
|
25bb7d |
- sediffx.png sediffx-small.png
|
|
|
25bb7d |
-
|
|
|
25bb7d |
-if BUILD_GUI
|
|
|
25bb7d |
- MAYBE_SEDIFFX = sediffx
|
|
|
25bb7d |
-endif
|
|
|
25bb7d |
-
|
|
|
25bb7d |
-bin_PROGRAMS = sediff $(MAYBE_SEDIFFX)
|
|
|
25bb7d |
+bin_PROGRAMS = sediff
|
|
|
25bb7d |
|
|
|
25bb7d |
AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
|
|
|
25bb7d |
@QPOL_CFLAGS@ @APOL_CFLAGS@ @POLDIFF_CFLAGS@
|
|
|
25bb7d |
@@ -15,14 +8,7 @@ AM_LDFLAGS = @DEBUGLDFLAGS@ @WARNLDFLAGS
|
|
|
25bb7d |
|
|
|
25bb7d |
LDADD = @SELINUX_LIB_FLAG@ @POLDIFF_LIB_FLAG@ @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@
|
|
|
25bb7d |
|
|
|
25bb7d |
-sediff_CFLAGS = $(AM_CFLAGS)
|
|
|
25bb7d |
-sediffx_CFLAGS = $(AM_CFLAGS) \
|
|
|
25bb7d |
- @GTK_CFLAGS@ @PIXBUF_CFLAGS@ @GLADE_CFLAGS@ @GTHREAD_CFLAGS@
|
|
|
25bb7d |
-
|
|
|
25bb7d |
-# need the -rdynamic flag below - glade uses dlopen() upon sediffx callbacks
|
|
|
25bb7d |
-sediffx_LDFLAGS = $(AM_LDFLAGS) \
|
|
|
25bb7d |
- @GTK_LIBS@ @PIXBUF_LIBS@ @GLADE_LIBS@ @GTHREAD_LIBS@ @XML_LIBS@ \
|
|
|
25bb7d |
- -rdynamic
|
|
|
25bb7d |
+sediff_CFLAGS = $(AM_CFLAGS)
|
|
|
25bb7d |
|
|
|
25bb7d |
DEPENDENCIES = $(top_builddir)/libpoldiff/src/libpoldiff.so \
|
|
|
25bb7d |
$(top_builddir)/libapol/src/libapol.so \
|
|
|
25bb7d |
@@ -30,20 +16,6 @@ DEPENDENCIES = $(top_builddir)/libpoldif
|
|
|
25bb7d |
|
|
|
25bb7d |
sediff_SOURCES = sediff.c
|
|
|
25bb7d |
|
|
|
25bb7d |
-sediffx_SOURCES = \
|
|
|
25bb7d |
- find_dialog.c find_dialog.h \
|
|
|
25bb7d |
- open_policies_dialog.c open_policies_dialog.h \
|
|
|
25bb7d |
- policy_view.c policy_view.h \
|
|
|
25bb7d |
- progress.c progress.h \
|
|
|
25bb7d |
- remap_types_dialog.c remap_types_dialog.h \
|
|
|
25bb7d |
- result_item.c result_item.h \
|
|
|
25bb7d |
- result_item_render.c result_item_render.h \
|
|
|
25bb7d |
- results.c results.h \
|
|
|
25bb7d |
- select_diff_dialog.c select_diff_dialog.h \
|
|
|
25bb7d |
- toplevel.c toplevel.h \
|
|
|
25bb7d |
- utilgui.c utilgui.h \
|
|
|
25bb7d |
- sediffx.c sediffx.h
|
|
|
25bb7d |
-
|
|
|
25bb7d |
$(top_builddir)/libpoldiff/src/libpoldiff.so:
|
|
|
25bb7d |
$(MAKE) -C $(top_builddir)/libpoldiff/src $(notdir $@)
|
|
|
25bb7d |
|