pool/aide
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 685865 from home:elimat:branches:security

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/685865
OBS-URL: https://build.opensuse.org/package/show/security/aide?expand=0&rev=32
This commit is contained in:
Karol Babioch 2019-03-18 06:28:26 +00:00 committed by Git OBS Bridge
parent 0fa141628d
commit 9207fd14cb
8 changed files with 80 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
aide-0.16-as-needed.patch → aide-0.16.1-as-needed.patch
View File

3
aide-0.16.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0f2b7cecc70c1a27d35c06c98804fcdb9f326630de5d035afc447122186010b7
size 391531

14
aide-0.16.1.tar.gz.asc Normal file
View File

@ -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-----

3
aide-0.16.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a81c53a131c4fd130b169b3a26ac35386a2f6e1e014f12807524cc273ed97345
size 391009

14
aide-0.16.tar.gz.asc
View File

@ -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-----

20
aide-xattr-in-libc.patch
View File

@ -1,7 +1,6 @@
Index: 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.orig/configure.ac +++ aide-0.16.1/configure.ac 2019-03-17 22:14:48.084669784 +0100
+++ aide-0.16/configure.ac
@@ -536,7 +536,7 @@ AC_ARG_WITH([xattr], @@ -536,7 +536,7 @@ AC_ARG_WITH([xattr],
AS_IF([test "x$with_xattr_support" != xno], AS_IF([test "x$with_xattr_support" != xno],
@ -11,15 +10,14 @@ Index: aide-0.16/configure.ac
compoptionstring="${compoptionstring}WITH_XATTR\\n" compoptionstring="${compoptionstring}WITH_XATTR\\n"
aideextragroups="${aideextragroups}+xattrs" aideextragroups="${aideextragroups}+xattrs"
AC_MSG_RESULT(yes)], AC_MSG_RESULT(yes)],
Index: 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.orig/include/db_config.h +++ aide-0.16.1/include/db_config.h 2019-03-17 22:16:01.303841342 +0100
+++ aide-0.16/include/db_config.h
@@ -62,7 +62,6 @@ typedef struct acl_type { @@ -62,7 +62,6 @@ typedef struct acl_type {
#ifdef WITH_XATTR /* Do generic user Xattrs. */ #ifdef WITH_XATTR /* Do generic user Xattrs. */
#include <sys/xattr.h> #include <sys/xattr.h>
-#include <attr/xattr.h> -#include <attr/attributes.h>
#ifndef ENOATTR
# define ENOATTR ENODATA
#endif #endif
typedef struct xattr_node

12
aide.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Mar 17 21:20:12 UTC 2019 - Matthias Eliasson <elimat@opensuse.org>
- 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 Wed Jan 18 13:38:03 UTC 2017 - meissner@suse.com

86
aide.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package aide # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 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: automake
BuildRequires: bison BuildRequires: bison
BuildRequires: curl-devel BuildRequires: curl-devel
@ -24,24 +39,8 @@ BuildRequires: flex
BuildRequires: libacl-devel BuildRequires: libacl-devel
BuildRequires: libgcrypt-devel BuildRequires: libgcrypt-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: pkg-config BuildRequires: pkgconfig
BuildRequires: zlib-devel 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 %description
AIDE is an intrusion detection system that checks file integrity. AIDE is an intrusion detection system that checks file integrity.
@ -62,7 +61,7 @@ Simple AIDE test script for externalized testing.
%build %build
autoreconf -fiv autoreconf -fiv
%configure \ %configure \
--with-config_file=/etc/aide.conf \ --with-config_file=%{_sysconfdir}/aide.conf \
--with-dbhmactype=md5 \ --with-dbhmactype=md5 \
--disable-static \ --disable-static \
--enable-lfs \ --enable-lfs \
@ -77,43 +76,42 @@ autoreconf -fiv
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
make DESTDIR=$RPM_BUILD_ROOT install %make_install
install -m 700 -d $RPM_BUILD_ROOT/var/lib/aide install -m 700 -d %{buildroot}%{_localstatedir}/lib/aide
install -m 700 -d $RPM_BUILD_ROOT/etc install -m 700 -d %{buildroot}%{_sysconfdir}
install -m 600 %{S:1} $RPM_BUILD_ROOT/etc/aide.conf install -m 600 %{SOURCE1} %{buildroot}%{_sysconfdir}/aide.conf
install -m 700 %{S:3} $RPM_BUILD_ROOT/usr/bin/ install -m 700 %{SOURCE3} %{buildroot}%{_bindir}/
mkdir -p doc/examples/etc/cron.daily/ mkdir -p doc/examples%{_sysconfdir}/cron.daily/
cp -a %{S:2} doc/examples/etc/cron.daily/aide.sh cp -a %{SOURCE2} doc/examples%{_sysconfdir}/cron.daily/aide.sh
%check %check
mkdir /var/tmp/aide-test mkdir %{_localstatedir}/tmp/aide-test
export TESTDIR=/var/tmp/aide-test export TESTDIR=%{_localstatedir}/tmp/aide-test
make DESTDIR=$TESTDIR install make %{?_smp_mflags} DESTDIR=$TESTDIR install
install -m 700 -d $TESTDIR/var/lib/aide install -m 700 -d $TESTDIR%{_localstatedir}/lib/aide
install -m 700 -d $TESTDIR/etc install -m 700 -d $TESTDIR%{_sysconfdir}
install -m 600 %{S:1} $TESTDIR/etc/aide.conf.new install -m 600 %{SOURCE1} $TESTDIR%{_sysconfdir}/aide.conf.new
sed -e "s#/var/lib/aide#$TESTDIR/var/lib/aide#g" <$TESTDIR/etc/aide.conf.new >$TESTDIR/etc/aide.conf sed -e "s#%{_localstatedir}/lib/aide#$TESTDIR%{_localstatedir}/lib/aide#g" <$TESTDIR%{_sysconfdir}/aide.conf.new >$TESTDIR%{_sysconfdir}/aide.conf
sleep 2 sleep 2
sync sync
sleep 2 sleep 2
$TESTDIR/usr/bin/aide -c $TESTDIR/etc/aide.conf --init $TESTDIR/usr/bin/aide -c $TESTDIR%{_sysconfdir}/aide.conf --init
mv $TESTDIR/var/lib/aide/aide.db.new $TESTDIR/var/lib/aide/aide.db mv $TESTDIR%{_localstatedir}/lib/aide/aide.db.new $TESTDIR%{_localstatedir}/lib/aide/aide.db
$TESTDIR/usr/bin/aide -c $TESTDIR/etc/aide.conf --check --verbose $TESTDIR/usr/bin/aide -c $TESTDIR%{_sysconfdir}/aide.conf --check --verbose
rm -rf $TESTDIR rm -rf $TESTDIR
%files %files
%defattr(-,root,root) %license COPYING
%doc AUTHORS COPYING ChangeLog NEWS README doc/manual* aide.* doc/examples %doc AUTHORS ChangeLog NEWS README doc/manual* doc/examples
%{_prefix}/bin/aide %{_bindir}/aide
/%{_mandir}/man1/aide.1.gz /%{_mandir}/man1/aide.1.gz
/%{_mandir}/man5/aide.conf.5.gz /%{_mandir}/man5/aide.conf.5.gz
/var/lib/aide %{_localstatedir}/lib/aide
%config(noreplace) /etc/aide.conf %config(noreplace) %{_sysconfdir}/aide.conf
%files test %files test
%defattr(-,root,root) %{_bindir}/aide-test.sh
/usr/bin/aide-test.sh
%changelog %changelog