[setools] Rebuild with new tool chain

Daniel J Walsh dwalsh at fedoraproject.org
Mon Jan 7 16:04:45 UTC 2013 

commit 5ee61040d8cdba045ce85b79adf39ca9630f7eab
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Jan 7 11:04:14 2013 -0500

    Rebuild with new tool chain

 0011-setools-noship.patch |  243 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 243 insertions(+), 0 deletions(-)
---
diff --git a/0011-setools-noship.patch b/0011-setools-noship.patch
new file mode 100644
index 0000000..5febbab
--- /dev/null
+++ b/0011-setools-noship.patch
@@ -0,0 +1,243 @@
+diff -up setools-3.3.7/Makefile.am.noship setools-3.3.7/Makefile.am
+--- setools-3.3.7/Makefile.am.noship	2012-09-28 13:15:50.758642089 -0400
++++ setools-3.3.7/Makefile.am	2012-09-28 13:15:50.911643035 -0400
+@@ -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) python
++SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) python
+ 
+ #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:
+ 	$(MAKE) -C $(top_srcdir)/seaudit install-logwatch
+ 
+ .PHONY: libqpol libapol libpoldiff libsefs libseaudit \
+-	apol secmds seaudit sediff sediffx sechecker \
++	apol secmds seaudit sediff \
+ 	install-logwatch help \
+-	seinfo sesearch indexcon findcon replcon searchcon \
++	seinfo sesearch \
+ 	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/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	2012-09-28 13:15:50.912643041 -0400
+@@ -1,19 +1,10 @@
+ if BUILD_GUI
+   MAYBEMANS = apol.1 \
+-	seaudit.8 seaudit-report.8 \
+-	sediffx.1
++	seaudit.8
+ endif
+ 
+ EXTRA_DIST=$(man_MANS) apol.1 \
+-	seaudit.8 seaudit-report.8.in \
+-	sediffx.1
++	seaudit.8
+ 
+-man_MANS = findcon.1 indexcon.1 replcon.1 \
+-	sechecker.1 \
+-	sediff.1 \
++man_MANS = sediff.1 \
+ 	seinfo.1 sesearch.1 $(MAYBEMANS)
+-
+-seaudit-report.8: seaudit-report.8.in Makefile
+-	sed -e 's|\@setoolsdir\@|$(setoolsdir)|g' $< > $@
+-
+-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	2012-09-28 13:16:47.983863211 -0400
+@@ -1,5 +1,4 @@
+ setoolsdir = @setoolsdir@
+-bin_PROGRAMS = seaudit-report
+ sbin_PROGRAMS = seaudit
+ 
+ AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
+@@ -20,13 +19,10 @@ LDADD = @SELINUX_LIB_FLAG@ @SEAUDIT_LIB_
+ dist_setools_DATA = \
+ 	seaudit.glade \
+ 	seaudit_help.txt \
+-	seaudit-report.conf \
+-	seaudit-report.css \
+ 	seaudit.png seaudit-small.png
+ 
+ nodist_setools_DATA = \
+-	dot_seaudit \
+-	seaudit-report-service
++	dot_seaudit
+ 
+ seaudit_SOURCES = \
+ 	filter_view.c filter_view.h \
+@@ -50,31 +46,12 @@ seaudit_DEPENDENCIES = $(top_builddir)/l
+ dot_seaudit: dot_seaudit.in Makefile
+ 	sed -e 's|\@setoolsdir\@|$(setoolsdir)|g' $< > $@
+ 
+-seaudit_report_SOURCES = seaudit-report.c
+-seaudit_report_DEPENDENCIES = $(top_builddir)/libseaudit/src/libseaudit.so \
+-                              $(top_builddir)/libapol/src/libapol.so \
+-                              $(top_builddir)/libqpol/src/libqpol.so
+-
+ logwatch = $(DESTDIR)/etc/logwatch
+ LOGWATCH_GROUP = $(logwatch)/conf/logfiles
+ LOGWATCH_SERVICE = $(logwatch)/conf/services
+ LOGWATCH_FILTER = $(logwatch)/scripts/services
+ 
+-dist_noinst_DATA = dot_seaudit.in \
+-	seaudit-report-group.conf \
+-        seaudit-report-service.conf \
+-        seaudit-report-service.in
+-
+-seaudit-report-service: seaudit-report-service.in Makefile
+-	sed -e 's|\@bindir\@|$(bindir)|g' $< > $@
+-
+-install-logwatch: $(dist_noinst_DATA) seaudit-report-service
+-	mkdir -p -- $(LOGWATCH_GROUP)
+-	install -m 644 seaudit-report-group.conf $(LOGWATCH_GROUP)
+-	mkdir -p -- $(LOGWATCH_SERVICE)
+-	install -m 644 seaudit-report-service.conf $(LOGWATCH_SERVICE)
+-	mkdir -p -- $(LOGWATCH_FILTER)
+-	install -m 755 seaudit-report-service $(LOGWATCH_FILTER)
++dist_noinst_DATA = dot_seaudit.in
+ 
+ $(top_builddir)/libapol/src/libapol.so:
+ 	$(MAKE) -C $(top_builddir)/libapol/src $(notdir $@)
+@@ -85,6 +62,4 @@ $(top_builddir)/libqpol/src/libqpol.so:
+ $(top_builddir)/libsefs/src/libsefs.so:
+ 	$(MAKE) -C $(top_builddir)/libsefs/src $(notdir $@)
+ 
+-.PHONY: install-logwatch
+-
+-CLEANFILES = dot_seaudit seaudit-report-service
++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	2012-09-28 13:15:50.913643048 -0400
+@@ -1,6 +1,6 @@
+ # various setools command line tools
+ 
+-bin_PROGRAMS = seinfo sesearch findcon replcon indexcon
++bin_PROGRAMS = seinfo sesearch
+ 
+ # 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	2012-09-28 13:15:50.913643048 -0400
+@@ -1,13 +1,6 @@
+ setoolsdir = @setoolsdir@
+ 
+-dist_setools_DATA = sediff_help.txt sediffx.glade \
+-	sediffx.png sediffx-small.png
+-
+-if BUILD_GUI
+-  MAYBE_SEDIFFX = sediffx
+-endif
+-
+-bin_PROGRAMS = sediff $(MAYBE_SEDIFFX)
++bin_PROGRAMS = sediff
+ 
+ AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
+ 	@QPOL_CFLAGS@ @APOL_CFLAGS@ @POLDIFF_CFLAGS@
+@@ -15,14 +8,7 @@ AM_LDFLAGS = @DEBUGLDFLAGS@ @WARNLDFLAGS
+ 
+ LDADD = @SELINUX_LIB_FLAG@ @POLDIFF_LIB_FLAG@ @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@
+ 
+-sediff_CFLAGS = $(AM_CFLAGS)
+-sediffx_CFLAGS = $(AM_CFLAGS) \
+-	@GTK_CFLAGS@ @PIXBUF_CFLAGS@ @GLADE_CFLAGS@ @GTHREAD_CFLAGS@
+-
+-# need the -rdynamic flag below - glade uses dlopen() upon sediffx callbacks
+-sediffx_LDFLAGS = $(AM_LDFLAGS) \
+-	@GTK_LIBS@ @PIXBUF_LIBS@ @GLADE_LIBS@ @GTHREAD_LIBS@ @XML_LIBS@ \
+-	-rdynamic
++sediff_CFLAGS = $(AM_CFLAGS) 
+ 
+ DEPENDENCIES = $(top_builddir)/libpoldiff/src/libpoldiff.so \
+ 	$(top_builddir)/libapol/src/libapol.so \
+@@ -30,20 +16,6 @@ DEPENDENCIES = $(top_builddir)/libpoldif
+ 
+ sediff_SOURCES = sediff.c
+ 
+-sediffx_SOURCES = \
+-	find_dialog.c find_dialog.h \
+-	open_policies_dialog.c open_policies_dialog.h \
+-	policy_view.c policy_view.h \
+-	progress.c progress.h \
+-	remap_types_dialog.c remap_types_dialog.h \
+-	result_item.c result_item.h \
+-	result_item_render.c result_item_render.h \
+-	results.c results.h \
+-	select_diff_dialog.c select_diff_dialog.h \
+-	toplevel.c toplevel.h \
+-	utilgui.c utilgui.h \
+-	sediffx.c sediffx.h
+-
+ $(top_builddir)/libpoldiff/src/libpoldiff.so:
+ 	$(MAKE) -C $(top_builddir)/libpoldiff/src $(notdir $@)
+

More information about the scm-commits mailing list