Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aide for openSUSE:Factory checked in
at 2024-08-16 12:23:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aide (Old)
and /work/SRC/openSUSE:Factory/.aide.new.2698 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aide"
Fri Aug 16 12:23:58 2024 rev:43 rq:1194143 version:0.18.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/aide/aide.changes 2024-02-21
17:55:37.581588430 +0100
+++ /work/SRC/openSUSE:Factory/.aide.new.2698/aide.changes 2024-08-16
12:24:32.617260449 +0200
@@ -1,0 +2,16 @@
+Sun Aug 11 12:55:40 UTC 2024 - Aeneas JaiÃle <a...@ajaissle.de>
+
+- Update to 0.18.8:
+ * Fix concurrent reading of extended attributes (xattrs)
+ * Raise warning if both input databases are the same
+
+- Update to 0.18.7:
+ * Add missing library CFLAGS
+ * Fix typo in aide.conf manual page
+ * Fix 64-bit time_t on 32-bit architectures
+ * Fix debug logging for returned attributes
+ * Fix condition for error message of failing to open gzipped files
+
+- rebased aide-0.18-as-needed.patch
+
+-------------------------------------------------------------------
Old:
----
aide-0.18.6.tar.gz
aide-0.18.6.tar.gz.asc
New:
----
aide-0.18.8.tar.gz
aide-0.18.8.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aide.spec ++++++
--- /var/tmp/diff_new_pack.VNLqiS/_old 2024-08-16 12:24:33.409293366 +0200
+++ /var/tmp/diff_new_pack.VNLqiS/_new 2024-08-16 12:24:33.409293366 +0200
@@ -17,7 +17,7 @@
Name: aide
-Version: 0.18.6
+Version: 0.18.8
Release: 0
Summary: Advanced Intrusion Detection Environment
License: GPL-2.0-or-later
++++++ aide-0.18-as-needed.patch ++++++
--- /var/tmp/diff_new_pack.VNLqiS/_old 2024-08-16 12:24:33.441294695 +0200
+++ /var/tmp/diff_new_pack.VNLqiS/_new 2024-08-16 12:24:33.445294862 +0200
@@ -1,14 +1,12 @@
-Index: aide-0.18.3/Makefile.am
-===================================================================
---- aide-0.18.3.orig/Makefile.am
-+++ aide-0.18.3/Makefile.am
-@@ -65,7 +65,7 @@ aide_SOURCES += include/fopen.h src/fope
- endif
-
- aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g ${PTHREAD_CFLAGS}
--aide_LDADD = -lm ${PCRE2_LIBS} ${ZLIB_LIBS} ${MHASH_LIBS} ${GCRYPT_LIBS}
${POSIX_ACL_LIBS} ${SELINUX_LIBS} ${AUDIT_LIBS} ${XATTR_LIBS} ${ELF_LIBS}
${E2FSATTRS_LIBS} ${CAPABILITIES_LIBS} ${CURL_LIBS} ${PTHREAD_LIBS}
-+aide_LDADD = -lm ${LDFLAGS} ${PCRE2_LIBS} ${ZLIB_LIBS} ${MHASH_LIBS}
${GCRYPT_LIBS} ${POSIX_ACL_LIBS} ${SELINUX_LIBS} ${AUDIT_LIBS} ${XATTR_LIBS}
${ELF_LIBS} ${E2FSATTRS_LIBS} ${CAPABILITIES_LIBS} ${CURL_LIBS} ${PTHREAD_LIBS}
-
- if HAVE_CHECK
- TESTS = check_aide
+diff -Ppru aide-0.18.8.orig/Makefile.am aide-0.18.8/Makefile.am
+--- aide-0.18.8.orig/Makefile.am 2024-05-04 11:51:05.000000000 +0200
++++ aide-0.18.8/Makefile.am 2024-08-11 16:07:45.957348909 +0200
+@@ -79,6 +79,7 @@ aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g \
+ ${XATTR_CFLAGS} \
+ ${ZLIB_CFLAGS}
+ aide_LDADD = -lm \
++ ${LDFLAGS} \
+ ${AUDIT_LIBS} \
+ ${CAPABILITIES_LIBS} \
+ ${CURL_LIBS} \
++++++ aide-0.18.6.tar.gz -> aide-0.18.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/ChangeLog new/aide-0.18.8/ChangeLog
--- old/aide-0.18.6/ChangeLog 2023-08-01 10:47:46.000000000 +0200
+++ new/aide-0.18.8/ChangeLog 2024-05-09 12:44:31.000000000 +0200
@@ -1,3 +1,28 @@
+2024-05-09 Hannes von Haugwitz <han...@vonhaugwitz.com>
+ * Release aide 0.18.8
+
+2024-05-08 Hannes von Haugwitz <han...@vonhaugwitz.com>
+ * Fix concurrent reading of extended attributes (xattrs)
+
+2024-05-05 Hannes von Haugwitz <han...@vonhaugwitz.com>
+ * Raise warning if both input databases are the same
+
+2024-05-04 Hannes von Haugwitz <han...@vonhaugwitz.com>
+ * Release aide 0.18.7
+
+2024-04-27 Hannes von Haugwitz <han...@vonhaugwitz.com>
+ * Add missing library CFLAGS
+
+2024-04-20 Hannes von Haugwitz <han...@vonhaugwitz.com>
+ * Fix 64-bit time_t on 32-bit architectures
+ * Fix typo in aide.conf manual page (closes: #165)
+
+2024-01-17 Hannes von Haugwitz <han...@vonhaugwitz.com>
+ * Fix debug logging for returned attributes
+
+2023-11-17 Mingjie Shen <shen...@purdue.edu>
+ * Fix condition for error message of failing to open gzipped files
+
2023-08-01 Hannes von Haugwitz <han...@vonhaugwitz.com>
* Release aide 0.18.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/Makefile.am new/aide-0.18.8/Makefile.am
--- old/aide-0.18.6/Makefile.am 2023-04-01 18:25:38.000000000 +0200
+++ new/aide-0.18.8/Makefile.am 2024-05-04 11:51:05.000000000 +0200
@@ -64,8 +64,34 @@
aide_SOURCES += include/fopen.h src/fopen.c
endif
-aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g ${PTHREAD_CFLAGS}
-aide_LDADD = -lm ${PCRE2_LIBS} ${ZLIB_LIBS} ${MHASH_LIBS} ${GCRYPT_LIBS}
${POSIX_ACL_LIBS} ${SELINUX_LIBS} ${AUDIT_LIBS} ${XATTR_LIBS} ${ELF_LIBS}
${E2FSATTRS_LIBS} ${CAPABILITIES_LIBS} ${CURL_LIBS} ${PTHREAD_LIBS}
+aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g \
+ ${AUDIT_CFLAGS} \
+ ${CAPABILITIES_CFLAGS} \
+ ${CURL_CFLAGS} \
+ ${E2FSATTRS_CFLAGS} \
+ ${ELF_CFLAGS} \
+ ${GCRYPT_CFLAGS} \
+ ${MHASH_CFLAGS} \
+ ${PCRE2_CFLAGS} \
+ ${POSIX_ACL_CFLAGS} \
+ ${PTHREAD_CFLAGS} \
+ ${SELINUX_CFLAGS} \
+ ${XATTR_CFLAGS} \
+ ${ZLIB_CFLAGS}
+aide_LDADD = -lm \
+ ${AUDIT_LIBS} \
+ ${CAPABILITIES_LIBS} \
+ ${CURL_LIBS} \
+ ${E2FSATTRS_LIBS} \
+ ${ELF_LIBS} \
+ ${GCRYPT_LIBS} \
+ ${MHASH_LIBS} \
+ ${PCRE2_LIBS} \
+ ${POSIX_ACL_LIBS} \
+ ${PTHREAD_LIBS} \
+ ${SELINUX_LIBS} \
+ ${XATTR_LIBS} \
+ ${ZLIB_LIBS}
if HAVE_CHECK
TESTS = check_aide
@@ -73,8 +99,16 @@
check_aide_SOURCES = tests/check_aide.c tests/check_aide.h \
tests/check_attributes.c
src/attributes.c \
src/log.c src/util.c
-check_aide_CFLAGS = -I$(top_srcdir)/include $(CHECK_CFLAGS)
-check_aide_LDADD = -lm ${PCRE2_LIBS} ${MHASH_LIBS} ${GCRYPT_LIBS}
$(CHECK_LIBS)
+check_aide_CFLAGS = -I$(top_srcdir)/include \
+ $(CHECK_CFLAGS) \
+ ${GCRYPT_CFLAGS} \
+ ${MHASH_CFLAGS} \
+ ${PCRE2_CFLAGS}
+check_aide_LDADD = -lm \
+ $(CHECK_LIBS) \
+ ${GCRYPT_LIBS} \
+ ${MHASH_LIBS} \
+ ${PCRE2_LIBS}
endif # HAVE_CHECK
AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/Makefile.in new/aide-0.18.8/Makefile.in
--- old/aide-0.18.6/Makefile.in 2023-08-01 10:48:11.000000000 +0200
+++ new/aide-0.18.8/Makefile.in 2024-05-09 12:44:47.000000000 +0200
@@ -529,14 +529,52 @@
include/symboltable.h src/symboltable.c include/url.h \
src/url.c include/util.h src/util.c $(am__append_1) \
$(am__append_2)
-aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g ${PTHREAD_CFLAGS}
-aide_LDADD = -lm ${PCRE2_LIBS} ${ZLIB_LIBS} ${MHASH_LIBS} ${GCRYPT_LIBS}
${POSIX_ACL_LIBS} ${SELINUX_LIBS} ${AUDIT_LIBS} ${XATTR_LIBS} ${ELF_LIBS}
${E2FSATTRS_LIBS} ${CAPABILITIES_LIBS} ${CURL_LIBS} ${PTHREAD_LIBS}
+aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g \
+ ${AUDIT_CFLAGS} \
+ ${CAPABILITIES_CFLAGS} \
+ ${CURL_CFLAGS} \
+ ${E2FSATTRS_CFLAGS} \
+ ${ELF_CFLAGS} \
+ ${GCRYPT_CFLAGS} \
+ ${MHASH_CFLAGS} \
+ ${PCRE2_CFLAGS} \
+ ${POSIX_ACL_CFLAGS} \
+ ${PTHREAD_CFLAGS} \
+ ${SELINUX_CFLAGS} \
+ ${XATTR_CFLAGS} \
+ ${ZLIB_CFLAGS}
+
+aide_LDADD = -lm \
+ ${AUDIT_LIBS} \
+ ${CAPABILITIES_LIBS} \
+ ${CURL_LIBS} \
+ ${E2FSATTRS_LIBS} \
+ ${ELF_LIBS} \
+ ${GCRYPT_LIBS} \
+ ${MHASH_LIBS} \
+ ${PCRE2_LIBS} \
+ ${POSIX_ACL_LIBS} \
+ ${PTHREAD_LIBS} \
+ ${SELINUX_LIBS} \
+ ${XATTR_LIBS} \
+ ${ZLIB_LIBS}
+
@HAVE_CHECK_TRUE@check_aide_SOURCES = tests/check_aide.c tests/check_aide.h \
@HAVE_CHECK_TRUE@
tests/check_attributes.c src/attributes.c \
@HAVE_CHECK_TRUE@ src/log.c src/util.c
-@HAVE_CHECK_TRUE@check_aide_CFLAGS = -I$(top_srcdir)/include $(CHECK_CFLAGS)
-@HAVE_CHECK_TRUE@check_aide_LDADD = -lm ${PCRE2_LIBS} ${MHASH_LIBS}
${GCRYPT_LIBS} $(CHECK_LIBS)
+@HAVE_CHECK_TRUE@check_aide_CFLAGS = -I$(top_srcdir)/include \
+@HAVE_CHECK_TRUE@ $(CHECK_CFLAGS) \
+@HAVE_CHECK_TRUE@ ${GCRYPT_CFLAGS} \
+@HAVE_CHECK_TRUE@ ${MHASH_CFLAGS} \
+@HAVE_CHECK_TRUE@ ${PCRE2_CFLAGS}
+
+@HAVE_CHECK_TRUE@check_aide_LDADD = -lm \
+@HAVE_CHECK_TRUE@ $(CHECK_LIBS) \
+@HAVE_CHECK_TRUE@ ${GCRYPT_LIBS} \
+@HAVE_CHECK_TRUE@ ${MHASH_LIBS} \
+@HAVE_CHECK_TRUE@ ${PCRE2_LIBS}
+
AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g
AM_CPPFLAGS = -I$(top_srcdir) \
-I$(top_srcdir)/include \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/NEWS new/aide-0.18.8/NEWS
--- old/aide-0.18.6/NEWS 2023-08-01 10:47:59.000000000 +0200
+++ new/aide-0.18.8/NEWS 2024-05-09 12:44:34.000000000 +0200
@@ -1,3 +1,14 @@
+Version 0.18.8 (2024-05-09)
+ * Fix concurrent reading of extended attributes (xattrs)
+ * Raise warning if both input databases are the same
+
+Version 0.18.7 (2024-05-04)
+ * Add missing library CFLAGS
+ * Fix typo in aide.conf manual page
+ * Fix 64-bit time_t on 32-bit architectures
+ * Fix debug logging for returned attributes
+ * Fix condition for error message of failing to open gzipped files
+
Version 0.18.6 (2023-08-01)
* Update GPG key in SECURITY.md
* Fix double free() during report generation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/README new/aide-0.18.8/README
--- old/aide-0.18.6/README 2023-08-01 10:47:59.000000000 +0200
+++ new/aide-0.18.8/README 2024-05-09 12:44:34.000000000 +0200
@@ -1,7 +1,7 @@
AIDE - Advanced Intrusion Detection Environment
-------------------------------------------------
- Version 0.18.6
+ Version 0.18.8
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/configure new/aide-0.18.8/configure
--- old/aide-0.18.6/configure 2023-08-01 10:48:10.000000000 +0200
+++ new/aide-0.18.8/configure 2024-05-09 12:44:46.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for aide 0.18.6.
+# Generated by GNU Autoconf 2.71 for aide 0.18.8.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -608,8 +608,8 @@
# Identity of this package.
PACKAGE_NAME='aide'
PACKAGE_TARNAME='aide'
-PACKAGE_VERSION='0.18.6'
-PACKAGE_STRING='aide 0.18.6'
+PACKAGE_VERSION='0.18.8'
+PACKAGE_STRING='aide 0.18.8'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1430,7 +1430,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures aide 0.18.6 to adapt to many kinds of systems.
+\`configure' configures aide 0.18.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1502,7 +1502,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of aide 0.18.6:";;
+ short | recursive ) echo "Configuration of aide 0.18.8:";;
esac
cat <<\_ACEOF
@@ -1674,7 +1674,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-aide configure 0.18.6
+aide configure 0.18.8
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2219,7 +2219,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by aide $as_me 0.18.6, which was
+It was created by aide $as_me 0.18.8, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3603,7 +3603,7 @@
# Define the identity of the package.
PACKAGE='aide'
- VERSION='0.18.6'
+ VERSION='0.18.8'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3707,7 +3707,7 @@
fi
-printf "%s\n" "#define AIDEVERSION \"0.18.6\"" >>confdefs.h
+printf "%s\n" "#define AIDEVERSION \"0.18.8\"" >>confdefs.h
@@ -11300,7 +11300,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by aide $as_me 0.18.6, which was
+This file was extended by aide $as_me 0.18.8, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11368,7 +11368,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-aide config.status 0.18.6
+aide config.status 0.18.8
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/doc/aide.1 new/aide-0.18.8/doc/aide.1
--- old/aide-0.18.6/doc/aide.1 2023-08-01 10:47:59.000000000 +0200
+++ new/aide-0.18.8/doc/aide.1 2024-05-09 12:44:34.000000000 +0200
@@ -1,4 +1,4 @@
-.TH AIDE 1 "2023-08-01" "aide v0.18.6" "User Commands"
+.TH AIDE 1 "2024-05-09" "aide v0.18.8" "User Commands"
.SH NAME
\fBaide\fP \- Advanced Intrusion Detection Environment
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/doc/aide.conf.5
new/aide-0.18.8/doc/aide.conf.5
--- old/aide-0.18.6/doc/aide.conf.5 2023-08-01 10:47:59.000000000 +0200
+++ new/aide-0.18.8/doc/aide.conf.5 2024-05-09 12:44:34.000000000 +0200
@@ -1,4 +1,4 @@
-.TH AIDE.CONF 5 "2023-08-01" "aide v0.18.6" "AIDE"
+.TH AIDE.CONF 5 "2024-05-09" "aide v0.18.8" "AIDE"
.SH NAME
aide.conf - The configuration file for Advanced Intrusion Detection
Environment
@@ -1011,7 +1011,7 @@
.TP
.B "\fBRotLog\fR=Full"
.TQ
-.B "/var/log/foo\e\e.log\e\e.1$ f RogLog"
+.B "/var/log/foo\e\e.log\e\e.1$ f RotLog"
foo.log.0 or foo.log.1 is called the Rotated Log,
the previously active log renamed to the
first name of the Log Series that is formed by the rotation mechanism.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/src/aide.c new/aide-0.18.8/src/aide.c
--- old/aide-0.18.6/src/aide.c 2023-06-13 20:52:39.000000000 +0200
+++ new/aide-0.18.8/src/aide.c 2024-05-09 09:01:56.000000000 +0200
@@ -674,16 +674,15 @@
"when doing database update"));
exit(INVALID_ARGUMENT_ERROR);
}
- if(conf->action&DO_DIFF){
- log_msg(LOG_LEVEL_ERROR,_("both input databases cannot be the same "
- "when doing database compare"));
- exit(INVALID_ARGUMENT_ERROR);
- }
};
-
if((conf->action&DO_DIFF)&&(!(conf->database_new.url)||!(conf->database_in.url))){
- log_msg(LOG_LEVEL_ERROR,_("must have both input databases defined for "
- "database compare"));
- exit(INVALID_ARGUMENT_ERROR);
+ if(conf->action&DO_DIFF) {
+ if(!(conf->database_new.url)||!(conf->database_in.url)) {
+ log_msg(LOG_LEVEL_ERROR,_("must have both input databases defined
for database compare"));
+ exit(INVALID_ARGUMENT_ERROR);
+ }
+ if(conf->database_in.url && conf->database_new.url &&
cmpurl(conf->database_in.url,conf->database_new.url)==RETOK){
+ log_msg(LOG_LEVEL_WARNING,_("both input databases for database
compare are the same"));
+ }
}
/* ensure size attribute is added to db_out_attrs if sizeg or growing
attribute is set */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/src/be.c new/aide-0.18.8/src/be.c
--- old/aide-0.18.6/src/be.c 2023-04-01 18:25:38.000000000 +0200
+++ new/aide-0.18.8/src/be.c 2024-05-04 08:24:55.000000000 +0200
@@ -160,7 +160,7 @@
#ifdef WITH_ZLIB
if(iszipped && !readonly){
gzFile gzfh = gzdopen(a,"w");
- if(fh==NULL){
+ if(gzfh==NULL){
log_msg(LOG_LEVEL_ERROR,"couldn't reopen file descriptor %li",a);
}
return gzfh;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/src/db_file.c
new/aide-0.18.8/src/db_file.c
--- old/aide-0.18.6/src/db_file.c 2023-04-01 18:25:38.000000000 +0200
+++ new/aide-0.18.8/src/db_file.c 2024-05-04 08:34:31.000000000 +0200
@@ -444,7 +444,7 @@
memset((void*)ptr,0,len);
- snprintf(ptr, len, "%li",i);
+ snprintf(ptr, len, "%llu", (unsigned long long) i);
tmpstr=encode_base64((byte *)ptr,strlen(ptr));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/src/do_md.c new/aide-0.18.8/src/do_md.c
--- old/aide-0.18.6/src/do_md.c 2023-07-30 20:32:13.000000000 +0200
+++ new/aide-0.18.8/src/do_md.c 2024-05-09 09:05:13.000000000 +0200
@@ -482,14 +482,13 @@
void xattrs2line(db_line *line) {
/* get all generic user xattrs. */
xattrs_type *xattrs = NULL;
- static ssize_t xsz = 1024;
- static char *xatrs = NULL;
ssize_t xret = -1;
if (!(ATTR(attr_xattrs)&line->attr))
return;
- if (!xatrs) xatrs = checked_malloc(xsz);
+ ssize_t xsz = 1024;
+ char *xatrs = xatrs = checked_malloc(xsz);
while (((xret = llistxattr(line->fullpath, xatrs, xsz)) == -1) && (errno
== ERANGE)) {
xsz <<= 1;
@@ -502,10 +501,8 @@
log_msg(LOG_LEVEL_WARNING, "listxattrs failed for %s:%s",
line->fullpath, strerror(errno));
} else if (xret) {
const char *attr = xatrs;
- static ssize_t asz = 1024;
- static char *val = NULL;
-
- if (!val) val = checked_malloc(asz);
+ ssize_t asz = 1024;
+ char *val = checked_malloc(asz);
xattrs = xattr_new();
@@ -533,7 +530,9 @@
attr += len + 1;
xret -= len + 1;
}
+ free(val);
}
+ free(xatrs);
line->xattrs = xattrs;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/src/gen_list.c
new/aide-0.18.8/src/gen_list.c
--- old/aide-0.18.6/src/gen_list.c 2023-05-16 20:28:44.000000000 +0200
+++ new/aide-0.18.8/src/gen_list.c 2024-05-04 08:29:23.000000000 +0200
@@ -796,13 +796,14 @@
*/
no_hash(line);
}
-
- log_msg(LOG_LEVEL_DEBUG, "%s> returned attributes: %llu (%s)", filename,
line->attr, str = diff_attributes(0, line->attr));
+ /* attr_filename is always needed/returned but never requested */
+ DB_ATTR_TYPE returned_attr = (~ATTR(attr_filename)&line->attr);
+ log_msg(LOG_LEVEL_DEBUG, "%s> returned attributes: %llu (%s)", filename,
returned_attr, str = diff_attributes(0, returned_attr));
free(str);
- if (~attr|line->attr) {
- log_msg(LOG_LEVEL_DEBUG, "%s> requested and returned attributes are
not equal: %s", filename, str = diff_attributes(attr, line->attr));
- free(str);
- }
+ if (returned_attr^attr) {
+ log_msg(LOG_LEVEL_DEBUG, "%s> requested (%llu) and returned (%llu)
attributes are not equal: %s", filename, attr, returned_attr, str =
diff_attributes(attr, returned_attr));
+ free(str);
+ }
return line;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aide-0.18.6/version.m4 new/aide-0.18.8/version.m4
--- old/aide-0.18.6/version.m4 2023-08-01 10:48:07.000000000 +0200
+++ new/aide-0.18.8/version.m4 2024-05-09 12:44:43.000000000 +0200
@@ -1 +1 @@
-m4_define([AIDE_VERSION], [0.18.6])
+m4_define([AIDE_VERSION], [0.18.8])
