|
 |
4ea9f2 |
From a39d0831d654292fb2a1f7b9ee18ecc9239f610f Mon Sep 17 00:00:00 2001
|
|
|
4ea9f2 |
From: Miroslav Grepl <mgrepl@redhat.com>
|
|
|
4ea9f2 |
Date: Fri, 11 Apr 2014 18:38:34 +0200
|
|
|
4ea9f2 |
Subject: [PATCH 07/11] Setools noship
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
---
|
|
|
4ea9f2 |
Makefile.am | 26 +++-----------------------
|
|
|
4ea9f2 |
configure.ac | 2 +-
|
|
|
4ea9f2 |
man/Makefile.am | 15 +++------------
|
|
|
4ea9f2 |
seaudit/Makefile.am | 31 +++----------------------------
|
|
|
4ea9f2 |
secmds/Makefile.am | 14 +-------------
|
|
|
4ea9f2 |
sediff/Makefile.am | 32 ++------------------------------
|
|
|
4ea9f2 |
6 files changed, 13 insertions(+), 107 deletions(-)
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
4ea9f2 |
index 176c8ea..4cac386 100644
|
|
|
4ea9f2 |
--- a/Makefile.am
|
|
|
4ea9f2 |
+++ b/Makefile.am
|
|
|
4ea9f2 |
@@ -78,9 +70,9 @@ install-logwatch:
|
|
|
4ea9f2 |
$(MAKE) -C $(top_srcdir)/seaudit install-logwatch
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
.PHONY: libqpol libapol libpoldiff libsefs libseaudit \
|
|
|
4ea9f2 |
- apol secmds seaudit sediff sediffx sechecker \
|
|
|
4ea9f2 |
+ apol secmds seaudit sediff sechecker\
|
|
|
4ea9f2 |
install-logwatch help \
|
|
|
4ea9f2 |
- seinfo sesearch indexcon findcon replcon searchcon \
|
|
|
4ea9f2 |
+ seinfo sesearch findcon \
|
|
|
4ea9f2 |
packages
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
seinfo: libqpol libapol
|
|
|
4ea9f2 |
diff --git a/configure.ac b/configure.ac
|
|
|
4ea9f2 |
index 2a5b55b..5b1da5e 100644
|
|
|
4ea9f2 |
--- a/configure.ac
|
|
|
4ea9f2 |
+++ b/configure.ac
|
|
|
4ea9f2 |
@@ -63,7 +63,7 @@ if test ${ac_cv_prog_cc_c99} = "no"; then
|
|
|
4ea9f2 |
fi
|
|
|
4ea9f2 |
AC_PROG_CXX
|
|
|
4ea9f2 |
AC_LANG([C])
|
|
|
4ea9f2 |
-AC_PROG_LIBTOOL
|
|
|
4ea9f2 |
+AC_PROG_RANLIB
|
|
|
4ea9f2 |
AC_PROG_LN_S
|
|
|
4ea9f2 |
AC_PROG_LEX
|
|
|
4ea9f2 |
AC_PROG_YACC
|
|
|
4ea9f2 |
diff --git a/man/Makefile.am b/man/Makefile.am
|
|
|
4ea9f2 |
index 0fafccb..f88e00a 100644
|
|
|
4ea9f2 |
--- a/man/Makefile.am
|
|
|
4ea9f2 |
+++ b/man/Makefile.am
|
|
|
4ea9f2 |
@@ -1,19 +1,10 @@
|
|
|
4ea9f2 |
if BUILD_GUI
|
|
|
4ea9f2 |
MAYBEMANS = apol.1 \
|
|
|
4ea9f2 |
- seaudit.8 seaudit-report.8 \
|
|
|
4ea9f2 |
- sediffx.1
|
|
|
4ea9f2 |
+ seaudit.8
|
|
|
4ea9f2 |
endif
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
EXTRA_DIST=$(man_MANS) apol.1 \
|
|
|
4ea9f2 |
- seaudit.8 seaudit-report.8.in \
|
|
|
4ea9f2 |
- sediffx.1
|
|
|
4ea9f2 |
+ seaudit.8
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
-man_MANS = findcon.1 indexcon.1 replcon.1 \
|
|
|
4ea9f2 |
- sechecker.1 \
|
|
|
4ea9f2 |
- sediff.1 \
|
|
|
4ea9f2 |
+man_MANS = findcon.1 sediff.1 sechecker.1 \
|
|
|
4ea9f2 |
seinfo.1 sesearch.1 $(MAYBEMANS)
|
|
|
4ea9f2 |
-
|
|
|
4ea9f2 |
-seaudit-report.8: seaudit-report.8.in Makefile
|
|
|
4ea9f2 |
- sed -e 's|\@setoolsdir\@|$(setoolsdir)|g' $< > $@
|
|
|
4ea9f2 |
-
|
|
|
4ea9f2 |
-CLEANFILES = seaudit-report.8
|
|
|
4ea9f2 |
diff --git a/seaudit/Makefile.am b/seaudit/Makefile.am
|
|
|
4ea9f2 |
index 1987c99..3fa4413 100644
|
|
|
4ea9f2 |
--- a/seaudit/Makefile.am
|
|
|
4ea9f2 |
+++ b/seaudit/Makefile.am
|
|
|
4ea9f2 |
@@ -1,5 +1,4 @@
|
|
|
4ea9f2 |
setoolsdir = @setoolsdir@
|
|
|
4ea9f2 |
-bin_PROGRAMS = seaudit-report
|
|
|
4ea9f2 |
sbin_PROGRAMS = seaudit
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
|
|
|
4ea9f2 |
@@ -20,13 +19,10 @@ LDADD = @SELINUX_LIB_FLAG@ @SEAUDIT_LIB_FLAG@ @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@
|
|
|
4ea9f2 |
dist_setools_DATA = \
|
|
|
4ea9f2 |
seaudit.glade \
|
|
|
4ea9f2 |
seaudit_help.txt \
|
|
|
4ea9f2 |
- seaudit-report.conf \
|
|
|
4ea9f2 |
- seaudit-report.css \
|
|
|
4ea9f2 |
seaudit.png seaudit-small.png
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
nodist_setools_DATA = \
|
|
|
4ea9f2 |
- dot_seaudit \
|
|
|
4ea9f2 |
- seaudit-report-service
|
|
|
4ea9f2 |
+ dot_seaudit
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
seaudit_SOURCES = \
|
|
|
4ea9f2 |
filter_view.c filter_view.h \
|
|
|
4ea9f2 |
@@ -50,31 +46,12 @@ seaudit_DEPENDENCIES = $(top_builddir)/libseaudit/src/libseaudit.so \
|
|
|
4ea9f2 |
dot_seaudit: dot_seaudit.in Makefile
|
|
|
4ea9f2 |
sed -e 's|\@setoolsdir\@|$(setoolsdir)|g' $< > $@
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
-seaudit_report_SOURCES = seaudit-report.c
|
|
|
4ea9f2 |
-seaudit_report_DEPENDENCIES = $(top_builddir)/libseaudit/src/libseaudit.so \
|
|
|
4ea9f2 |
- $(top_builddir)/libapol/src/libapol.so \
|
|
|
4ea9f2 |
- $(top_builddir)/libqpol/src/libqpol.so
|
|
|
4ea9f2 |
-
|
|
|
4ea9f2 |
logwatch = $(DESTDIR)/etc/logwatch
|
|
|
4ea9f2 |
LOGWATCH_GROUP = $(logwatch)/conf/logfiles
|
|
|
4ea9f2 |
LOGWATCH_SERVICE = $(logwatch)/conf/services
|
|
|
4ea9f2 |
LOGWATCH_FILTER = $(logwatch)/scripts/services
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
-dist_noinst_DATA = dot_seaudit.in \
|
|
|
4ea9f2 |
- seaudit-report-group.conf \
|
|
|
4ea9f2 |
- seaudit-report-service.conf \
|
|
|
4ea9f2 |
- seaudit-report-service.in
|
|
|
4ea9f2 |
-
|
|
|
4ea9f2 |
-seaudit-report-service: seaudit-report-service.in Makefile
|
|
|
4ea9f2 |
- sed -e 's|\@bindir\@|$(bindir)|g' $< > $@
|
|
|
4ea9f2 |
-
|
|
|
4ea9f2 |
-install-logwatch: $(dist_noinst_DATA) seaudit-report-service
|
|
|
4ea9f2 |
- mkdir -p -- $(LOGWATCH_GROUP)
|
|
|
4ea9f2 |
- install -m 644 seaudit-report-group.conf $(LOGWATCH_GROUP)
|
|
|
4ea9f2 |
- mkdir -p -- $(LOGWATCH_SERVICE)
|
|
|
4ea9f2 |
- install -m 644 seaudit-report-service.conf $(LOGWATCH_SERVICE)
|
|
|
4ea9f2 |
- mkdir -p -- $(LOGWATCH_FILTER)
|
|
|
4ea9f2 |
- install -m 755 seaudit-report-service $(LOGWATCH_FILTER)
|
|
|
4ea9f2 |
+dist_noinst_DATA = dot_seaudit.in
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
$(top_builddir)/libapol/src/libapol.so:
|
|
|
4ea9f2 |
$(MAKE) -C $(top_builddir)/libapol/src $(notdir $@)
|
|
|
4ea9f2 |
@@ -85,6 +62,4 @@ $(top_builddir)/libqpol/src/libqpol.so:
|
|
|
4ea9f2 |
$(top_builddir)/libsefs/src/libsefs.so:
|
|
|
4ea9f2 |
$(MAKE) -C $(top_builddir)/libsefs/src $(notdir $@)
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
-.PHONY: install-logwatch
|
|
|
4ea9f2 |
-
|
|
|
4ea9f2 |
-CLEANFILES = dot_seaudit seaudit-report-service
|
|
|
4ea9f2 |
+CLEANFILES = dot_seaudit
|
|
|
4ea9f2 |
diff --git a/secmds/Makefile.am b/secmds/Makefile.am
|
|
|
4ea9f2 |
index ddc88b1..7fa4364 100644
|
|
|
4ea9f2 |
--- a/secmds/Makefile.am
|
|
|
4ea9f2 |
+++ b/secmds/Makefile.am
|
|
|
4ea9f2 |
@@ -1,6 +1,6 @@
|
|
|
4ea9f2 |
# various setools command line tools
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
-bin_PROGRAMS = seinfo sesearch findcon replcon indexcon
|
|
|
4ea9f2 |
+bin_PROGRAMS = seinfo sesearch findcon
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
# These are for indexcon so that it is usable on machines without setools
|
|
|
4ea9f2 |
STATICLIBS = ../libsefs/src/libsefs.a ../libapol/src/libapol.a ../libqpol/src/libqpol.a -lsqlite3
|
|
|
4ea9f2 |
diff --git a/sediff/Makefile.am b/sediff/Makefile.am
|
|
|
4ea9f2 |
index 3f53cd3..2d9ce84 100644
|
|
|
4ea9f2 |
--- a/sediff/Makefile.am
|
|
|
4ea9f2 |
+++ b/sediff/Makefile.am
|
|
|
4ea9f2 |
@@ -1,13 +1,6 @@
|
|
|
4ea9f2 |
setoolsdir = @setoolsdir@
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
-dist_setools_DATA = sediff_help.txt sediffx.glade \
|
|
|
4ea9f2 |
- sediffx.png sediffx-small.png
|
|
|
4ea9f2 |
-
|
|
|
4ea9f2 |
-if BUILD_GUI
|
|
|
4ea9f2 |
- MAYBE_SEDIFFX = sediffx
|
|
|
4ea9f2 |
-endif
|
|
|
4ea9f2 |
-
|
|
|
4ea9f2 |
-bin_PROGRAMS = sediff $(MAYBE_SEDIFFX)
|
|
|
4ea9f2 |
+bin_PROGRAMS = sediff
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
|
|
|
4ea9f2 |
@QPOL_CFLAGS@ @APOL_CFLAGS@ @POLDIFF_CFLAGS@
|
|
|
4ea9f2 |
@@ -15,14 +8,7 @@ AM_LDFLAGS = @DEBUGLDFLAGS@ @WARNLDFLAGS@ @PROFILELDFLAGS@
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
LDADD = @SELINUX_LIB_FLAG@ @POLDIFF_LIB_FLAG@ @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
-sediff_CFLAGS = $(AM_CFLAGS)
|
|
|
4ea9f2 |
-sediffx_CFLAGS = $(AM_CFLAGS) \
|
|
|
4ea9f2 |
- @GTK_CFLAGS@ @PIXBUF_CFLAGS@ @GLADE_CFLAGS@ @GTHREAD_CFLAGS@
|
|
|
4ea9f2 |
-
|
|
|
4ea9f2 |
-# need the -rdynamic flag below - glade uses dlopen() upon sediffx callbacks
|
|
|
4ea9f2 |
-sediffx_LDFLAGS = $(AM_LDFLAGS) \
|
|
|
4ea9f2 |
- @GTK_LIBS@ @PIXBUF_LIBS@ @GLADE_LIBS@ @GTHREAD_LIBS@ @XML_LIBS@ \
|
|
|
4ea9f2 |
- -rdynamic
|
|
|
4ea9f2 |
+sediff_CFLAGS = $(AM_CFLAGS)
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
DEPENDENCIES = $(top_builddir)/libpoldiff/src/libpoldiff.so \
|
|
|
4ea9f2 |
$(top_builddir)/libapol/src/libapol.so \
|
|
|
4ea9f2 |
@@ -30,20 +16,6 @@ DEPENDENCIES = $(top_builddir)/libpoldiff/src/libpoldiff.so \
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
sediff_SOURCES = sediff.c
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
-sediffx_SOURCES = \
|
|
|
4ea9f2 |
- find_dialog.c find_dialog.h \
|
|
|
4ea9f2 |
- open_policies_dialog.c open_policies_dialog.h \
|
|
|
4ea9f2 |
- policy_view.c policy_view.h \
|
|
|
4ea9f2 |
- progress.c progress.h \
|
|
|
4ea9f2 |
- remap_types_dialog.c remap_types_dialog.h \
|
|
|
4ea9f2 |
- result_item.c result_item.h \
|
|
|
4ea9f2 |
- result_item_render.c result_item_render.h \
|
|
|
4ea9f2 |
- results.c results.h \
|
|
|
4ea9f2 |
- select_diff_dialog.c select_diff_dialog.h \
|
|
|
4ea9f2 |
- toplevel.c toplevel.h \
|
|
|
4ea9f2 |
- utilgui.c utilgui.h \
|
|
|
4ea9f2 |
- sediffx.c sediffx.h
|
|
|
4ea9f2 |
-
|
|
|
4ea9f2 |
$(top_builddir)/libpoldiff/src/libpoldiff.so:
|
|
|
4ea9f2 |
$(MAKE) -C $(top_builddir)/libpoldiff/src $(notdir $@)
|
|
|
4ea9f2 |
|
|
|
4ea9f2 |
--
|
|
|
4ea9f2 |
1.8.5.3
|
|
|
4ea9f2 |
|