From be70c29eb9bcddccf07a75b3bdc3fdbee27eeb1d Mon Sep 17 00:00:00 2001
From: msmeissn <>
Date: Jun 05 2023 16:14:17 +0000
Subject: Update aide to version 0.18.3 / rev 38 via SR 1090921
https://build.opensuse.org/request/show/1090921
by user msmeissn + dimstar_suse
- 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 (forwarded request 1090912 from amanzini)
---
diff --git a/.files b/.files
index b8a3216..6fc106e 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 697d956..079e681 100644
--- a/.rev
+++ b/.rev
@@ -309,4 +309,13 @@
- switch to pcre2 (forwarded request 1072661 from dirkmueller)
1072663
+
+ e6b8c170390e375a747f9074c4b6bc93
+ 0.18.3
+
+ dimstar_suse
+ - 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 (forwarded request 1090912 from amanzini)
+ 1090921
+
diff --git a/aide-0.18-as-needed.patch b/aide-0.18-as-needed.patch
index 470fc85..dd6875b 100644
--- a/aide-0.18-as-needed.patch
+++ b/aide-0.18-as-needed.patch
@@ -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}
diff --git a/aide-0.18.1.tar.gz b/aide-0.18.1.tar.gz
deleted file mode 120000
index 2d860cf..0000000
--- a/aide-0.18.1.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeicnfpfirjuxfn4s2nb5jedragaubuk3v3ypi7rlmtergmwsntuwpu
\ No newline at end of file
diff --git a/aide-0.18.1.tar.gz.asc b/aide-0.18.1.tar.gz.asc
deleted file mode 100644
index 0fa6ecf..0000000
--- a/aide-0.18.1.tar.gz.asc
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQGzBAABCgAdFiEEVJXNoXyawXqyOEGnGO6GOGAi71cFAmQDquwACgkQGO6GOGAi
-71exXgv/cckvye1YvKfrzCHj7fGQudGbptZJWh1JWOAtXy/dOKt5fJ2RoxrbcFB0
-TKy3z91w9tTDimwXD1Snd40OWn6iax9d9qAOGFaK9WJkVA/5xIyQlY3QjZztwB46
-JnWa76+62uqwfszGlreim/S6kmypAKPptMUTO678Bwvqto5j7e9MFGIL1DtzBpdj
-S9d7Rhr0MpgpZS20evDDph/DsqNlGbEcvh2S5N2/j86TBsre2p2EkQc9NiBBfLuT
-CfJvj2cP3S+PvlvgEHv/ortvD6vfcAJjp6r/dptZ/Gd1SSswgJJJPL3UFNn8TrPJ
-YDOtA7ReQZ7VTHAqpG7Rqv2iDSq7G3qmzJvR9EdyWLBxVFvqXTIUJ8N6BRSDxBLv
-WOei/0E0fBT2C19oQSiU3ajf1zywDAG7JkH+2HdEjv4vyuBDdhnO0xeSqR5r15Q1
-RYQC+9vMJjOQpzRi0HP7HKU8/x/VX1VQWl7YfnGFVjFgkzgfcRrnpMzxDUuH5IHY
-o25jZD30
-=I+r2
------END PGP SIGNATURE-----
diff --git a/aide-0.18.3.tar.gz b/aide-0.18.3.tar.gz
new file mode 120000
index 0000000..b9b680b
--- /dev/null
+++ b/aide-0.18.3.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeidltpwdpcwjiy3c4qdrlbjngxqysze5xqkd56acnsb42joi4vgkui
\ No newline at end of file
diff --git a/aide-0.18.3.tar.gz.asc b/aide-0.18.3.tar.gz.asc
new file mode 100644
index 0000000..c232774
--- /dev/null
+++ b/aide-0.18.3.tar.gz.asc
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAABCgAdFiEEVJXNoXyawXqyOEGnGO6GOGAi71cFAmRj15IACgkQGO6GOGAi
+71dWhwwAlagqrqv/Wk4usUNLper8HH93eSFCrWeY9He8Sif50sOxONPEUT06rCqu
+de9BZuhh9iTRRVM1fze79jpqu2//mz9zMk2NeXDZ+GY1EPuBxQuLq+iAtZHuOM0V
+c8oBpp8nmKaKK+slB67TusV9KimsgwkwI6X88FrSCNMV5oC94LuLvgq78EhPNAEr
+ATE6GkYnK03vmPbaW1xJmmH0JHNw4I5ST5Zn3HQb8x9sHyAqTR5k2jOe48Ujj22R
+gZ4rzeRcM9mLlf0e+hDPvybXpeXvitVEnYIQSdaJRtv52lKmARpuS5bVWjqvQPQw
+ddBH6/FBIoqJC9jQkMUasQKifKv0m1DAeCoh1vhtpxWK+QajmkSuHKimIEkvpAO4
+ql5TjHpVTiubNyU5Ve7zk9KFUKnG1zqQnPa8AeKJdi1rvrulsPQimuh8PLVbvCgD
+tZhHF7QBMVi6NM/m9lfw/pLDoSI0bsEPGZjIq5BYio8+4PikC8Jq/GJAa/otScgO
+PF/3mMQX
+=BM/B
+-----END PGP SIGNATURE-----
diff --git a/aide-systemd.patch b/aide-systemd.patch
index ff5aca5..ff4b500 100644
--- a/aide-systemd.patch
+++ b/aide-systemd.patch
@@ -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 @@ diff -Naur org/doc/aide.1 patch/doc/aide.1
.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"
diff --git a/aide-xattr-in-libc.patch b/aide-xattr-in-libc.patch
index dd0b66d..f272084 100644
--- a/aide-xattr-in-libc.patch
+++ b/aide-xattr-in-libc.patch
@@ -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 @@ diff --color -ruN aide-0.18.ori/configure.ac aide-0.18/configure.ac
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 @@ diff --color -ruN aide-0.18.ori/configure.ac aide-0.18/configure.ac
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 @@ diff --color -ruN aide-0.18.ori/configure.ac aide-0.18/configure.ac
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 @@ diff --color -ruN aide-0.18.ori/include/db_config.h aide-0.18/include/db_config.
/* }_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 @@ diff --color -ruN aide-0.18.ori/include/db_config.h aide-0.18/include/db_config.
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 @@ diff --color -ruN aide-0.18.ori/include/db_config.h aide-0.18/include/db_config.
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 @@ diff --color -ruN aide-0.18.ori/src/do_md.c aide-0.18/src/do_md.c
#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 @@ diff --color -ruN aide-0.18.ori/src/do_md.c aide-0.18/src/do_md.c
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 @@ diff --color -ruN aide-0.18.ori/src/do_md.c aide-0.18/src/do_md.c
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 @@ diff --color -ruN aide-0.18.ori/src/do_md.c aide-0.18/src/do_md.c
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 @@ diff --color -ruN aide-0.18.ori/src/do_md.c aide-0.18/src/do_md.c
#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 @@ diff --color -ruN aide-0.18.ori/src/do_md.c aide-0.18/src/do_md.c
}
#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);
}
diff --git a/aide.changes b/aide.changes
index 291679f..893dd6e 100644
--- a/aide.changes
+++ b/aide.changes
@@ -1,4 +1,20 @@
-------------------------------------------------------------------
+Mon Jun 5 12:16:24 UTC 2023 - Andrea Manzini
+
+- 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
+
+- 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
+
+-------------------------------------------------------------------
Fri Mar 17 14:55:57 UTC 2023 - Dirk Müller
- update to 0.18.1:
diff --git a/aide.spec b/aide.spec
index edda436..9406e6a 100644
--- a/aide.spec
+++ b/aide.spec
@@ -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 @@ AIDE is an intrusion detection system that checks file integrity.
%package test
Summary: Simple AIDE testing
+BuildArch: noarch
%description test
Simple AIDE test script for externalized testing.
@@ -101,6 +102,9 @@ gzip -9 %{buildroot}%{_mandir}/man8/aide.timer.8
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 @@ if ! grep -q "database_in" %{_sysconfdir}/aide.conf ; then
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