From ed7418e5fc83eea4a48c1c57e61b2cb9acfe10c443aec8cdddd7c875f5c5d784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 1 Oct 2024 08:28:48 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main aide revision 15ae36010bfe26bfa30b5d71065c4c13 --- aide-0.18-as-needed.patch | 24 +++++++++++------------- aide-0.18.6.tar.gz | 3 --- aide-0.18.6.tar.gz.asc | 14 -------------- aide-0.18.8.tar.gz | 3 +++ aide-0.18.8.tar.gz.asc | 14 ++++++++++++++ aide.changes | 22 ++++++++++++++++++++++ aide.spec | 9 +++------ 7 files changed, 53 insertions(+), 36 deletions(-) delete mode 100644 aide-0.18.6.tar.gz delete mode 100644 aide-0.18.6.tar.gz.asc create mode 100644 aide-0.18.8.tar.gz create mode 100644 aide-0.18.8.tar.gz.asc diff --git a/aide-0.18-as-needed.patch b/aide-0.18-as-needed.patch index cc7c2a1..89f6095 100644 --- a/aide-0.18-as-needed.patch +++ b/aide-0.18-as-needed.patch @@ -1,13 +1,11 @@ -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} \ diff --git a/aide-0.18.6.tar.gz b/aide-0.18.6.tar.gz deleted file mode 100644 index c50968f..0000000 --- a/aide-0.18.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ff36ce47d37d0cc987762d5d961346d475de74bba8a1832fd006db6edd3c10e -size 383127 diff --git a/aide-0.18.6.tar.gz.asc b/aide-0.18.6.tar.gz.asc deleted file mode 100644 index 9e002f9..0000000 --- a/aide-0.18.6.tar.gz.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQGzBAABCgAdFiEEVJXNoXyawXqyOEGnGO6GOGAi71cFAmTIxuAACgkQGO6GOGAi -71ftsAv/bkzrJqAidCXFHf57lBcWFwcK8j9P1CNDF+sufw1Y7MVO/LaC0B6WGJyN -LjX9+bddNFl6k6uy8KW4O6DUGLV85milImKfNybIanyDTkA2/447r9GlT6+AEd5n -rlibs4yQ/39+2fjbeEENcKXGsfv0UMmx+GgR7uyQiEoj4ohyWH1x9Ti5mahcvr1L -GLNn7XdCcBXzhJIzQtjxZ68zKlIAjw25ajltBPd2s3Ep3xEhYYIvSfOrLtoWvBTB -MBAPcq1SHPJkdZVdnyCpLV5uUB7bQLURzw9ZVlePtBHWB97MBzy3d+4mB7G6jN2i -eMCYR7W0NKV7WoIZRVlz/8XA1rifrlCNO/pmul7cz8fOa9MQIQmFhgAbDr4zRbJs -r2ilh6mDh3nCjhl9qi13lyk6q3Y4cC5XyfMSprmt+QcOGmdWFOV2kcXhGL4hqCZX -uNkgv7uyARDJvs9uylagAkR39zmKNsK9brcT6NgF8srz9+FNXu32AC88mV6JtrCb -xdoH7aWM -=qETo ------END PGP SIGNATURE----- diff --git a/aide-0.18.8.tar.gz b/aide-0.18.8.tar.gz new file mode 100644 index 0000000..300b10c --- /dev/null +++ b/aide-0.18.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16662dc632d17e2c5630b801752f97912a8e22697c065ebde175f1cc37b83a60 +size 383589 diff --git a/aide-0.18.8.tar.gz.asc b/aide-0.18.8.tar.gz.asc new file mode 100644 index 0000000..97afb02 --- /dev/null +++ b/aide-0.18.8.tar.gz.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQGzBAABCgAdFiEEVJXNoXyawXqyOEGnGO6GOGAi71cFAmY8qT4ACgkQGO6GOGAi +71dnCAwAtWYqzAvLVt9nipeECShdXxXuFRR6Wi1A7bcioSHR28oKR4TxJQn4a/OT +9wo8VeDa5Sy1Y3n328XZfqlpGM8wkoMYefNhJMH+af1Y2pGBjHaGQnisdv556EOe +C3Bi2Zczn4hXDYt1o8ZK9QImPRLNTuCMot96aDIkMPSxHpSfu/tBpa1ovps23BX1 +/YLSkyyUrApa9YAiVrmb90MuiGUIk5MTnUoJ7b2svzAvPr4nw9VJBtV44aupZe2l +YISzvbz+EQby4D4qShenVodCZyqhXalT5ubGFh9fKQQcQBvqKT3Wmx1Lt0WMUxV6 +/tf6dDcbz3UU+D8uNlCOdMKuncxTKWN1F3C4pksOpHTGTgktSnBgmDtUDWMgvPWu +ijbYe8LBoYsrZzPu0/eI4g1idlv5ajjiJv+kKIY7r+GQ+84fXSgTzbbvfRZZ8mOL +cqEi9qQf/HhCc3QIVRw4MiIsxYl9YxdAszzzb3zuEvjLG5QkHNwrPx3N4Vh7V16K +M5aixKG1 +=VV+4 +-----END PGP SIGNATURE----- diff --git a/aide.changes b/aide.changes index 39af29b..ad51dec 100644 --- a/aide.changes +++ b/aide.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Aug 11 12:55:40 UTC 2024 - Aeneas Jaißle + +- 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 + +------------------------------------------------------------------- +Tue Feb 20 10:03:59 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN. + ------------------------------------------------------------------- Thu Aug 3 08:40:38 UTC 2023 - Paolo Stivanin diff --git a/aide.spec b/aide.spec index 647f26c..aadf2f1 100644 --- a/aide.spec +++ b/aide.spec @@ -1,7 +1,7 @@ # # spec file for package aide # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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 @@ -62,10 +62,7 @@ BuildArch: noarch Simple AIDE test script for externalized testing. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 %build autoreconf -fiv