diff --git a/aide-0.16-as-needed.patch b/aide-0.16.1-as-needed.patch similarity index 100% rename from aide-0.16-as-needed.patch rename to aide-0.16.1-as-needed.patch diff --git a/aide-0.16.1.tar.gz b/aide-0.16.1.tar.gz new file mode 100644 index 0000000..3cec2a6 --- /dev/null +++ b/aide-0.16.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f2b7cecc70c1a27d35c06c98804fcdb9f326630de5d035afc447122186010b7 +size 391531 diff --git a/aide-0.16.1.tar.gz.asc b/aide-0.16.1.tar.gz.asc new file mode 100644 index 0000000..768b769 --- /dev/null +++ b/aide-0.16.1.tar.gz.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQGzBAABCgAdFiEEVJXNoXyawXqyOEGnGO6GOGAi71cFAlx1oEIACgkQGO6GOGAi +71dV5gv+Io9Qw73FxRmY6G7BmMlmiULmwjPW/ouU/8eVvFEmYxbUmPKg0YcesWE3 +MkmNBSE1QbeIOw+vQriPrz5guqxaA1oBl0JsZMiSbgnsQ23AA2/29ryrOsYflLuM +9/18sEpBsrtY+VCM3PBGZ3r63s4EeUwibRsB9Iv4CcZFwC30KLS6xi0tnfbrt4s+ +JSFAdYc4VBXvl2+jy8B2etnWMsIMUfhuiwdtXNxcJZBTM7a9159osv5kOub8qe2j +VJey38sAbcuN2VhhduHZZW6QkGTR4FRuubr+LBMCpLYKT0Z+2FJ45fer99eJYxh8 +Z8/08qKINFffczN/G6MBUPup/YbBP+PVEc5E0pXc++t/OXUYuQ3CgVy5Aq7nqrdV +s61eKORrOJo3aF5HBvw6cxOi05QNfUiNRl6j2l+XfBO+kO5vzQVpoWEOHD5w4cEy +MiqNUdvFGULtRHxnGq5XZJTcYtNyJqngXILP1JC8IPW1kzqvhi4bCb6Aj+mzIHyo +sdF5WFml +=vHd0 +-----END PGP SIGNATURE----- diff --git a/aide-0.16.tar.gz b/aide-0.16.tar.gz deleted file mode 100644 index 31738b4..0000000 --- a/aide-0.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a81c53a131c4fd130b169b3a26ac35386a2f6e1e014f12807524cc273ed97345 -size 391009 diff --git a/aide-0.16.tar.gz.asc b/aide-0.16.tar.gz.asc deleted file mode 100644 index 048ddfb..0000000 --- a/aide-0.16.tar.gz.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQGcBAABCAAGBQJXloF/AAoJEBjuhjhgIu9XM70L/AsR9nYA6sR1dq7GU9feB5sZ -8OIbCntmg7qJtiPYeUBjAmZ1CHZLAY80uUfMkSO+tMlZbWAUaB2M/WiAtDGrCDoP -BU2gtaJMglD8qayUAKFPePwaXbp8WA0I1hZs+VWFEs2gTt+ltcLniaM+gTxI3Xji -8lH9pqwyuareUDI4IfMG9i4fXBwrm6nXXDoeU9lO4lHzmO8KSeqAD3kJMqyTV7EM -x5N9O6HhIeH06eJGkXbH1SjwxquDtc+Akadlg6tEnOOplpIJD3FR203eYFIeM0+A -YW64LdaHEGhV4UontzSPNhRd/QFQlYh+DPowlm6Dg1+HkaknMszPyPw5S9BBa6FK -bSCMpgMxKpRug3po2rI4JWgsgXfmdLpXkfahyMYDnD4eNvW8fWUVKvRnoXZ79Dd0 -axIvO33cYnTABIsqvuFxuIeibtgBCHe03pcOUwY8HptsKDkDDX58FjSLinDV5Mik -AxKTPkwOFEPE+BHhhqELJ19nUO9muo5PKgy1IM3h1w== -=dk/G ------END PGP SIGNATURE----- diff --git a/aide-xattr-in-libc.patch b/aide-xattr-in-libc.patch index 8f44209..70e41fc 100644 --- a/aide-xattr-in-libc.patch +++ b/aide-xattr-in-libc.patch @@ -1,7 +1,6 @@ -Index: aide-0.16/configure.ac -=================================================================== ---- aide-0.16.orig/configure.ac -+++ aide-0.16/configure.ac +diff -Pdpru aide-0.16.1.orig/configure.ac aide-0.16.1/configure.ac +--- aide-0.16.1.orig/configure.ac 2019-03-17 22:12:56.269936982 +0100 ++++ aide-0.16.1/configure.ac 2019-03-17 22:14:48.084669784 +0100 @@ -536,7 +536,7 @@ AC_ARG_WITH([xattr], AS_IF([test "x$with_xattr_support" != xno], @@ -11,15 +10,14 @@ Index: aide-0.16/configure.ac compoptionstring="${compoptionstring}WITH_XATTR\\n" aideextragroups="${aideextragroups}+xattrs" AC_MSG_RESULT(yes)], -Index: aide-0.16/include/db_config.h -=================================================================== ---- aide-0.16.orig/include/db_config.h -+++ aide-0.16/include/db_config.h +diff -Pdpru aide-0.16.1.orig/include/db_config.h aide-0.16.1/include/db_config.h +--- aide-0.16.1.orig/include/db_config.h 2019-03-17 22:12:56.269936982 +0100 ++++ aide-0.16.1/include/db_config.h 2019-03-17 22:16:01.303841342 +0100 @@ -62,7 +62,6 @@ typedef struct acl_type { #ifdef WITH_XATTR /* Do generic user Xattrs. */ #include --#include +-#include + #ifndef ENOATTR + # define ENOATTR ENODATA #endif - - typedef struct xattr_node diff --git a/aide.changes b/aide.changes index 0f0fd7e..792090e 100644 --- a/aide.changes +++ b/aide.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Mar 17 21:20:12 UTC 2019 - Matthias Eliasson + +- Update to 0.16.1 + * Move to GitHub + * Update documentation + * Bug fixes +- Upstream have moved to GitHub update URL and Source URLs accordingly +- Refresh patch: aide-xattr-in-libc.patch +- aide-0.16.1-as-needed.patch: replaces aide-0.16-as-needed.patch +- Some cleanup of spec with spec-cleaner + ------------------------------------------------------------------- Wed Jan 18 13:38:03 UTC 2017 - meissner@suse.com diff --git a/aide.spec b/aide.spec index b136e76..3561cce 100644 --- a/aide.spec +++ b/aide.spec @@ -1,7 +1,7 @@ # # spec file for package aide # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,11 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: aide +Version: 0.16.1 +Release: 0 +Summary: Advanced Intrusion Detection Environment +License: GPL-2.0-or-later +Group: Productivity/Security +URL: https://aide.github.io/ +Source0: https://github.com/aide/aide/releases/download/v%{version}/aide-%{version}.tar.gz +Source1: aide.conf +Source2: aide-cron_daily.sh +Source3: aide-test.sh +Source42: https://github.com/aide/aide/releases/download/v%{version}/aide-%{version}.tar.gz.asc +Source43: aide.keyring +Patch1: aide-0.16.1-as-needed.patch +Patch3: aide-xattr-in-libc.patch +Patch4: aide-dynamic.patch BuildRequires: automake BuildRequires: bison BuildRequires: curl-devel @@ -24,24 +39,8 @@ BuildRequires: flex BuildRequires: libacl-devel BuildRequires: libgcrypt-devel BuildRequires: libselinux-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: zlib-devel -Version: 0.16 -Release: 0 -Summary: Advanced Intrusion Detection Environment -License: GPL-2.0+ -Group: Productivity/Security -Source0: https://downloads.sourceforge.net/project/aide/aide/%version/aide-%version.tar.gz -Source42: https://downloads.sourceforge.net/project/aide/aide/%version/aide-%version.tar.gz.asc -Source43: aide.keyring -Source1: aide.conf -Source2: aide-cron_daily.sh -Source3: aide-test.sh -Patch1: aide-%{version}-as-needed.patch -Patch3: aide-xattr-in-libc.patch -Patch4: aide-dynamic.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://sourceforge.net/projects/aide/ %description AIDE is an intrusion detection system that checks file integrity. @@ -62,7 +61,7 @@ Simple AIDE test script for externalized testing. %build autoreconf -fiv %configure \ - --with-config_file=/etc/aide.conf \ + --with-config_file=%{_sysconfdir}/aide.conf \ --with-dbhmactype=md5 \ --disable-static \ --enable-lfs \ @@ -77,43 +76,42 @@ autoreconf -fiv make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -install -m 700 -d $RPM_BUILD_ROOT/var/lib/aide -install -m 700 -d $RPM_BUILD_ROOT/etc -install -m 600 %{S:1} $RPM_BUILD_ROOT/etc/aide.conf -install -m 700 %{S:3} $RPM_BUILD_ROOT/usr/bin/ -mkdir -p doc/examples/etc/cron.daily/ -cp -a %{S:2} doc/examples/etc/cron.daily/aide.sh +%make_install +install -m 700 -d %{buildroot}%{_localstatedir}/lib/aide +install -m 700 -d %{buildroot}%{_sysconfdir} +install -m 600 %{SOURCE1} %{buildroot}%{_sysconfdir}/aide.conf +install -m 700 %{SOURCE3} %{buildroot}%{_bindir}/ +mkdir -p doc/examples%{_sysconfdir}/cron.daily/ +cp -a %{SOURCE2} doc/examples%{_sysconfdir}/cron.daily/aide.sh %check -mkdir /var/tmp/aide-test -export TESTDIR=/var/tmp/aide-test -make DESTDIR=$TESTDIR install -install -m 700 -d $TESTDIR/var/lib/aide -install -m 700 -d $TESTDIR/etc -install -m 600 %{S:1} $TESTDIR/etc/aide.conf.new -sed -e "s#/var/lib/aide#$TESTDIR/var/lib/aide#g" <$TESTDIR/etc/aide.conf.new >$TESTDIR/etc/aide.conf +mkdir %{_localstatedir}/tmp/aide-test +export TESTDIR=%{_localstatedir}/tmp/aide-test +make %{?_smp_mflags} DESTDIR=$TESTDIR install +install -m 700 -d $TESTDIR%{_localstatedir}/lib/aide +install -m 700 -d $TESTDIR%{_sysconfdir} +install -m 600 %{SOURCE1} $TESTDIR%{_sysconfdir}/aide.conf.new +sed -e "s#%{_localstatedir}/lib/aide#$TESTDIR%{_localstatedir}/lib/aide#g" <$TESTDIR%{_sysconfdir}/aide.conf.new >$TESTDIR%{_sysconfdir}/aide.conf sleep 2 sync sleep 2 -$TESTDIR/usr/bin/aide -c $TESTDIR/etc/aide.conf --init -mv $TESTDIR/var/lib/aide/aide.db.new $TESTDIR/var/lib/aide/aide.db -$TESTDIR/usr/bin/aide -c $TESTDIR/etc/aide.conf --check --verbose +$TESTDIR/usr/bin/aide -c $TESTDIR%{_sysconfdir}/aide.conf --init +mv $TESTDIR%{_localstatedir}/lib/aide/aide.db.new $TESTDIR%{_localstatedir}/lib/aide/aide.db +$TESTDIR/usr/bin/aide -c $TESTDIR%{_sysconfdir}/aide.conf --check --verbose rm -rf $TESTDIR %files -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README doc/manual* aide.* doc/examples -%{_prefix}/bin/aide +%license COPYING +%doc AUTHORS ChangeLog NEWS README doc/manual* doc/examples +%{_bindir}/aide /%{_mandir}/man1/aide.1.gz /%{_mandir}/man5/aide.conf.5.gz -/var/lib/aide -%config(noreplace) /etc/aide.conf +%{_localstatedir}/lib/aide +%config(noreplace) %{_sysconfdir}/aide.conf %files test -%defattr(-,root,root) -/usr/bin/aide-test.sh +%{_bindir}/aide-test.sh %changelog