* [PATCH] dist target fixes
@ 2007-07-30 12:09 John D. Ramsdell
2007-07-30 14:32 ` Miloslav Trmac
2007-08-27 20:19 ` [PATCH] dist target fixes Steve Grubb
0 siblings, 2 replies; 11+ messages in thread
From: John D. Ramsdell @ 2007-07-30 12:09 UTC (permalink / raw)
To: sgrubb; +Cc: linux-audit
Steve,
I discovered a few more files that are being mistakenly omitted when
using the dist target.
John
Only in b/audit-1.5.6: ab.diff
Only in b/audit-1.5.6: ac.diff
Only in b/audit-1.5.6: aclocal.m4
Only in b/audit-1.5.6/audisp: Makefile
Only in b/audit-1.5.6/audisp: Makefile.in
Only in b/audit-1.5.6: audit-1.5.6.tar.gz
Only in b/audit-1.5.6/auparse: .deps
Only in b/audit-1.5.6/auparse: Makefile
Only in b/audit-1.5.6/auparse: Makefile.in
Only in b/audit-1.5.6/auparse/test: .deps
Only in b/audit-1.5.6/auparse/test: Makefile
diff -ur a/audit-1.5.6/auparse/test/Makefile.am b/audit-1.5.6/auparse/test/Makefile.am
--- a/audit-1.5.6/auparse/test/Makefile.am 2007-05-17 15:26:49.000000000 -0400
+++ b/audit-1.5.6/auparse/test/Makefile.am 2007-07-30 07:20:28.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
diff -ur a/audit-1.5.6/auparse/test/Makefile.in b/audit-1.5.6/auparse/test/Makefile.in
--- a/audit-1.5.6/auparse/test/Makefile.in 2007-07-25 14:23:12.000000000 -0400
+++ b/audit-1.5.6/auparse/test/Makefile.in 2007-07-30 07:54:28.000000000 -0400
@@ -213,6 +213,7 @@
auparse_test_LDFLAGS = -static
auparse_test_LDADD = -L../.libs/ -L../../lib/.libs -lauparse -laudit
auparse_test_DEPENDENCIES = ../.libs/libauparse.a ../*.c ../*.h
+EXTRA_DIST = auparse_test.py auparse_test.ref
all: all-am
.SUFFIXES:
Only in b/audit-1.5.6: autom4te.cache
Only in b/audit-1.5.6/bindings: Makefile
Only in b/audit-1.5.6/bindings: Makefile.in
Only in b/audit-1.5.6/bindings/python: Makefile
Only in b/audit-1.5.6/bindings/python: Makefile.in
Only in b/audit-1.5.6: b.txt
Only in b/audit-1.5.6: config.h
Only in b/audit-1.5.6: config.h.in
Only in b/audit-1.5.6: config.log
Only in b/audit-1.5.6: config.status
Only in b/audit-1.5.6: configure
Only in b/audit-1.5.6: c.txt
Only in b/audit-1.5.6/docs: Makefile
Only in b/audit-1.5.6/docs: Makefile.in
Only in b/audit-1.5.6/init.d: Makefile
diff -ur a/audit-1.5.6/init.d/Makefile.am b/audit-1.5.6/init.d/Makefile.am
--- a/audit-1.5.6/init.d/Makefile.am 2007-07-25 14:10:53.000000000 -0400
+++ b/audit-1.5.6/init.d/Makefile.am 2007-07-30 07:25:54.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
Only in b/audit-1.5.6/init.d: Makefile.am~
Only in b/audit-1.5.6/init.d: Makefile.in
Only in b/audit-1.5.6/lib: .deps
Only in b/audit-1.5.6/lib: Makefile
Only in b/audit-1.5.6/lib: Makefile.in
Only in b/audit-1.5.6: libtool
Only in b/audit-1.5.6: Makefile
diff -ur a/audit-1.5.6/Makefile.am b/audit-1.5.6/Makefile.am
--- a/audit-1.5.6/Makefile.am 2007-06-27 06:19:18.000000000 -0400
+++ b/audit-1.5.6/Makefile.am 2007-07-30 07:53:45.000000000 -0400
@@ -21,9 +21,14 @@
# Rickard E. (Rik) Faith <faith@redhat.com>
#
-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 \
+system-config-audit.lang 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 b/audit-1.5.6: Makefile.am~
Only in b/audit-1.5.6: Makefile.in
Only in b/audit-1.5.6: oaudit-1.5.6.tar.gz
Only in b/audit-1.5.6/src: Makefile
Only in b/audit-1.5.6/src: Makefile.in
Only in b/audit-1.5.6/src/mt: audit_logging.c
Only in b/audit-1.5.6/src/mt: deprecated.c
Only in b/audit-1.5.6/src/mt: libaudit.c
Only in b/audit-1.5.6/src/mt: libaudit.h
Only in b/audit-1.5.6/src/mt: lookup_table.c
Only in b/audit-1.5.6/src/mt: Makefile
Only in b/audit-1.5.6/src/mt: Makefile.in
Only in b/audit-1.5.6/src/mt: message.c
Only in b/audit-1.5.6/src/mt: netlink.c
Only in b/audit-1.5.6/src/mt: private.h
Only in b/audit-1.5.6: stamp-h1
Only in b/audit-1.5.6/swig: audit.py
Only in b/audit-1.5.6/swig: audit_wrap.c
Only in b/audit-1.5.6/swig: .deps
Only in b/audit-1.5.6/swig: Makefile
Only in b/audit-1.5.6/swig: Makefile.in
Only in b/audit-1.5.6/system-config-audit: config.log
Only in b/audit-1.5.6/system-config-audit: config.status
Only in b/audit-1.5.6/system-config-audit: intltool-extract
Only in b/audit-1.5.6/system-config-audit: intltool-merge
Only in b/audit-1.5.6/system-config-audit: intltool-update
Only in b/audit-1.5.6/system-config-audit: libtool
Only in b/audit-1.5.6/system-config-audit: m4.txt
Only in b/audit-1.5.6/system-config-audit: Makefile
diff -ur a/audit-1.5.6/system-config-audit/Makefile.am b/audit-1.5.6/system-config-audit/Makefile.am
--- a/audit-1.5.6/system-config-audit/Makefile.am 2007-07-25 14:25:05.000000000 -0400
+++ b/audit-1.5.6/system-config-audit/Makefile.am 2007-07-30 07:49:09.000000000 -0400
@@ -58,11 +58,21 @@
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 \
+ m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/glibc2.m4 \
+ m4/iconv.m4 m4/intdiv0.m4 m4/intldir.m4 m4/intl.m4 \
+ m4/intmax.m4 m4/inttypes_h.m4 m4/inttypes.m4 \
+ m4/inttypes-pri.m4 m4/isc-posix.m4 m4/lcmessage.m4 \
+ m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/lock.m4 \
+ m4/longdouble.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 \
+ m4/printf-posix.m4 m4/progtest.m4 m4/signed.m4 m4/size_max.m4 \
+ m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 \
+ m4/visibility.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4
+
src_system_config_audit_server_SOURCES = src/server.c src/server.h
src_system_config_audit_server_CPPFLAGS = $(AM_CPPFLAGS) \
Only in b/audit-1.5.6/system-config-audit: Makefile.am~
diff -ur a/audit-1.5.6/system-config-audit/Makefile.in b/audit-1.5.6/system-config-audit/Makefile.in
--- a/audit-1.5.6/system-config-audit/Makefile.in 2007-07-25 14:23:56.000000000 -0400
+++ b/audit-1.5.6/system-config-audit/Makefile.in 2007-07-30 07:50:07.000000000 -0400
@@ -314,12 +314,21 @@
CLEANFILES = $(applications_DATA) $(bin_SCRIPTS) $(nodist_pkgdata_PYTHON) \
admin/system-config-audit-server.console
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update src/.libs
-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
+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 \
+ m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/glibc2.m4 \
+ m4/iconv.m4 m4/intdiv0.m4 m4/intldir.m4 m4/intl.m4 \
+ m4/intmax.m4 m4/inttypes_h.m4 m4/inttypes.m4 \
+ m4/inttypes-pri.m4 m4/isc-posix.m4 m4/lcmessage.m4 \
+ m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/lock.m4 \
+ m4/longdouble.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 \
+ m4/printf-posix.m4 m4/progtest.m4 m4/signed.m4 m4/size_max.m4 \
+ m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 \
+ m4/visibility.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4
src_system_config_audit_server_SOURCES = src/server.c src/server.h
src_system_config_audit_server_CPPFLAGS = $(AM_CPPFLAGS) \
Only in b/audit-1.5.6/system-config-audit/po: Makefile
Only in b/audit-1.5.6/system-config-audit/po: Makefile.in
Only in b/audit-1.5.6/system-config-audit/po: POTFILES
Only in b/audit-1.5.6/system-config-audit/po: stamp-it
Only in b/audit-1.5.6/system-config-audit/src: config.h
Only in b/audit-1.5.6/system-config-audit/src: .deps
Only in b/audit-1.5.6/system-config-audit/src: stamp-h1
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dist target fixes
2007-07-30 12:09 [PATCH] dist target fixes John D. Ramsdell
@ 2007-07-30 14:32 ` Miloslav Trmac
2007-07-30 15:02 ` John D. Ramsdell
2007-08-27 20:19 ` [PATCH] dist target fixes Steve Grubb
1 sibling, 1 reply; 11+ messages in thread
From: Miloslav Trmac @ 2007-07-30 14:32 UTC (permalink / raw)
To: John D. Ramsdell; +Cc: linux-audit
Hello,
John D. Ramsdell napsal(a):
> diff -ur a/audit-1.5.6/Makefile.am b/audit-1.5.6/Makefile.am
> --- a/audit-1.5.6/Makefile.am 2007-06-27 06:19:18.000000000 -0400
> +++ b/audit-1.5.6/Makefile.am 2007-07-30 07:53:45.000000000 -0400
> @@ -21,9 +21,14 @@
> # Rickard E. (Rik) Faith <faith@redhat.com>
> #
>
> -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 \
> +system-config-audit.lang README-install audit.spec
system-config-audit.lang is generated by %install when building the rpm,
and should not be in the tarball at all.
> diff -ur a/audit-1.5.6/system-config-audit/Makefile.am b/audit-1.5.6/system-config-audit/Makefile.am
> --- a/audit-1.5.6/system-config-audit/Makefile.am 2007-07-25 14:25:05.000000000 -0400
> +++ b/audit-1.5.6/system-config-audit/Makefile.am 2007-07-30 07:49:09.000000000 -0400
> @@ -58,11 +58,21 @@
> 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 \
> + m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/glibc2.m4 \
> + m4/iconv.m4 m4/intdiv0.m4 m4/intldir.m4 m4/intl.m4 \
> + m4/intmax.m4 m4/inttypes_h.m4 m4/inttypes.m4 \
> + m4/inttypes-pri.m4 m4/isc-posix.m4 m4/lcmessage.m4 \
> + m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/lock.m4 \
> + m4/longdouble.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 \
> + m4/printf-posix.m4 m4/progtest.m4 m4/signed.m4 m4/size_max.m4 \
> + m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 \
> + m4/visibility.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4
A better solution is to change s-c-audit/autogen.sh (and to distribute
the autogen.sh files):
diff -urN audit-1.5.6/system-config-audit/autogen.sh
audit/system-config-audit/autogen.sh
--- audit-1.5.6/system-config-audit/autogen.sh 2007-06-27
12:44:22.000000000 +0200
+++ audit/system-config-audit/autogen.sh 2007-07-30 16:21:05.000000000 +0200
@@ -6,7 +6,7 @@
intltoolize --force
rm admin/po
-aclocal
+aclocal -I m4
autoconf -Wall
autoheader -Wall
automake -Wall --add-missing
This will add only the .m4 files that are used by system-config-audit to
the tarball, not all .m4 files provided by gettext.
Mirek
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dist target fixes
2007-07-30 14:32 ` Miloslav Trmac
@ 2007-07-30 15:02 ` John D. Ramsdell
2007-07-30 15:03 ` Miloslav Trmac
0 siblings, 1 reply; 11+ messages in thread
From: John D. Ramsdell @ 2007-07-30 15:02 UTC (permalink / raw)
To: Miloslav Trmac; +Cc: linux-audit
Miloslav Trmac <mitr@redhat.com> writes:
...
> system-config-audit.lang is generated by %install when building the rpm,
> and should not be in the tarball at all.
...
> A better solution is to change s-c-audit/autogen.sh (and to distribute
> the autogen.sh files):
I changed audit/system-config-audit/autogen.sh as you suggested, but
the tarball created with "make dist" contains no .m4 files. To see
what is being left out, I have been doing the following diff. let
grubb-audit-1.5.6.tar.gz be the source tarball created by Steve, and
ramsdell-audit-1.5.6.tar.gz be the one currently being created by my
patched version with "make dist".
$ tar tzf grubb-audit-1.5.6.tar.gz | sort > a.txt
$ tar tzf ramsdell-audit-1.5.6.tar.gz | sort > c.txt
$ diff -u a.txt c.txt > ac.diff
I have enclosed ac.diff. Notice the new_audispd directory is left out
because it is not built by the current release.
John
--- /home/ramsdell/a.txt 2007-07-30 07:51:13.000000000 -0400
+++ c.txt 2007-07-30 10:48:58.000000000 -0400
@@ -1,7 +1,9 @@
audit-1.5.6/
+audit-1.5.6/aclocal.m4
audit-1.5.6/audisp/
audit-1.5.6/audisp/audispd.c
audit-1.5.6/audisp/Makefile.am
+audit-1.5.6/audisp/Makefile.in
audit-1.5.6/audit.spec
audit-1.5.6/auparse/
audit-1.5.6/auparse/auditd-config.c
@@ -22,6 +24,7 @@
audit-1.5.6/auparse/interpret.h
audit-1.5.6/auparse/ipctab.h
audit-1.5.6/auparse/Makefile.am
+audit-1.5.6/auparse/Makefile.in
audit-1.5.6/auparse/message.c
audit-1.5.6/auparse/nvlist.c
audit-1.5.6/auparse/nvlist.h
@@ -39,24 +42,22 @@
audit-1.5.6/auparse/test/auparse_test.ref
audit-1.5.6/auparse/test/Makefile.am
audit-1.5.6/auparse/test/Makefile.in
-audit-1.5.6/auparse/test/test2.log
-audit-1.5.6/auparse/test/test.log
-audit-1.5.6/auparse/test/tmp
-audit-1.5.6/auparse/test/tmp1
-audit-1.5.6/auparse/test/tmp2
audit-1.5.6/auparse/typetab.h
audit-1.5.6/AUTHORS
-audit-1.5.6/autogen.sh
audit-1.5.6/bindings/
audit-1.5.6/bindings/Makefile.am
+audit-1.5.6/bindings/Makefile.in
audit-1.5.6/bindings/python/
audit-1.5.6/bindings/python/auparse_python.c
audit-1.5.6/bindings/python/Makefile.am
+audit-1.5.6/bindings/python/Makefile.in
audit-1.5.6/bindings/python/setup.py
audit-1.5.6/ChangeLog
audit-1.5.6/compile
audit-1.5.6/config.guess
+audit-1.5.6/config.h.in
audit-1.5.6/config.sub
+audit-1.5.6/configure
audit-1.5.6/configure.ac
audit-1.5.6/contrib/
audit-1.5.6/contrib/avc_snap
@@ -131,6 +132,7 @@
audit-1.5.6/docs/autrace.8
audit-1.5.6/docs/get_auditfail_action.3
audit-1.5.6/docs/Makefile.am
+audit-1.5.6/docs/Makefile.in
audit-1.5.6/docs/set_aumessage_mode.3
audit-1.5.6/init.d/
audit-1.5.6/init.d/audispd.conf
@@ -141,6 +143,7 @@
audit-1.5.6/init.d/audit.rules
audit-1.5.6/init.d/libaudit.conf
audit-1.5.6/init.d/Makefile.am
+audit-1.5.6/init.d/Makefile.in
audit-1.5.6/INSTALL
audit-1.5.6/install-sh
audit-1.5.6/lib/
@@ -157,6 +160,7 @@
audit-1.5.6/lib/lookup_table.c
audit-1.5.6/lib/machinetab.h
audit-1.5.6/lib/Makefile.am
+audit-1.5.6/lib/Makefile.in
audit-1.5.6/lib/message.c
audit-1.5.6/lib/msg_typetab.h
audit-1.5.6/lib/netlink.c
@@ -168,24 +172,8 @@
audit-1.5.6/lib/x86_64_table.h
audit-1.5.6/ltmain.sh
audit-1.5.6/Makefile.am
+audit-1.5.6/Makefile.in
audit-1.5.6/missing
-audit-1.5.6/new_audispd/
-audit-1.5.6/new_audispd/audispd-builtins.c
-audit-1.5.6/new_audispd/audispd-builtins.h
-audit-1.5.6/new_audispd/audispd.c
-audit-1.5.6/new_audispd/audispd-config.c
-audit-1.5.6/new_audispd/audispd-config.h
-audit-1.5.6/new_audispd/audispd-llist.c
-audit-1.5.6/new_audispd/audispd-llist.h
-audit-1.5.6/new_audispd/audispd-pconfig.c
-audit-1.5.6/new_audispd/audispd-pconfig.h
-audit-1.5.6/new_audispd/configs/
-audit-1.5.6/new_audispd/configs/af_unix.conf
-audit-1.5.6/new_audispd/configs/Makefile.am
-audit-1.5.6/new_audispd/configs/syslog.conf
-audit-1.5.6/new_audispd/Makefile.am
-audit-1.5.6/new_audispd/queue.c
-audit-1.5.6/new_audispd/queue.h
audit-1.5.6/NEWS
audit-1.5.6/py-compile
audit-1.5.6/README
@@ -235,11 +223,23 @@
audit-1.5.6/src/autrace.c
audit-1.5.6/src/delete_all.c
audit-1.5.6/src/Makefile.am
+audit-1.5.6/src/Makefile.in
audit-1.5.6/src/mt/
+audit-1.5.6/src/mt/audit_logging.c
+audit-1.5.6/src/mt/deprecated.c
+audit-1.5.6/src/mt/libaudit.c
+audit-1.5.6/src/mt/libaudit.h
+audit-1.5.6/src/mt/lookup_table.c
audit-1.5.6/src/mt/Makefile.am
+audit-1.5.6/src/mt/Makefile.in
+audit-1.5.6/src/mt/message.c
+audit-1.5.6/src/mt/netlink.c
+audit-1.5.6/src/mt/private.h
audit-1.5.6/swig/
+audit-1.5.6/swig/audit.py
audit-1.5.6/swig/auditswig.i
audit-1.5.6/swig/Makefile.am
+audit-1.5.6/swig/Makefile.in
audit-1.5.6/system-config-audit/
audit-1.5.6/system-config-audit/ABOUT-NLS
audit-1.5.6/system-config-audit/aclocal.m4
@@ -261,69 +261,21 @@
audit-1.5.6/system-config-audit/admin/system-config-audit-server.pam
audit-1.5.6/system-config-audit/AUTHORS
audit-1.5.6/system-config-audit/autogen.sh
-audit-1.5.6/system-config-audit/autom4te.cache/
-audit-1.5.6/system-config-audit/autom4te.cache/output.0
-audit-1.5.6/system-config-audit/autom4te.cache/requests
-audit-1.5.6/system-config-audit/autom4te.cache/traces.0
audit-1.5.6/system-config-audit/ChangeLog
audit-1.5.6/system-config-audit/configure
audit-1.5.6/system-config-audit/configure.ac
audit-1.5.6/system-config-audit/COPYING
audit-1.5.6/system-config-audit/INSTALL
-audit-1.5.6/system-config-audit.lang
-audit-1.5.6/system-config-audit/m4/
-audit-1.5.6/system-config-audit/m4/codeset.m4
-audit-1.5.6/system-config-audit/m4/gettext.m4
-audit-1.5.6/system-config-audit/m4/glibc21.m4
-audit-1.5.6/system-config-audit/m4/glibc2.m4
-audit-1.5.6/system-config-audit/m4/iconv.m4
-audit-1.5.6/system-config-audit/m4/intdiv0.m4
-audit-1.5.6/system-config-audit/m4/intldir.m4
-audit-1.5.6/system-config-audit/m4/intl.m4
-audit-1.5.6/system-config-audit/m4/intmax.m4
-audit-1.5.6/system-config-audit/m4/inttypes_h.m4
-audit-1.5.6/system-config-audit/m4/inttypes.m4
-audit-1.5.6/system-config-audit/m4/inttypes-pri.m4
-audit-1.5.6/system-config-audit/m4/isc-posix.m4
-audit-1.5.6/system-config-audit/m4/lcmessage.m4
-audit-1.5.6/system-config-audit/m4/lib-ld.m4
-audit-1.5.6/system-config-audit/m4/lib-link.m4
-audit-1.5.6/system-config-audit/m4/lib-prefix.m4
-audit-1.5.6/system-config-audit/m4/lock.m4
-audit-1.5.6/system-config-audit/m4/longdouble.m4
-audit-1.5.6/system-config-audit/m4/longlong.m4
-audit-1.5.6/system-config-audit/m4/nls.m4
-audit-1.5.6/system-config-audit/m4/po.m4
-audit-1.5.6/system-config-audit/m4/printf-posix.m4
-audit-1.5.6/system-config-audit/m4/progtest.m4
-audit-1.5.6/system-config-audit/m4/signed.m4
-audit-1.5.6/system-config-audit/m4/size_max.m4
-audit-1.5.6/system-config-audit/m4/stdint_h.m4
-audit-1.5.6/system-config-audit/m4/uintmax_t.m4
-audit-1.5.6/system-config-audit/m4/ulonglong.m4
-audit-1.5.6/system-config-audit/m4/visibility.m4
-audit-1.5.6/system-config-audit/m4/wchar_t.m4
-audit-1.5.6/system-config-audit/m4/wint_t.m4
-audit-1.5.6/system-config-audit/m4/xsize.m4
audit-1.5.6/system-config-audit/Makefile.am
audit-1.5.6/system-config-audit/Makefile.in
audit-1.5.6/system-config-audit/NEWS
audit-1.5.6/system-config-audit/po/
-audit-1.5.6/system-config-audit/po/boldquot.sed
audit-1.5.6/system-config-audit/po/ChangeLog
audit-1.5.6/system-config-audit/po/cs.po
-audit-1.5.6/system-config-audit/po/en@boldquot.header
-audit-1.5.6/system-config-audit/po/en@quot.header
-audit-1.5.6/system-config-audit/po/insert-header.sin
audit-1.5.6/system-config-audit/po/LINGUAS
audit-1.5.6/system-config-audit/po/Makefile.in.in
audit-1.5.6/system-config-audit/po/Makevars
-audit-1.5.6/system-config-audit/po/Makevars.template
audit-1.5.6/system-config-audit/po/POTFILES.in
-audit-1.5.6/system-config-audit/po/quot.sed
-audit-1.5.6/system-config-audit/po/remove-potcdate.sin
-audit-1.5.6/system-config-audit/po/Rules-quot
-audit-1.5.6/system-config-audit/po/stamp-po
audit-1.5.6/system-config-audit/README
audit-1.5.6/system-config-audit/src/
audit-1.5.6/system-config-audit/src/auditd_config.py
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dist target fixes
2007-07-30 15:02 ` John D. Ramsdell
@ 2007-07-30 15:03 ` Miloslav Trmac
2007-07-30 15:11 ` John D. Ramsdell
0 siblings, 1 reply; 11+ messages in thread
From: Miloslav Trmac @ 2007-07-30 15:03 UTC (permalink / raw)
To: John D. Ramsdell; +Cc: linux-audit
John D. Ramsdell napsal(a):
> I changed audit/system-config-audit/autogen.sh as you suggested, but
> the tarball created with "make dist" contains no .m4 files.
Have you executed the new autogen.sh? What automake version to you use?
Mirek
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dist target fixes
2007-07-30 15:03 ` Miloslav Trmac
@ 2007-07-30 15:11 ` John D. Ramsdell
2007-07-30 15:19 ` Miloslav Trmac
0 siblings, 1 reply; 11+ messages in thread
From: John D. Ramsdell @ 2007-07-30 15:11 UTC (permalink / raw)
To: Miloslav Trmac; +Cc: linux-audit
Miloslav Trmac <mitr@redhat.com> writes:
> Have you executed the new autogen.sh?
Between changes, I've been performing:
$ aclocal && autoconf && autoheader && automake
$ ./configure
$ make dist
The first line is from audit.spec, so I assume it is correct.
> What automake version to you use?
1.10. It's a freshly updated Fedora 7 system.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dist target fixes
2007-07-30 15:11 ` John D. Ramsdell
@ 2007-07-30 15:19 ` Miloslav Trmac
2007-07-30 17:08 ` John D. Ramsdell
2007-07-30 17:33 ` John D. Ramsdell
0 siblings, 2 replies; 11+ messages in thread
From: Miloslav Trmac @ 2007-07-30 15:19 UTC (permalink / raw)
To: John D. Ramsdell; +Cc: linux-audit
John D. Ramsdell napsal(a):
> Miloslav Trmac <mitr@redhat.com> writes:
>
>> Have you executed the new autogen.sh?
>
> Between changes, I've been performing:
>
> $ aclocal && autoconf && autoheader && automake
> $ ./configure
> $ make dist
>
> The first line is from audit.spec, so I assume it is correct.
Use the top-level autogen.sh instead, please. The line in audit.spec
only regenerates the "audit" files, not the files in
system-config-audit. (It was added to the spec file to regenerate
"audit" files after applying a patch.)
Mirek
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dist target fixes
2007-07-30 15:19 ` Miloslav Trmac
@ 2007-07-30 17:08 ` John D. Ramsdell
2007-07-30 17:12 ` Miloslav Trmac
2007-07-30 17:33 ` John D. Ramsdell
1 sibling, 1 reply; 11+ messages in thread
From: John D. Ramsdell @ 2007-07-30 17:08 UTC (permalink / raw)
To: Miloslav Trmac; +Cc: linux-audit
Miloslav Trmac <mitr@redhat.com> writes:
> Use the top-level autogen.sh instead, please.
This worked, and I notice that with the changes to
system-config-audit/autogen.sh you suggested earlier, fewer M4 files
are placed in the distribution. I also notice quite a few warning
messages.
[ramsdell@goo audit-1.5.6]$ ./autogen.sh
+ autoreconf -fv --install
autoreconf: Entering directory `.'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force
autoreconf: configure.ac: tracing
autoreconf: configure.ac: adding subdirectory system-config-audit to autoreconf
autoreconf: Entering directory `system-config-audit'
autoreconf: running: autopoint --force
Copying file po/Makefile.in.in
autoreconf: running: aclocal --force -I m4
autoreconf: running: libtoolize --copy --force
Putting files in AC_CONFIG_AUX_DIR, `admin'.
autoreconf: running: /usr/bin/autoconf --force
autoreconf: running: /usr/bin/autoheader --force
autoreconf: running: automake --add-missing --copy --force-missing
autoreconf: Leaving directory `system-config-audit'
autoreconf: Leaving directory `.'
+ cd system-config-audit
+ ./autogen.sh
+ autopoint -f
Copying file admin/mkinstalldirs
+ ln -s ../po admin/po
+ intltoolize --force
You should update your 'aclocal.m4' by running aclocal.
Putting files in AC_CONFIG_AUX_DIR, 'admin'.
+ rm admin/po
+ aclocal -I m4
+ autoconf -Wall
configure.ac:23: warning: The macro `AC_FOREACH' is obsolete.
configure.ac:23: You should run autoupdate.
../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from...
aclocal.m4:7301: _AM_SET_OPTIONS is expanded from...
aclocal.m4:6994: AM_INIT_AUTOMAKE is expanded from...
configure.ac:23: the top level
configure.ac:31: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:31: You should run autoupdate.
../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from...
aclocal.m4:22: IT_PROG_INTLTOOL is expanded from...
configure.ac:31: the top level
configure.ac:32: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:32: You should run autoupdate.
../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from...
aclocal.m4:2181: AC_ENABLE_STATIC is expanded from...
aclocal.m4:2210: AC_DISABLE_STATIC is expanded from...
configure.ac:32: the top level
configure.ac:33: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:33: You should run autoupdate.
aclocal.m4:2142: AC_ENABLE_SHARED is expanded from...
aclocal.m4:296: AC_LIBTOOL_SETUP is expanded from...
aclocal.m4:276: _AC_PROG_LIBTOOL is expanded from...
aclocal.m4:241: AC_PROG_LIBTOOL is expanded from...
configure.ac:33: the top level
aclocal.m4:2220: AC_ENABLE_FAST_INSTALL is expanded from...
../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from...
aclocal.m4:2361: AC_PROG_LD is expanded from...
configure.ac:33: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:33: You should run autoupdate.
../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from...
../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from...
../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from...
aclocal.m4:685: _LT_AC_LOCK is expanded from...
aclocal.m4:1289: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from...
aclocal.m4:2884: _LT_AC_LANG_C_CONFIG is expanded from...
aclocal.m4:2883: AC_LIBTOOL_LANG_C_CONFIG is expanded from...
aclocal.m4:2020: _LT_AC_TAGCONFIG is expanded from...
configure.ac:33: warning: back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists
configure.ac:33: warning: back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists
configure.ac:33: warning: The macro `AC_LANG_SAVE' is obsolete.
configure.ac:33: You should run autoupdate.
../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from...
aclocal.m4:4226: _LT_AC_LANG_GCJ_CONFIG is expanded from...
aclocal.m4:4225: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
configure.ac:33: warning: The macro `AC_LANG_RESTORE' is obsolete.
configure.ac:33: You should run autoupdate.
../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from...
aclocal.m4:4282: _LT_AC_LANG_RC_CONFIG is expanded from...
aclocal.m4:4281: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
configure.ac:36: warning: The macro `AC_OUTPUT_COMMANDS' is obsolete.
configure.ac:36: You should run autoupdate.
../../lib/autoconf/status.m4:848: AC_OUTPUT_COMMANDS is expanded from...
m4/po.m4:23: AM_PO_SUBDIRS is expanded from...
m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
configure.ac:36: the top level
configure.ac:36: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:36: You should run autoupdate.
m4/gettext.m4:486: gt_INTL_MACOSX is expanded from...
m4/iconv.m4:20: AM_ICONV_LINK is expanded from...
+ autoheader -Wall
+ automake -Wall --add-missing
[ramsdell@goo audit-1.5.6]$
...
[ramsdell@goo audit-1.5.6]$ cat ac.diff
--- /home/ramsdell/a.txt 2007-07-30 07:51:13.000000000 -0400
+++ c.txt 2007-07-30 12:59:59.000000000 -0400
@@ -1,7 +1,9 @@
audit-1.5.6/
+audit-1.5.6/aclocal.m4
audit-1.5.6/audisp/
audit-1.5.6/audisp/audispd.c
audit-1.5.6/audisp/Makefile.am
+audit-1.5.6/audisp/Makefile.in
audit-1.5.6/audit.spec
audit-1.5.6/auparse/
audit-1.5.6/auparse/auditd-config.c
@@ -22,6 +24,7 @@
audit-1.5.6/auparse/interpret.h
audit-1.5.6/auparse/ipctab.h
audit-1.5.6/auparse/Makefile.am
+audit-1.5.6/auparse/Makefile.in
audit-1.5.6/auparse/message.c
audit-1.5.6/auparse/nvlist.c
audit-1.5.6/auparse/nvlist.h
@@ -39,24 +42,22 @@
audit-1.5.6/auparse/test/auparse_test.ref
audit-1.5.6/auparse/test/Makefile.am
audit-1.5.6/auparse/test/Makefile.in
-audit-1.5.6/auparse/test/test2.log
-audit-1.5.6/auparse/test/test.log
-audit-1.5.6/auparse/test/tmp
-audit-1.5.6/auparse/test/tmp1
-audit-1.5.6/auparse/test/tmp2
audit-1.5.6/auparse/typetab.h
audit-1.5.6/AUTHORS
-audit-1.5.6/autogen.sh
audit-1.5.6/bindings/
audit-1.5.6/bindings/Makefile.am
+audit-1.5.6/bindings/Makefile.in
audit-1.5.6/bindings/python/
audit-1.5.6/bindings/python/auparse_python.c
audit-1.5.6/bindings/python/Makefile.am
+audit-1.5.6/bindings/python/Makefile.in
audit-1.5.6/bindings/python/setup.py
audit-1.5.6/ChangeLog
audit-1.5.6/compile
audit-1.5.6/config.guess
+audit-1.5.6/config.h.in
audit-1.5.6/config.sub
+audit-1.5.6/configure
audit-1.5.6/configure.ac
audit-1.5.6/contrib/
audit-1.5.6/contrib/avc_snap
@@ -131,6 +132,7 @@
audit-1.5.6/docs/autrace.8
audit-1.5.6/docs/get_auditfail_action.3
audit-1.5.6/docs/Makefile.am
+audit-1.5.6/docs/Makefile.in
audit-1.5.6/docs/set_aumessage_mode.3
audit-1.5.6/init.d/
audit-1.5.6/init.d/audispd.conf
@@ -141,6 +143,7 @@
audit-1.5.6/init.d/audit.rules
audit-1.5.6/init.d/libaudit.conf
audit-1.5.6/init.d/Makefile.am
+audit-1.5.6/init.d/Makefile.in
audit-1.5.6/INSTALL
audit-1.5.6/install-sh
audit-1.5.6/lib/
@@ -157,6 +160,7 @@
audit-1.5.6/lib/lookup_table.c
audit-1.5.6/lib/machinetab.h
audit-1.5.6/lib/Makefile.am
+audit-1.5.6/lib/Makefile.in
audit-1.5.6/lib/message.c
audit-1.5.6/lib/msg_typetab.h
audit-1.5.6/lib/netlink.c
@@ -168,24 +172,8 @@
audit-1.5.6/lib/x86_64_table.h
audit-1.5.6/ltmain.sh
audit-1.5.6/Makefile.am
+audit-1.5.6/Makefile.in
audit-1.5.6/missing
-audit-1.5.6/new_audispd/
-audit-1.5.6/new_audispd/audispd-builtins.c
-audit-1.5.6/new_audispd/audispd-builtins.h
-audit-1.5.6/new_audispd/audispd.c
-audit-1.5.6/new_audispd/audispd-config.c
-audit-1.5.6/new_audispd/audispd-config.h
-audit-1.5.6/new_audispd/audispd-llist.c
-audit-1.5.6/new_audispd/audispd-llist.h
-audit-1.5.6/new_audispd/audispd-pconfig.c
-audit-1.5.6/new_audispd/audispd-pconfig.h
-audit-1.5.6/new_audispd/configs/
-audit-1.5.6/new_audispd/configs/af_unix.conf
-audit-1.5.6/new_audispd/configs/Makefile.am
-audit-1.5.6/new_audispd/configs/syslog.conf
-audit-1.5.6/new_audispd/Makefile.am
-audit-1.5.6/new_audispd/queue.c
-audit-1.5.6/new_audispd/queue.h
audit-1.5.6/NEWS
audit-1.5.6/py-compile
audit-1.5.6/README
@@ -235,11 +223,23 @@
audit-1.5.6/src/autrace.c
audit-1.5.6/src/delete_all.c
audit-1.5.6/src/Makefile.am
+audit-1.5.6/src/Makefile.in
audit-1.5.6/src/mt/
+audit-1.5.6/src/mt/audit_logging.c
+audit-1.5.6/src/mt/deprecated.c
+audit-1.5.6/src/mt/libaudit.c
+audit-1.5.6/src/mt/libaudit.h
+audit-1.5.6/src/mt/lookup_table.c
audit-1.5.6/src/mt/Makefile.am
+audit-1.5.6/src/mt/Makefile.in
+audit-1.5.6/src/mt/message.c
+audit-1.5.6/src/mt/netlink.c
+audit-1.5.6/src/mt/private.h
audit-1.5.6/swig/
+audit-1.5.6/swig/audit.py
audit-1.5.6/swig/auditswig.i
audit-1.5.6/swig/Makefile.am
+audit-1.5.6/swig/Makefile.in
audit-1.5.6/system-config-audit/
audit-1.5.6/system-config-audit/ABOUT-NLS
audit-1.5.6/system-config-audit/aclocal.m4
@@ -261,69 +261,30 @@
audit-1.5.6/system-config-audit/admin/system-config-audit-server.pam
audit-1.5.6/system-config-audit/AUTHORS
audit-1.5.6/system-config-audit/autogen.sh
-audit-1.5.6/system-config-audit/autom4te.cache/
-audit-1.5.6/system-config-audit/autom4te.cache/output.0
-audit-1.5.6/system-config-audit/autom4te.cache/requests
-audit-1.5.6/system-config-audit/autom4te.cache/traces.0
audit-1.5.6/system-config-audit/ChangeLog
audit-1.5.6/system-config-audit/configure
audit-1.5.6/system-config-audit/configure.ac
audit-1.5.6/system-config-audit/COPYING
audit-1.5.6/system-config-audit/INSTALL
-audit-1.5.6/system-config-audit.lang
audit-1.5.6/system-config-audit/m4/
-audit-1.5.6/system-config-audit/m4/codeset.m4
audit-1.5.6/system-config-audit/m4/gettext.m4
-audit-1.5.6/system-config-audit/m4/glibc21.m4
-audit-1.5.6/system-config-audit/m4/glibc2.m4
audit-1.5.6/system-config-audit/m4/iconv.m4
-audit-1.5.6/system-config-audit/m4/intdiv0.m4
-audit-1.5.6/system-config-audit/m4/intldir.m4
-audit-1.5.6/system-config-audit/m4/intl.m4
-audit-1.5.6/system-config-audit/m4/intmax.m4
-audit-1.5.6/system-config-audit/m4/inttypes_h.m4
-audit-1.5.6/system-config-audit/m4/inttypes.m4
-audit-1.5.6/system-config-audit/m4/inttypes-pri.m4
-audit-1.5.6/system-config-audit/m4/isc-posix.m4
-audit-1.5.6/system-config-audit/m4/lcmessage.m4
audit-1.5.6/system-config-audit/m4/lib-ld.m4
audit-1.5.6/system-config-audit/m4/lib-link.m4
audit-1.5.6/system-config-audit/m4/lib-prefix.m4
-audit-1.5.6/system-config-audit/m4/lock.m4
-audit-1.5.6/system-config-audit/m4/longdouble.m4
-audit-1.5.6/system-config-audit/m4/longlong.m4
audit-1.5.6/system-config-audit/m4/nls.m4
audit-1.5.6/system-config-audit/m4/po.m4
-audit-1.5.6/system-config-audit/m4/printf-posix.m4
audit-1.5.6/system-config-audit/m4/progtest.m4
-audit-1.5.6/system-config-audit/m4/signed.m4
-audit-1.5.6/system-config-audit/m4/size_max.m4
-audit-1.5.6/system-config-audit/m4/stdint_h.m4
-audit-1.5.6/system-config-audit/m4/uintmax_t.m4
-audit-1.5.6/system-config-audit/m4/ulonglong.m4
-audit-1.5.6/system-config-audit/m4/visibility.m4
-audit-1.5.6/system-config-audit/m4/wchar_t.m4
-audit-1.5.6/system-config-audit/m4/wint_t.m4
-audit-1.5.6/system-config-audit/m4/xsize.m4
audit-1.5.6/system-config-audit/Makefile.am
audit-1.5.6/system-config-audit/Makefile.in
audit-1.5.6/system-config-audit/NEWS
audit-1.5.6/system-config-audit/po/
-audit-1.5.6/system-config-audit/po/boldquot.sed
audit-1.5.6/system-config-audit/po/ChangeLog
audit-1.5.6/system-config-audit/po/cs.po
-audit-1.5.6/system-config-audit/po/en@boldquot.header
-audit-1.5.6/system-config-audit/po/en@quot.header
-audit-1.5.6/system-config-audit/po/insert-header.sin
audit-1.5.6/system-config-audit/po/LINGUAS
audit-1.5.6/system-config-audit/po/Makefile.in.in
audit-1.5.6/system-config-audit/po/Makevars
-audit-1.5.6/system-config-audit/po/Makevars.template
audit-1.5.6/system-config-audit/po/POTFILES.in
-audit-1.5.6/system-config-audit/po/quot.sed
-audit-1.5.6/system-config-audit/po/remove-potcdate.sin
-audit-1.5.6/system-config-audit/po/Rules-quot
-audit-1.5.6/system-config-audit/po/stamp-po
audit-1.5.6/system-config-audit/README
audit-1.5.6/system-config-audit/src/
audit-1.5.6/system-config-audit/src/auditd_config.py
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dist target fixes
2007-07-30 17:08 ` John D. Ramsdell
@ 2007-07-30 17:12 ` Miloslav Trmac
0 siblings, 0 replies; 11+ messages in thread
From: Miloslav Trmac @ 2007-07-30 17:12 UTC (permalink / raw)
To: John D. Ramsdell; +Cc: linux-audit
John D. Ramsdell napsal(a):
> Miloslav Trmac <mitr@redhat.com> writes:
>> Use the top-level autogen.sh instead, please.
>
> This worked, and I notice that with the changes to
> system-config-audit/autogen.sh you suggested earlier, fewer M4 files
> are placed in the distribution.
That is expected.
> I also notice quite a few warning messages.
Most are caused by the macros supplied by gettext and libtool, which use
obsolete constructs to be compatible with older autotools. I'm afraid
there is no way to avoid them, they can only be surpressed using -Wnone.
Mirek
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dist target fixes
2007-07-30 15:19 ` Miloslav Trmac
2007-07-30 17:08 ` John D. Ramsdell
@ 2007-07-30 17:33 ` John D. Ramsdell
2007-08-03 14:11 ` [PATCH] dist target fixes with Mirek's improvements John D. Ramsdell
1 sibling, 1 reply; 11+ messages in thread
From: John D. Ramsdell @ 2007-07-30 17:33 UTC (permalink / raw)
To: Miloslav Trmac; +Cc: linux-audit
Miloslav Trmac <mitr@redhat.com> writes:
> Use the top-level autogen.sh instead, please.
I think I've gotten myself in over my head. I tried to create a new
dist target fixes patch, but the patch is huge. Running the top-level
autogen.sh results in differences in a large number of derived files.
I suppose I could trim it by hand.
John
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dist target fixes with Mirek's improvements
2007-07-30 17:33 ` John D. Ramsdell
@ 2007-08-03 14:11 ` John D. Ramsdell
0 siblings, 0 replies; 11+ messages in thread
From: John D. Ramsdell @ 2007-08-03 14:11 UTC (permalink / raw)
To: sgrubb, Miloslav Trmac; +Cc: linux-audit
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 <faith@redhat.com>
#
-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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dist target fixes
2007-07-30 12:09 [PATCH] dist target fixes John D. Ramsdell
2007-07-30 14:32 ` Miloslav Trmac
@ 2007-08-27 20:19 ` Steve Grubb
1 sibling, 0 replies; 11+ messages in thread
From: Steve Grubb @ 2007-08-27 20:19 UTC (permalink / raw)
To: John D. Ramsdell; +Cc: linux-audit
On Monday 30 July 2007 08:09:40 John D. Ramsdell wrote:
> I discovered a few more files that are being mistakenly omitted when
> using the dist target.
I partially merged this patch. There may be 1 or 2 items deferred. Thanks!
-Steve
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2007-08-27 20:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-30 12:09 [PATCH] dist target fixes John D. Ramsdell
2007-07-30 14:32 ` Miloslav Trmac
2007-07-30 15:02 ` John D. Ramsdell
2007-07-30 15:03 ` Miloslav Trmac
2007-07-30 15:11 ` John D. Ramsdell
2007-07-30 15:19 ` Miloslav Trmac
2007-07-30 17:08 ` John D. Ramsdell
2007-07-30 17:12 ` Miloslav Trmac
2007-07-30 17:33 ` John D. Ramsdell
2007-08-03 14:11 ` [PATCH] dist target fixes with Mirek's improvements John D. Ramsdell
2007-08-27 20:19 ` [PATCH] dist target fixes Steve Grubb
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.