From mboxrd@z Thu Jan 1 00:00:00 1970 From: ramsdell@mitre.org (John D. Ramsdell) Subject: Re: [PATCH] dist target fixes with Mirek's improvements Date: 03 Aug 2007 10:11:10 -0400 Message-ID: References: <46ADF66C.4080805@redhat.com> <46ADFDA6.6040409@redhat.com> <46AE0167.7060208@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: sgrubb@redhad.com, Miloslav Trmac Cc: linux-audit@redhat.com List-Id: linux-audit@redhat.com Enclosed is a corrected patch to be applied to version 1.5.6 that fixes the dist target. This patch includes the improvement suggested by Mirek so the a distribution includes only the m4 files it needs. Thank you Mirek. I generated with patch by expanding the 1.5.6 distribution, applying the fat patch to this version, and then deleting all the derived files that showed up in the diff. The enclosed diff was then generated. John diff -ur x/audit-1.5.6/auparse/test/Makefile.am y/audit-1.5.6/auparse/test/Makefile.am --- x/audit-1.5.6/auparse/test/Makefile.am 2007-05-17 15:26:49.000000000 -0400 +++ y/audit-1.5.6/auparse/test/Makefile.am 2007-08-03 09:54:26.000000000 -0400 @@ -50,6 +50,4 @@ ../../bindings/python/build/*/auparse.so: ../../bindings/python/auparse_python.c cd ../../bindings/python && make - - - +EXTRA_DIST = auparse_test.py auparse_test.ref Only in x/audit-1.5.6/auparse/test: Makefile.in Only in x/audit-1.5.6: config.guess Only in x/audit-1.5.6: config.sub diff -ur x/audit-1.5.6/init.d/Makefile.am y/audit-1.5.6/init.d/Makefile.am --- x/audit-1.5.6/init.d/Makefile.am 2007-07-25 14:10:53.000000000 -0400 +++ y/audit-1.5.6/init.d/Makefile.am 2007-08-03 09:54:26.000000000 -0400 @@ -22,7 +22,7 @@ CONFIG_CLEAN_FILES = Makefile.in *.rej *.orig EXTRA_DIST = auditd.init auditd.sysconfig auditd.conf audit.rules \ - auditd.cron libaudit.conf + auditd.cron libaudit.conf audispd.conf libconfig = libaudit.conf dispconfig = audispd.conf dispconfigdir = $(sysconfdir)/audisp diff -ur x/audit-1.5.6/Makefile.am y/audit-1.5.6/Makefile.am --- x/audit-1.5.6/Makefile.am 2007-06-27 06:19:18.000000000 -0400 +++ y/audit-1.5.6/Makefile.am 2007-08-03 09:54:26.000000000 -0400 @@ -21,9 +21,14 @@ # Rickard E. (Rik) Faith # -SUBDIRS = lib auparse src/mt src audisp swig bindings init.d docs system-config-audit -EXTRA_DIST = ChangeLog AUTHORS NEWS README sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c README-install audit.spec -CONFIG_CLEAN_FILES = Makefile.in aclocal.m4* config.h.* configure debug*.list config/* +SUBDIRS = lib auparse src/mt src audisp swig bindings init.d docs \ +system-config-audit +EXTRA_DIST = ChangeLog AUTHORS NEWS README sample.rules \ +contrib/capp.rules contrib/nispom.rules contrib/lspp.rules \ +contrib/skeleton.c contrib/avc_snap contrib/avc_syslog \ +README-install audit.spec +CONFIG_CLEAN_FILES = Makefile.in aclocal.m4* config.h.* configure \ +debug*.list config/* clean-generic: rm -rf autom4te*.cache Only in x/audit-1.5.6/system-config-audit: aclocal.m4 Only in x/audit-1.5.6/system-config-audit/admin: config.guess Only in x/audit-1.5.6/system-config-audit/admin: config.sub diff -ur x/audit-1.5.6/system-config-audit/autogen.sh y/audit-1.5.6/system-config-audit/autogen.sh --- x/audit-1.5.6/system-config-audit/autogen.sh 2007-06-27 06:44:22.000000000 -0400 +++ y/audit-1.5.6/system-config-audit/autogen.sh 2007-08-03 09:54:26.000000000 -0400 @@ -6,7 +6,7 @@ intltoolize --force rm admin/po -aclocal +aclocal -I m4 autoconf -Wall autoheader -Wall automake -Wall --add-missing Only in x/audit-1.5.6/system-config-audit: autom4te.cache Only in x/audit-1.5.6/system-config-audit: configure diff -ur x/audit-1.5.6/system-config-audit/Makefile.am y/audit-1.5.6/system-config-audit/Makefile.am --- x/audit-1.5.6/system-config-audit/Makefile.am 2007-07-25 14:25:05.000000000 -0400 +++ y/audit-1.5.6/system-config-audit/Makefile.am 2007-08-03 09:54:26.000000000 -0400 @@ -58,11 +58,12 @@ CLEANFILES = $(applications_DATA) $(bin_SCRIPTS) $(nodist_pkgdata_PYTHON) \ admin/system-config-audit-server.console DISTCLEANFILES = intltool-extract intltool-merge intltool-update -EXTRA_DIST = admin/intltool-extract.in admin/intltool-merge.in \ - admin/intltool-update.in admin/system-config-audit-server.console.in \ - admin/system-config-audit-server.pam \ - src/settings.py.in src/system-config-audit.in \ - system-config-audit.desktop.in +EXTRA_DIST = admin/intltool-extract.in admin/intltool-merge.in \ + admin/intltool-update.in \ + admin/system-config-audit-server.console.in \ + admin/system-config-audit-server.pam src/settings.py.in \ + src/system-config-audit.in system-config-audit.desktop.in \ + autogen.sh src_system_config_audit_server_SOURCES = src/server.c src/server.h src_system_config_audit_server_CPPFLAGS = $(AM_CPPFLAGS) \ Only in x/audit-1.5.6/system-config-audit: Makefile.in