Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/
Date: Tue, 04 May 2021 08:17:31
Message-Id: 1620116232.1c4f0c458a33a1f5beb5bda9fe54e9931a6b6e24.asturm@gentoo
1 commit: 1c4f0c458a33a1f5beb5bda9fe54e9931a6b6e24
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 4 08:16:09 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue May 4 08:17:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4f0c45
7
8 app-forensics/aide: Drop 0.16-r1, EAPI6--
9
10 Bug: https://bugs.gentoo.org/787983
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 app-forensics/aide/Manifest | 1 -
15 app-forensics/aide/aide-0.16-r1.ebuild | 127 ---------------------
16 .../aide/files/aide-0.16-add-missing-include.patch | 24 ----
17 .../aide/files/aide-0.16-support-attr-2.4.48.patch | 28 -----
18 app-forensics/aide/files/aide.conf | 115 -------------------
19 5 files changed, 295 deletions(-)
20
21 diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
22 index adae5e37bdc..3123f6ddcfd 100644
23 --- a/app-forensics/aide/Manifest
24 +++ b/app-forensics/aide/Manifest
25 @@ -1,2 +1 @@
26 DIST aide-0.16.2_p20200614.tar.gz 144202 BLAKE2B a2533eaf0dd6caa82718eaa89878ddc101f64767788eeac3a250ceb584a2c5958ef8a5481b89eeb720e21af07da8f3576fb46d8ee9966fd2361354a35a7eaa6e SHA512 f5f83b8401465471043c60aeb6314f7bcab24c9f962f6ce550445bec8d866a5c8c00eba9e9f157f1223cde58631de139533c7de64fb3c861a5d8e7b5e367e106
27 -DIST aide-0.16.tar.gz 391009 BLAKE2B 8769d8c6bdf72f307b75f3c1feaa2effdeaead00a0c65ab25bbb50dc6f7c7b53fda4d0a3a54dd5030de1444a34a81c294437d45193aeb8aec7ef0af83a173d47 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
28
29 diff --git a/app-forensics/aide/aide-0.16-r1.ebuild b/app-forensics/aide/aide-0.16-r1.ebuild
30 deleted file mode 100644
31 index 56e81d58727..00000000000
32 --- a/app-forensics/aide/aide-0.16-r1.ebuild
33 +++ /dev/null
34 @@ -1,127 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -inherit autotools readme.gentoo-r1
41 -
42 -DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
43 -HOMEPAGE="http://aide.sourceforge.net/"
44 -SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
45 -
46 -LICENSE="GPL-2"
47 -SLOT="0"
48 -KEYWORDS="amd64 x86"
49 -IUSE="acl audit curl e2fs mhash postgres prelink selinux xattr zlib"
50 -
51 -COMMON_DEPEND="
52 - !mhash? (
53 - dev-libs/libgcrypt:0=
54 - dev-libs/libgpg-error
55 - )
56 - mhash? ( app-crypt/mhash )
57 - dev-libs/libpcre
58 - acl? ( virtual/acl )
59 - audit? ( sys-process/audit )
60 - curl? ( net-misc/curl )
61 - e2fs? ( sys-fs/e2fsprogs )
62 - postgres? ( dev-db/postgresql:= )
63 - prelink? ( dev-libs/elfutils )
64 - selinux? ( sys-libs/libselinux )
65 - xattr? ( sys-apps/attr )
66 - zlib? ( sys-libs/zlib )
67 -"
68 -RDEPEND="
69 - ${COMMON_DEPEND}
70 - prelink? ( sys-devel/prelink )
71 - selinux? ( sec-policy/selinux-aide )
72 -"
73 -DEPEND="${COMMON_DEPEND}
74 - sys-devel/bison
75 - sys-devel/flex
76 - virtual/pkgconfig
77 -"
78 -
79 -REQUIRED_USE="
80 - postgres? ( !mhash )
81 -"
82 -
83 -HTML_DOCS=( doc/manual.html )
84 -
85 -DISABLE_AUTOFORMATTING=1
86 -DOC_CONTENTS="
87 -Example configuration file was installed at '${EPREFIX}/etc/aide/aide.conf'.
88 -Please edit it to meet your needs. Refer to aide.conf(5) manual page
89 -for more information.
90 -
91 -A helper script, aideinit, was installed and can be used to make AIDE
92 -management easier. Please run 'aideinit --help' for more information.
93 -"
94 -
95 -PATCHES=(
96 - "${FILESDIR}/${P}-add-missing-include.patch"
97 - "${FILESDIR}/${P}-fix-LIBS-LDFLAGS-mixing.patch"
98 - "${FILESDIR}/${P}-fix-acl-configure-option.patch"
99 - "${FILESDIR}/${P}-support-attr-2.4.48.patch"
100 -)
101 -
102 -src_prepare() {
103 - default_src_prepare
104 - sed -i -e 's| -Werror||g' configure.ac || die
105 - eautoreconf
106 -}
107 -
108 -src_configure() {
109 - local myeconfargs=(
110 - --sysconfdir="${EPREFIX}/etc/${PN}"
111 - --with-confighmactype="sha512" # Override default weak MD5 hash.
112 - --with-dbhmackey="sha512" # Override default weak MD5 hash.
113 - # Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/
114 - # This doesn't affect anything because there are no localizations yet.
115 - --without-locale
116 - --disable-static
117 - $(use_with zlib)
118 - $(use_with curl)
119 - $(use_with acl posix-acl)
120 - $(use_with selinux)
121 - $(use_with prelink prelink "${EPREFIX}/usr/sbin/prelink")
122 - $(use_with xattr)
123 - $(use_with e2fs e2fsattrs)
124 - $(use_with mhash mhash)
125 - $(use_with !mhash gcrypt)
126 - $(use_with postgres psql)
127 - $(use_with audit)
128 - )
129 - econf "${myeconfargs[@]}"
130 -}
131 -
132 -src_install() {
133 - default_src_install
134 - readme.gentoo_create_doc
135 -
136 - insinto /etc/${PN}
137 - doins "${FILESDIR}"/aide.conf
138 -
139 - dosbin "${FILESDIR}"/aideinit
140 - dodoc "${FILESDIR}"/aide.cron
141 -
142 - keepdir /var/{lib,log}/${PN}
143 -}
144 -
145 -pkg_postinst() {
146 - readme.gentoo_print_elog
147 -
148 - if use postgres; then
149 - elog
150 - elog "Due to a bad assumption by aide, you must issue the following"
151 - elog "command after the database initialization (aide --init ...):"
152 - elog
153 - elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
154 - elog " where pg_class.relname='TABLE_pkey' and \ "
155 - elog ' pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
156 - elog
157 - elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
158 - elog "in your aide.conf."
159 - elog
160 - fi
161 -}
162
163 diff --git a/app-forensics/aide/files/aide-0.16-add-missing-include.patch b/app-forensics/aide/files/aide-0.16-add-missing-include.patch
164 deleted file mode 100644
165 index 75f0403c968..00000000000
166 --- a/app-forensics/aide/files/aide-0.16-add-missing-include.patch
167 +++ /dev/null
168 @@ -1,24 +0,0 @@
169 -commit 1cbb888d55388d6bb88141c946bd6993b3e9872f
170 -Author: Ilya Tumaykin <itumaykin@×××××.com>
171 -Date: Tue May 23 17:24:29 2017 +0300
172 -
173 -db: add missing include
174 -
175 -url_fclose() function used in this file is defined in fopen.h.
176 -See https://sourceforge.net/p/aide/bugs/99/
177 -
178 -diff --git a/src/db.c b/src/db.c
179 -index dd133d4..858240d 100644
180 ---- a/src/db.c
181 -+++ b/src/db.c
182 -@@ -28,6 +28,10 @@
183 - #include "db_disk.h"
184 - #include "md.h"
185 -
186 -+#ifdef WITH_CURL
187 -+#include "fopen.h"
188 -+#endif
189 -+
190 - #ifdef WITH_PSQL
191 - #include "db_sql.h"
192 - #endif
193
194 diff --git a/app-forensics/aide/files/aide-0.16-support-attr-2.4.48.patch b/app-forensics/aide/files/aide-0.16-support-attr-2.4.48.patch
195 deleted file mode 100644
196 index 8acb6e5b56b..00000000000
197 --- a/app-forensics/aide/files/aide-0.16-support-attr-2.4.48.patch
198 +++ /dev/null
199 @@ -1,28 +0,0 @@
200 -Fix build against attr >= 2.4.48
201 -
202 -Drop obsolete attr/xattr.h include as did attr upstream in attr-2.4.48.
203 -See http://git.savannah.nongnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38
204 -
205 -ENOATTR definition was moved to attr/attributes.h, thus include it.
206 -attr < 2.4.48 keeps ENOATTR definition in attr/xattr.h, so define it
207 -manually if necessary in order to preserve backwards compatibility.
208 -
209 -Bug: https://bugs.gentoo.org/648966
210 -Upstream-bug: https://sourceforge.net/p/aide/patches/23/
211 -
212 -diff --git a/include/db_config.h b/include/db_config.h
213 -index e92fe1c..7e5ff0d 100644
214 ---- a/include/db_config.h
215 -+++ b/include/db_config.h
216 -@@ -62,7 +62,10 @@ typedef struct acl_type {
217 -
218 - #ifdef WITH_XATTR /* Do generic user Xattrs. */
219 - #include <sys/xattr.h>
220 --#include <attr/xattr.h>
221 -+#include <attr/attributes.h>
222 -+#ifndef ENOATTR
223 -+# define ENOATTR ENODATA
224 -+#endif
225 - #endif
226 -
227 - typedef struct xattr_node
228
229 diff --git a/app-forensics/aide/files/aide.conf b/app-forensics/aide/files/aide.conf
230 deleted file mode 100644
231 index cef1813db9f..00000000000
232 --- a/app-forensics/aide/files/aide.conf
233 +++ /dev/null
234 @@ -1,115 +0,0 @@
235 -# AIDE conf
236 -
237 -database=file:/var/lib/aide/aide.db
238 -database_out=file:/var/lib/aide/aide.db.new
239 -
240 -# Change this to "no" or remove it to not gzip output
241 -# (only useful on systems with few CPU cycles to spare)
242 -gzip_dbout=yes
243 -
244 -# Here are all the things we can check - these are the default rules
245 -#
246 -#p: permissions
247 -#i: inode
248 -#n: number of links
249 -#u: user
250 -#g: group
251 -#s: size
252 -#b: block count
253 -#m: mtime
254 -#a: atime
255 -#c: ctime
256 -#S: check for growing size
257 -#md5: md5 checksum
258 -#sha1: sha1 checksum
259 -#rmd160: rmd160 checksum
260 -#tiger: tiger checksum
261 -#R: p+i+n+u+g+s+m+c+md5
262 -#L: p+i+n+u+g
263 -#E: Empty group
264 -#>: Growing logfile p+u+g+i+n+S
265 -#haval: haval checksum
266 -#gost: gost checksum
267 -#crc32: crc32 checksum
268 -
269 -# Defines formerly set here have been moved to /etc/default/aide.
270 -
271 -# Custom rules
272 -Binlib = p+i+n+u+g+s+b+m+c+md5+sha1
273 -ConfFiles = p+i+n+u+g+s+b+m+c+md5+sha1
274 -Logs = p+i+n+u+g+S
275 -Devices = p+i+n+u+g+s+b+c+md5+sha1
276 -Databases = p+n+u+g
277 -StaticDir = p+i+n+u+g
278 -ManPages = p+i+n+u+g+s+b+m+c+md5+sha1
279 -
280 -# Next decide what directories/files you want in the database
281 -
282 -# Kernel, system map, etc.
283 -=/boot$ Binlib
284 -# Binaries
285 -/bin Binlib
286 -/sbin Binlib
287 -/usr/bin Binlib
288 -/usr/sbin Binlib
289 -/usr/local/bin Binlib
290 -/usr/local/sbin Binlib
291 -#/usr/games Binlib
292 -# Libraries
293 -/lib Binlib
294 -/usr/lib Binlib
295 -/usr/local/lib Binlib
296 -# Log files
297 -=/var/log$ StaticDir
298 -#!/var/log/ksymoops
299 -/var/log/aide/aide.log(.[0-9])?(.gz)? Databases
300 -/var/log/aide/error.log(.[0-9])?(.gz)? Databases
301 -#/var/log/setuid.changes(.[0-9])?(.gz)? Databases
302 -!/var/log/aide
303 -/var/log Logs
304 -# Devices
305 -!/dev/pts
306 -# If you get spurious warnings about being unable to mmap() /dev/cpu/mtrr,
307 -# you may uncomment this to get rid of them. They're harmless but sometimes
308 -# annoying.
309 -#!/dev/cpu/mtrr
310 -#!/dev/xconsole
311 -/dev Devices
312 -# Other miscellaneous files
313 -/var/run$ StaticDir
314 -!/var/run
315 -# Test only the directory when dealing with /proc
316 -/proc$ StaticDir
317 -!/proc
318 -
319 -# You can look through these examples to get further ideas
320 -
321 -# MD5 sum files - especially useful with debsums -g
322 -#/var/lib/dpkg/info/([^\.]+).md5sums u+g+s+m+md5+sha1
323 -
324 -# Check crontabs
325 -#/var/spool/anacron/cron.daily Databases
326 -#/var/spool/anacron/cron.monthly Databases
327 -#/var/spool/anacron/cron.weekly Databases
328 -#/var/spool/cron Databases
329 -#/var/spool/cron/crontabs Databases
330 -
331 -# manpages can be trojaned, especially depending on *roff implementation
332 -#/usr/man ManPages
333 -#/usr/share/man ManPages
334 -#/usr/local/man ManPages
335 -
336 -# docs
337 -#/usr/doc ManPages
338 -#/usr/share/doc ManPages
339 -
340 -# check users' home directories
341 -#/home Binlib
342 -
343 -# check sources for modifications
344 -#/usr/src L
345 -#/usr/local/src L
346 -
347 -# Check headers for same
348 -#/usr/include L
349 -#/usr/local/include L