Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aide for openSUSE:Factory checked in at 2023-06-05 18:08:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aide (Old) and /work/SRC/openSUSE:Factory/.aide.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aide" Mon Jun 5 18:08:02 2023 rev:38 rq:1090921 version:0.18.3 Changes: -------- --- /work/SRC/openSUSE:Factory/aide/aide.changes 2023-03-17 17:05:33.902092182 +0100 +++ /work/SRC/openSUSE:Factory/.aide.new.15902/aide.changes 2023-06-05 18:08:19.227740548 +0200 @@ -1,0 +2,16 @@ +Mon Jun 5 12:16:24 UTC 2023 - Andrea Manzini <[email protected]> + +- switched service macros from %systemd_* to %service_* + according to documentation at https://en.opensuse.org/openSUSE:Systemd_packaging_guidelines#Registering_unit_files_in_install_scripts + +------------------------------------------------------------------- +Mon Jun 5 07:56:04 UTC 2023 - Andrea Manzini <[email protected]> + +- Update to 0.18.3: + * Handle readlink() errors + +- Update to 0.18.2: + * Add warning if rules contain not compiled-in attributes + * Add missing lock for tree operations during file system scan + +------------------------------------------------------------------- Old: ---- aide-0.18.1.tar.gz aide-0.18.1.tar.gz.asc New: ---- aide-0.18.3.tar.gz aide-0.18.3.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aide.spec ++++++ --- /var/tmp/diff_new_pack.Ju43rL/_old 2023-06-05 18:08:20.019745225 +0200 +++ /var/tmp/diff_new_pack.Ju43rL/_new 2023-06-05 18:08:20.023745249 +0200 @@ -17,7 +17,7 @@ Name: aide -Version: 0.18.1 +Version: 0.18.3 Release: 0 Summary: Advanced Intrusion Detection Environment License: GPL-2.0-or-later @@ -56,6 +56,7 @@ %package test Summary: Simple AIDE testing +BuildArch: noarch %description test Simple AIDE test script for externalized testing. @@ -101,6 +102,9 @@ mkdir -p doc/examples%{_sysconfdir}/cron.daily/ cp -a %{SOURCE2} doc/examples%{_sysconfdir}/cron.daily/aide.sh +%pre +%service_add_pre %{name}.service %{name}.timer + %post if ! grep -q "database_in" %{_sysconfdir}/aide.conf ; then # with the 0.17 update some backward incompatible changes were made to the config file. Therefore, we have to adapt those parameters, otherwise the program will fail @@ -108,13 +112,13 @@ sed -i '/verbose=/d' %{_sysconfdir}/aide.conf sed -i 's/\t/ /g' %{_sysconfdir}/aide.conf fi -%systemd_post %{name}.service %{name}.timer +%service_add_post %{name}.service %{name}.timer %preun -%systemd_preun %{name}.service %{name}.timer +%service_del_preun %{name}.service %{name}.timer %postun -%systemd_postun %{name}.service %{name}.timer +%service_del_postun %{name}.service %{name}.timer %check rm -rf %{_localstatedir}/tmp/aide-test ++++++ aide-0.18-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.Ju43rL/_old 2023-06-05 18:08:20.047745390 +0200 +++ /var/tmp/diff_new_pack.Ju43rL/_new 2023-06-05 18:08:20.051745414 +0200 @@ -1,7 +1,8 @@ -diff --color -ruN aide-0.18.ori/Makefile.am aide-0.18/Makefile.am ---- aide-0.18.ori/Makefile.am 2023-02-06 22:06:50.000000000 +0100 -+++ aide-0.18/Makefile.am 2023-02-23 17:49:10.893667920 +0100 -@@ -65,7 +65,7 @@ +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-0.18.1.tar.gz -> aide-0.18.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.1/ChangeLog new/aide-0.18.3/ChangeLog --- old/aide-0.18.1/ChangeLog 2023-03-04 21:32:15.000000000 +0100 +++ new/aide-0.18.3/ChangeLog 2023-05-16 21:20:17.000000000 +0200 @@ -1,3 +1,21 @@ +2023-05-16 Hannes von Haugwitz <[email protected]> + * Release aide 0.18.3 + +2023-05-10 Hannes von Haugwitz <[email protected]> + * Handle readlink() errors + +2023-04-07 Hannes von Haugwitz <[email protected]> + * Release aide 0.18.2 + +2023-04-03 Hannes von Haugwitz <[email protected]> + * Add another missing lock for tree operations + +2023-04-01 Hannes von Haugwitz <[email protected]> + * Add missing lock for tree operations during file system scan + +2023-03-08 Hannes von Haugwitz <[email protected]> + * Add warning if rules contain not compiled-in attributes (closes: #153) + 2023-03-04 Hannes von Haugwitz <[email protected]> * Release aide 0.18.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.1/NEWS new/aide-0.18.3/NEWS --- old/aide-0.18.1/NEWS 2023-03-04 21:32:18.000000000 +0100 +++ new/aide-0.18.3/NEWS 2023-05-16 21:20:17.000000000 +0200 @@ -1,3 +1,10 @@ +Version 0.18.3 (2023-05-16) + * Handle readlink() errors + +Version 0.18.2 (2023-04-07) + * Add warning if rules contain not compiled-in attributes + * Add missing lock for tree operations during file system scan + Version 0.18.1 (2023-03-04) * Fix handling of empty growing files * Fix segfault when using --dry-init diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.1/README new/aide-0.18.3/README --- old/aide-0.18.1/README 2023-03-04 21:32:18.000000000 +0100 +++ new/aide-0.18.3/README 2023-05-16 21:20:17.000000000 +0200 @@ -1,7 +1,7 @@ AIDE - Advanced Intrusion Detection Environment ------------------------------------------------- - Version 0.18.1 + Version 0.18.3 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.1/configure new/aide-0.18.3/configure --- old/aide-0.18.1/configure 2023-03-04 21:32:29.000000000 +0100 +++ new/aide-0.18.3/configure 2023-05-16 21:20:35.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.1. +# Generated by GNU Autoconf 2.71 for aide 0.18.3. # # # 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.1' -PACKAGE_STRING='aide 0.18.1' +PACKAGE_VERSION='0.18.3' +PACKAGE_STRING='aide 0.18.3' 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.1 to adapt to many kinds of systems. +\`configure' configures aide 0.18.3 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.1:";; + short | recursive ) echo "Configuration of aide 0.18.3:";; 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.1 +aide configure 0.18.3 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.1, which was +It was created by aide $as_me 0.18.3, 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.1' + VERSION='0.18.3' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3707,7 +3707,7 @@ fi -printf "%s\n" "#define AIDEVERSION \"0.18.1\"" >>confdefs.h +printf "%s\n" "#define AIDEVERSION \"0.18.3\"" >>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.1, which was +This file was extended by aide $as_me 0.18.3, 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.1 +aide config.status 0.18.3 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.1/doc/aide.1 new/aide-0.18.3/doc/aide.1 --- old/aide-0.18.1/doc/aide.1 2023-03-04 21:32:18.000000000 +0100 +++ new/aide-0.18.3/doc/aide.1 2023-05-16 21:20:17.000000000 +0200 @@ -1,4 +1,4 @@ -.TH AIDE 1 "2023-03-04" "aide v0.18.1" "User Commands" +.TH AIDE 1 "2023-05-16" "aide v0.18.3" "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.1/doc/aide.conf.5 new/aide-0.18.3/doc/aide.conf.5 --- old/aide-0.18.1/doc/aide.conf.5 2023-03-04 21:32:18.000000000 +0100 +++ new/aide-0.18.3/doc/aide.conf.5 2023-05-16 21:20:17.000000000 +0200 @@ -1,4 +1,4 @@ -.TH AIDE.CONF 5 "2023-03-04" "aide v0.18.1" "AIDE" +.TH AIDE.CONF 5 "2023-05-16" "aide v0.18.3" "AIDE" .SH NAME aide.conf - The configuration file for Advanced Intrusion Detection Environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.1/src/commandconf.c new/aide-0.18.3/src/commandconf.c --- old/aide-0.18.1/src/commandconf.c 2023-03-04 21:15:35.000000000 +0100 +++ new/aide-0.18.3/src/commandconf.c 2023-04-01 18:30:35.000000000 +0200 @@ -338,14 +338,40 @@ r->config_line = checked_strdup(linebuf); r->prefix = rule_prefix; + char *str; + DB_ATTR_TYPE unsupported_hashes = attr&(get_hashes(true)&~get_hashes(false)); if (unsupported_hashes) { - char *str; LOG_CONFIG_FORMAT_LINE(LOG_LEVEL_WARNING, "ignoring unsupported hash algorithm(s): %s", str = diff_attributes(0, unsupported_hashes)); free(str); attr &= ~unsupported_hashes; } + DB_ATTR_TYPE unsupported_attrs = attr& + (0 +#ifndef WITH_ACL + |ATTR(attr_acl) +#endif +#ifndef WITH_SELINUX + |ATTR(attr_selinux) +#endif +#ifndef WITH_XATTR + |ATTR(attr_xattrs) +#endif +#ifndef WITH_E2FSATTRS + |ATTR(attr_e2fsattrs) +#endif +#ifndef WITH_CAPABILITIES + |ATTR(attr_capabilities) +#endif + ) + ; + if (unsupported_attrs) { + LOG_CONFIG_FORMAT_LINE(LOG_LEVEL_WARNING, "ignoring not compiiled-in attribute(s): %s", str = diff_attributes(0, unsupported_attrs)); + free(str); + attr &= ~unsupported_attrs; + } + r->attr=attr; if (attr&ATTR(attr_sizeg)) { log_msg(LOG_LEVEL_NOTICE, "%s:%d: Using 'S' attribute is DEPRECATED and will be removed in the release after next. Update your config and use 'growing+s' instead (line: '%s')", filename, linenumber, linebuf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.1/src/db_disk.c new/aide-0.18.3/src/db_disk.c --- old/aide-0.18.1/src/db_disk.c 2023-03-04 21:19:34.000000000 +0100 +++ new/aide-0.18.3/src/db_disk.c 2023-04-03 22:06:53.000000000 +0200 @@ -46,6 +46,10 @@ #include <pthread.h> #endif +#ifdef WITH_PTHREAD +pthread_mutex_t seltree_mutex = PTHREAD_MUTEX_INITIALIZER; +#endif + static int get_file_status(char *filename, struct stat *fs) { int sres = 0; sres = lstat(filename,fs); @@ -121,7 +125,13 @@ log_msg(LOG_LEVEL_DEBUG,"scan_dir: process root directory '%s' (fullpath: '%s')", &root_path[conf->root_prefix_length], root_path); if (!get_file_status(root_path, &fs)) { +#ifdef WITH_PTHREAD + pthread_mutex_lock(&seltree_mutex); +#endif match_result match = check_rxtree (&root_path[conf->root_prefix_length], conf->tree, &rule, get_restriction_from_perm(fs.st_mode), "disk"); +#ifdef WITH_PTHREAD + pthread_mutex_unlock(&seltree_mutex); +#endif if (dry_run) { print_match(&root_path[conf->root_prefix_length], rule, match, get_restriction_from_perm(fs.st_mode)); } @@ -152,7 +162,13 @@ if (!get_file_status(entry_full_path, &fs)) { rule = NULL; node = NULL; +#ifdef WITH_PTHREAD + pthread_mutex_lock(&seltree_mutex); +#endif match_result match = check_rxtree (&entry_full_path[conf->root_prefix_length], conf->tree, &rule, get_restriction_from_perm(fs.st_mode), "disk"); +#ifdef WITH_PTHREAD + pthread_mutex_unlock(&seltree_mutex); +#endif switch (match) { case RESULT_SELECTIVE_MATCH: if (S_ISDIR(fs.st_mode)) { @@ -174,7 +190,13 @@ } break; case RESULT_NO_MATCH: +#ifdef WITH_PTHREAD + pthread_mutex_lock(&seltree_mutex); +#endif node = get_seltree_node(conf->tree, &entry_full_path[conf->root_prefix_length]); +#ifdef WITH_PTHREAD + pthread_mutex_unlock(&seltree_mutex); +#endif if(S_ISDIR(fs.st_mode) && node) { log_msg(log_level, "scan_dir: add child directory '%s' to scan stack (reason: existing tree node '%s' (%p))", &entry_full_path[conf->root_prefix_length], node->path, node); free_entry_full_path = false; @@ -221,7 +243,9 @@ database_entry *data; while ((data = queue_ts_dequeue_wait(queue_database_entries, whoami)) != NULL) { log_msg(LOG_LEVEL_THREAD, "%10s: got line '%s'", whoami, (data->line)->filename); + pthread_mutex_lock(&seltree_mutex); add_file_to_tree(conf->tree, data->line, DB_NEW|DB_DISK, NULL, &data->fs); + pthread_mutex_unlock(&seltree_mutex); free(data); } queue_ts_free(queue_database_entries); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.1/src/gen_list.c new/aide-0.18.3/src/gen_list.c --- old/aide-0.18.1/src/gen_list.c 2023-03-04 21:19:34.000000000 +0100 +++ new/aide-0.18.3/src/gen_list.c 2023-05-16 20:28:44.000000000 +0200 @@ -919,8 +919,14 @@ memset(line->linkname,0,_POSIX_PATH_MAX+1); len=readlink(line->fullpath,line->linkname,_POSIX_PATH_MAX+1); - - line->linkname=checked_realloc(line->linkname,len+1); + if (len < 0) { + log_msg(LOG_LEVEL_WARNING, "readlink() failed for '%s': %s", line->fullpath, strerror(errno)); + line->attr&=(~ATTR(attr_linkname)); + free(line->linkname); + line->linkname = NULL; + } else { + line->linkname=checked_realloc(line->linkname,len+1); + } } else { line->attr&=(~ATTR(attr_linkname)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.1/version.m4 new/aide-0.18.3/version.m4 --- old/aide-0.18.1/version.m4 2023-03-04 21:32:26.000000000 +0100 +++ new/aide-0.18.3/version.m4 2023-05-16 21:20:32.000000000 +0200 @@ -1 +1 @@ -m4_define([AIDE_VERSION], [0.18.1]) +m4_define([AIDE_VERSION], [0.18.3]) ++++++ aide-systemd.patch ++++++ --- /var/tmp/diff_new_pack.Ju43rL/_old 2023-06-05 18:08:20.143745957 +0200 +++ /var/tmp/diff_new_pack.Ju43rL/_new 2023-06-05 18:08:20.147745981 +0200 @@ -1,7 +1,8 @@ -diff -Naur org/doc/aide.1 patch/doc/aide.1 ---- org/doc/aide.1 2021-11-03 16:06:51.562903494 +0100 -+++ patch/doc/aide.1 2021-11-03 16:17:31.549730006 +0100 -@@ -135,7 +135,7 @@ +Index: aide-0.18.3/doc/aide.1 +=================================================================== +--- aide-0.18.3.orig/doc/aide.1 ++++ aide-0.18.3/doc/aide.1 +@@ -143,7 +143,7 @@ See \fB--version\fR output for the defau default \fBdatabase_in\fR and \fBdatabase_out\fR config values. .SH SEE ALSO @@ -10,10 +11,11 @@ .SH BUGS There are probably bugs in this release. Please report them at https://github.com/aide/aide/issues . -diff -Naur org/doc/aide.conf.5 patch/doc/aide.conf.5 ---- org/doc/aide.conf.5 2021-11-03 16:06:51.582903583 +0100 -+++ patch/doc/aide.conf.5 2021-11-03 16:18:03.469869750 +0100 -@@ -668,7 +668,7 @@ +Index: aide-0.18.3/doc/aide.conf.5 +=================================================================== +--- aide-0.18.3.orig/doc/aide.conf.5 ++++ aide-0.18.3/doc/aide.conf.5 +@@ -1090,7 +1090,7 @@ In the following, the first is not allow .B "/foo e+p+u+g" .PP .SH "SEE ALSO" ++++++ aide-xattr-in-libc.patch ++++++ --- /var/tmp/diff_new_pack.Ju43rL/_old 2023-06-05 18:08:20.159746052 +0200 +++ /var/tmp/diff_new_pack.Ju43rL/_new 2023-06-05 18:08:20.163746076 +0200 @@ -1,7 +1,8 @@ -diff --color -ruN aide-0.18.ori/configure.ac aide-0.18/configure.ac ---- aide-0.18.ori/configure.ac 2023-02-06 22:06:50.000000000 +0100 -+++ aide-0.18/configure.ac 2023-02-23 18:38:19.703630012 +0100 -@@ -59,7 +59,7 @@ +Index: aide-0.18.3/configure.ac +=================================================================== +--- aide-0.18.3.orig/configure.ac ++++ aide-0.18.3/configure.ac +@@ -59,7 +59,7 @@ dnl Do the right thing for glibc... AIDE_DEFS="-D_GNU_SOURCE" dnl This is borrowed from libtool @@ -10,7 +11,7 @@ if test $ac_cv_c_compiler_gnu = yes; then LD_STATIC_FLAG='-static' -@@ -101,54 +101,54 @@ +@@ -101,54 +101,54 @@ else # All AIX code is PIC. LD_STATIC_FLAG='-bnso -bI:/lib/syscalls.exp' ;; @@ -74,7 +75,7 @@ uts4*) ## pic_flag='-pic' LD_STATIC_FLAG='-Bstatic' -@@ -338,8 +338,6 @@ +@@ -338,8 +338,6 @@ fi AIDE_PKG_CHECK(selinux, SELinux, no, SELINUX, libselinux, selinux) @@ -83,9 +84,10 @@ AIDE_PKG_CHECK(capabilities, POSIX 1003.1e capabilities, no, CAPABILITIES, libcap, caps) AIDE_PKG_CHECK(e2fsattrs, e2fsattrs, no, E2FSATTRS, e2p, e2fsattrs) -diff --color -ruN aide-0.18.ori/include/db_config.h aide-0.18/include/db_config.h ---- aide-0.18.ori/include/db_config.h 2023-02-06 22:06:50.000000000 +0100 -+++ aide-0.18/include/db_config.h 2023-02-23 18:29:04.202036763 +0100 +Index: aide-0.18.3/include/db_config.h +=================================================================== +--- aide-0.18.3.orig/include/db_config.h ++++ aide-0.18.3/include/db_config.h @@ -19,7 +19,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -112,7 +114,7 @@ /* }_db_config ; */ typedef struct database { -@@ -111,14 +110,14 @@ +@@ -111,14 +110,14 @@ typedef struct db_config { #ifdef WITH_ZLIB /* Is dbout gzipped or not */ int gzip_dbout; @@ -129,7 +131,7 @@ char* config_file; char* config_version; bool config_check_warn_unrestricted_rules; -@@ -160,7 +159,7 @@ +@@ -160,7 +159,7 @@ typedef struct db_config { int symlinks_found; DB_ATTR_TYPE attr; @@ -138,9 +140,10 @@ int no_acl_on_symlinks; #endif int warn_dead_symlinks; -diff --color -ruN aide-0.18.ori/src/do_md.c aide-0.18/src/do_md.c ---- aide-0.18.ori/src/do_md.c 2023-02-06 22:06:50.000000000 +0100 -+++ aide-0.18/src/do_md.c 2023-02-23 18:29:31.706313697 +0100 +Index: aide-0.18.3/src/do_md.c +=================================================================== +--- aide-0.18.3.orig/src/do_md.c ++++ aide-0.18.3/src/do_md.c @@ -45,7 +45,6 @@ #ifdef WITH_XATTR @@ -149,7 +152,7 @@ #ifndef ENOATTR # define ENOATTR ENODATA #endif -@@ -327,7 +326,7 @@ +@@ -327,7 +326,7 @@ md_hashsums calc_hashsums(char* fullpath } void fs2db_line(struct stat* fs,db_line* line) { @@ -158,7 +161,7 @@ line->inode=fs->st_ino; if(ATTR(attr_uid)&line->attr) { -@@ -349,7 +348,7 @@ +@@ -349,7 +348,7 @@ void fs2db_line(struct stat* fs,db_line* }else{ line->size=0; } @@ -167,7 +170,7 @@ if(ATTR(attr_linkcount)&line->attr){ line->nlink=fs->st_nlink; }else { -@@ -367,7 +366,7 @@ +@@ -367,7 +366,7 @@ void fs2db_line(struct stat* fs,db_line* }else{ line->ctime=0; } @@ -176,7 +179,7 @@ if(ATTR(attr_atime)&line->attr){ line->atime=fs->st_atime; }else{ -@@ -379,13 +378,13 @@ +@@ -379,13 +378,13 @@ void fs2db_line(struct stat* fs,db_line* } else { line->bcount=0; } @@ -192,7 +195,7 @@ #ifdef WITH_POSIX_ACL if(ATTR(attr_acl)&line->attr) { acl_t acl_a; -@@ -434,7 +433,7 @@ +@@ -434,7 +433,7 @@ void acl2line(db_line* line) { acl_free(acl_d); } line->acl = ret; @@ -201,7 +204,7 @@ } #endif -@@ -596,4 +595,3 @@ +@@ -596,4 +595,3 @@ void capabilities2line(db_line* line) { void no_hash(db_line* line) { line->attr&=~get_hashes(true); }
