mcst-linux-kernel/patches-2024.06.26/aide-0.15/0001-Add-installing-of-conf...

116 lines
3.6 KiB
Diff

Link:
Subject: add installing of conf file
Tags: common
--- a/doc/Makefile.in 2010-08-08 21:44:00.000000000 +0400
+++ b/doc/Makefile.in 2020-09-25 11:58:19.695338770 +0300
@@ -66,6 +66,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = aide.conf aide.1 aide.conf.5
CONFIG_CLEAN_VPATH_FILES =
+CONFIG_FILES = aide.conf
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -90,11 +91,11 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(sysconfdir)"
man5dir = $(mandir)/man5
NROFF = nroff
MANS = $(man_MANS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(CONFIG_CLEAN_FILES)
ACLLIB = @ACLLIB@
ACLOCAL = @ACLOCAL@
AIDE_DEFS = @AIDE_DEFS@
@@ -330,6 +331,19 @@
test -z "$$files" || { \
echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
+
+install-conf: $(CONFIG_FILES)
+ @$(NORMAL_INSTALL)
+ test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+ @list=''; test -n "$(sysconfdir)" || exit 0; \
+ { for i in $$list; do echo "$$i"; done; \
+ l2='$(CONFIG_FILES)'; for i in $$l2; do echo "$$i"; done | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; }; \
+ done; }
+
tags: TAGS
TAGS:
@@ -382,9 +396,9 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(MANS)
+all-am: Makefile $(MANS) $(CONFIG_FILES)
installdirs:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
+ for dir in $(am__installdirs); do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -433,7 +447,7 @@
info-am:
-install-data-am: install-man
+install-data-am: install-man install-conf
install-dvi: install-dvi-am
--- a/doc/aide.conf.in 2010-08-01 22:23:44.000000000 +0400
+++ b/doc/aide.conf.in 2020-09-25 11:58:19.695338770 +0300
@@ -19,7 +19,7 @@
# corresponding line.
#
-@@define TOPDIR @abs_top_srcdir@
+@@define TOPDIR @prefix@
@@ifndef TOPDIR
@@define TOPDIR /
@@ -48,7 +48,7 @@
# The location of the database to be written.
#database_out=sql:host:port:database:login_name:passwd:table
#database_out=file:aide.db.new
-database_out=file:aide.db.new
+database_out=file:@@{TOPDIR}/doc/aide.db.new
# Whether to gzip the output to database
# gzip_dbout=no
@@ -103,7 +103,8 @@
#e2fsattrs: file attributes on a second extended file system
# Rule definition
-All=R+a+sha1+rmd160+sha256+sha512+tiger@aideextragroups@
+##All=R+a+sha1+rmd160+sha256+sha512+tiger@aideextragroups@
+Our=R+a
# report_attributes is a special rule definition
# the attributes listed in it are alway displayed for changed files
@@ -118,13 +119,13 @@
# Attributes that can be used to verify that aide in intact
# by people that have downloaded it from the web.
# Let's be paranoid
-Norm=l+s+n+b+md5+sha1+rmd160+sha256+sha512+tiger@aideextragroups@
+##Norm=l+s+n+b+md5+sha1+rmd160+sha256+sha512+tiger@aideextragroups@
# The commented rules are just examples the rest are used by
# make check
#Selection regexp rule
-@@{TOPDIR}/.* Norm
+@@{TOPDIR}/.* Our
#Equals selection only the directory doc is checked and not it's children
#=@@{TOPDIR}/doc L
#Negative selection no rule is necessary but ignored if there