gentoo resync : 04.05.2021

6 files changed, 3 insertions, 302 deletions

diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index dc487d798031..25a2f1275e75 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1,14 +1,9 @@
-AUX aide-0.16-add-missing-include.patch 512 BLAKE2B c3c25bbad549f8d2864b4ce91f33ee424ba4e64d40c967be23721324f017642557319d12aea980930882a10dbc39c17b0359de31e5cf5b7a1f9ef6a0b6088148 SHA512 084be3c787a19f57bf140cd809df61edfd16a8798a1344adeee0aba0f4207c1e4a9c47c4c6d7606650e20cc202747208c0f0c00c21c0b68e1b739fb9d269da68
 AUX aide-0.16-fix-LIBS-LDFLAGS-mixing.patch 874 BLAKE2B e61f6b269dcc3679d68714c315cfff8e8feb4146028abc33e780cb7429c4466c78b7e50c427fb78ffdc310335450a012f7a08b6ecd5aaf562b8ab18565c5f927 SHA512 930967c1c7be54d10beb26e4281083a0f7cf500a5f161cf2af6c0a7b377e9bce092942a3a88c6cbb080e3eab500ec8a7bec1ff295f774ef70146240837961a8f
 AUX aide-0.16-fix-acl-configure-option.patch 728 BLAKE2B a4edf60d7ffbae5f624645dd48f6cce0da6bd228d2b8aa04b08b1a2270fb9fb420175270a694ea225b2ccca6a1e4524001b042e12eb671b9758653c83893a7ee SHA512 65b93cd01ebfe6696e35872bc012126794e5e1e5756c2ce041d9a914722806f6079274b0fbb64bc795488f530c33106deba204ee2982a5a8d485b7cd88382497
-AUX aide-0.16-support-attr-2.4.48.patch 907 BLAKE2B 9d5c2c13a59c8ea1489e5353a2715926b7c0de2292050de166ea7959955a733487d68d047c23382370ccf2e91ea25dd5e4ffc6c55f47768e58da25775843133b SHA512 ea12a1aadc8ac8720dd5495318a0706f720422cdd0a7e7f6d794db4291b9a735468b7a1783922a1e489b738436a5d6e324d3ec66dc40b9b2b09d08ce4b3409e0
 AUX aide-0.16.2_p20200614_define_hash_use_gcrypt.patch 1174 BLAKE2B 694c7859a43f814f1b9ab18c0e0fa458bdbc6ebc0fb1d076cf51839cf48c341f13b84ae08c2ef419a62b53ffe12879fa2b230f546e57c89a5816fd4d2bff902b SHA512 ec31e674141feb03fbe4eb94c82f2c7b366bd31c4d845818650303c7e971ff9c814de8112c818da9de78bb32ca087f75ff313f35d18301775915ecc8b9975e52
-AUX aide.conf 2713 BLAKE2B c6868a81450bb3e66d73a60df258e0c6e1166fb0126a0664cf78db021fb4c32049d92032f8ba92b0c08b58e0267ccafcc6e948daed69a856db2703991776f977 SHA512 cf6c17ab40b0bf9a0fb21ce015c6c35a8f7a595fdeb7d67e793424ed5243660a56cb33c1169038f4b116463cb055a48232f33db8ed497181be4e084449632b28
 AUX aide.conf-r1 3194 BLAKE2B a911d5623adb4122cae21494c5e7542adbfa787bda78f840e1385219adfec19c5a3079b34e16f2c8e9afbe8554b6fc2ae291f7bdd1728b8ac77c7b16135260ae SHA512 24f6af48767e4edd69c4b806c418501583f03574f05bbf87e98659ba36b64acf8e95a772ce690175071127910248a9c6761392ca889cfee235a475341d3a7a77
 AUX aide.cron 5997 BLAKE2B 2273eb902b9ba8fc5e999375d0dfa59e2c5c56a919bf3bd06e7b638213332b34c4a1240c717c2189f787dc249847f7115e2a21ac139b5db1df2151ade9f5a154 SHA512 0931c1b9185e0b9a563c3589858b0ba20716344f29d6d1fc7226498f3c744af1d3c3fd72824f101f9b3e08710f443c9fdad312e28c0bcb93665d1dcb076f4b47
 AUX aideinit 2949 BLAKE2B 244aaec9a38f19c6a7af706572a896e922215d6321aee4537ef5ce47326f41fd84880331a86ec71dcf7ee4e2ac2a11bf979ce66eff73dd2e8a2072e9eb7e8aab SHA512 a6bce52432251458b977fb363d5801206c273fb9404c55f7bcb82b9d5a65aa19d1660d61d457c9af87f1a8fada95e2f8203489b1876b2b2a259e6374e15cdc57
 DIST aide-0.16.2_p20200614.tar.gz 144202 BLAKE2B a2533eaf0dd6caa82718eaa89878ddc101f64767788eeac3a250ceb584a2c5958ef8a5481b89eeb720e21af07da8f3576fb46d8ee9966fd2361354a35a7eaa6e SHA512 f5f83b8401465471043c60aeb6314f7bcab24c9f962f6ce550445bec8d866a5c8c00eba9e9f157f1223cde58631de139533c7de64fb3c861a5d8e7b5e367e106
-DIST aide-0.16.tar.gz 391009 BLAKE2B 8769d8c6bdf72f307b75f3c1feaa2effdeaead00a0c65ab25bbb50dc6f7c7b53fda4d0a3a54dd5030de1444a34a81c294437d45193aeb8aec7ef0af83a173d47 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
-EBUILD aide-0.16-r1.ebuild 3217 BLAKE2B 584426773393f8bcf477bf01e8bc5a5e3bc4c2570dd7e2c7a6c1f1360a0e88c7db45c9bd5d79a6fe2bd95df172b99c7dab9adfc2f1f8ba94f28d94da83efd19b SHA512 2fcb2cedc8fd85654d00fb96ad66e009417e65cefa1d23f316993305389fd3f7bc49c7a5ba768cc97bfe9b39fde3ad47dfa8c159376954f23f5ce2d99dc35e14
-EBUILD aide-0.16.2_p20200614.ebuild 3838 BLAKE2B b4d62f2d763151c53367e512bdc769f6befa959ef29a701709de6b4ba666a48abd3e2ea8079f8d45d6063cba82b17fa6f72e50ecb37570acc8cdbbb335aaefc8 SHA512 8608ff464885243b68dac665a028decd55c5a3d61c4b0c2465edc1d5289a0479c29128770ea089fe5eb60b9dd7310702658a5c241361c73c6c54468c63be71e0
+EBUILD aide-0.16.2_p20200614.ebuild 3836 BLAKE2B 29ac2e585bbeaf41772fd1518232b68c069e7d2aefa2c01039d2d6ddc7e90b59f4cdfb1708b7f47e49e33d609bf65b3d6539d17dea483ebf0e8ecd7a30e87bea SHA512 11f6f63d4f617e28aed443f874a2dfbf4e6636ae95fae6cf28472f1deab105dcb0e30c8ca1005a1065867c7a303b0f53080857a3b1a06ebbcb981981f9dd9d9e
 MISC metadata.xml 625 BLAKE2B cbea6e2630056b936f6deac53cd688f51cc014bbef024f1fff0d0cc48363e434ca080b56461907a3844d8d07a5837298b55c09734a582c25f281fbf67857b215 SHA512 e77cdd24332e19b825d4135c1aa9a5f5ea6bf1bda882675958d968d4df4300bc3957d02f18f37dc9387e046ae7de51cf268a88f29cd83a9ec838edd25a55463d
diff --git a/app-forensics/aide/aide-0.16-r1.ebuild b/app-forensics/aide/aide-0.16-r1.ebuild
deleted file mode 100644
index 56e81d587271..000000000000
--- a/app-forensics/aide/aide-0.16-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools readme.gentoo-r1
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="acl audit curl e2fs mhash postgres prelink selinux xattr zlib"
-
-COMMON_DEPEND="
-	!mhash? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	mhash? ( app-crypt/mhash )
-	dev-libs/libpcre
-	acl? ( virtual/acl )
-	audit? ( sys-process/audit )
-	curl? ( net-misc/curl )
-	e2fs? ( sys-fs/e2fsprogs )
-	postgres? ( dev-db/postgresql:= )
-	prelink? ( dev-libs/elfutils )
-	selinux? ( sys-libs/libselinux )
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	prelink? ( sys-devel/prelink )
-	selinux? ( sec-policy/selinux-aide )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	postgres? ( !mhash )
-"
-
-HTML_DOCS=( doc/manual.html )
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-Example configuration file was installed at '${EPREFIX}/etc/aide/aide.conf'.
-Please edit it to meet your needs. Refer to aide.conf(5) manual page
-for more information.
-
-A helper script, aideinit, was installed and can be used to make AIDE
-management easier. Please run 'aideinit --help' for more information.
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-add-missing-include.patch"
-	"${FILESDIR}/${P}-fix-LIBS-LDFLAGS-mixing.patch"
-	"${FILESDIR}/${P}-fix-acl-configure-option.patch"
-	"${FILESDIR}/${P}-support-attr-2.4.48.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-	sed -i -e 's| -Werror||g' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--with-confighmactype="sha512"		# Override default weak MD5 hash.
-		--with-dbhmackey="sha512"			# Override default weak MD5 hash.
-		# Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/
-		# This doesn't affect anything because there are no localizations yet.
-		--without-locale
-		--disable-static
-		$(use_with zlib)
-		$(use_with curl)
-		$(use_with acl posix-acl)
-		$(use_with selinux)
-		$(use_with prelink prelink "${EPREFIX}/usr/sbin/prelink")
-		$(use_with xattr)
-		$(use_with e2fs e2fsattrs)
-		$(use_with mhash mhash)
-		$(use_with !mhash gcrypt)
-		$(use_with postgres psql)
-		$(use_with audit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default_src_install
-	readme.gentoo_create_doc
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/aide.conf
-
-	dosbin "${FILESDIR}"/aideinit
-	dodoc "${FILESDIR}"/aide.cron
-
-	keepdir /var/{lib,log}/${PN}
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if use postgres; then
-		elog
-		elog "Due to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog
-		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "  where pg_class.relname='TABLE_pkey' and \ "
-		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog
-		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "in your aide.conf."
-		elog
-	fi
-}
diff --git a/app-forensics/aide/aide-0.16.2_p20200614.ebuild b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
index 4daf1f2b555d..1089cf44d87c 100644
--- a/app-forensics/aide/aide-0.16.2_p20200614.ebuild
+++ b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aide/aide/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="acl audit curl e2fs mhash postgres prelink selinux xattr zlib"
 
 REQUIRED_USE="
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
deleted file mode 100644
index 75f0403c968e..000000000000
--- a/app-forensics/aide/files/aide-0.16-add-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 1cbb888d55388d6bb88141c946bd6993b3e9872f
-Author: Ilya Tumaykin <itumaykin@gmail.com>
-Date:   Tue May 23 17:24:29 2017 +0300
-
-db: add missing include
-
-url_fclose() function used in this file is defined in fopen.h.
-See https://sourceforge.net/p/aide/bugs/99/
-
-diff --git a/src/db.c b/src/db.c
-index dd133d4..858240d 100644
---- a/src/db.c
-+++ b/src/db.c
-@@ -28,6 +28,10 @@
- #include "db_disk.h"
- #include "md.h"
-
-+#ifdef WITH_CURL
-+#include "fopen.h"
-+#endif
-+
- #ifdef WITH_PSQL
- #include "db_sql.h"
- #endif
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
deleted file mode 100644
index 8acb6e5b56b0..000000000000
--- a/app-forensics/aide/files/aide-0.16-support-attr-2.4.48.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix build against attr >= 2.4.48
-
-Drop obsolete attr/xattr.h include as did attr upstream in attr-2.4.48.
-See http://git.savannah.nongnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38
-
-ENOATTR definition was moved to attr/attributes.h, thus include it.
-attr < 2.4.48 keeps ENOATTR definition in attr/xattr.h, so define it
-manually if necessary in order to preserve backwards compatibility.
-
-Bug: https://bugs.gentoo.org/648966
-Upstream-bug: https://sourceforge.net/p/aide/patches/23/
-
-diff --git a/include/db_config.h b/include/db_config.h
-index e92fe1c..7e5ff0d 100644
---- a/include/db_config.h
-+++ b/include/db_config.h
-@@ -62,7 +62,10 @@ typedef struct acl_type {
-
- #ifdef WITH_XATTR /* Do generic user Xattrs. */
- #include <sys/xattr.h>
--#include <attr/xattr.h>
-+#include <attr/attributes.h>
-+#ifndef ENOATTR
-+# define ENOATTR ENODATA
-+#endif
- #endif
-
- typedef struct xattr_node 
diff --git a/app-forensics/aide/files/aide.conf b/app-forensics/aide/files/aide.conf
deleted file mode 100644
index cef1813db9f8..000000000000
--- a/app-forensics/aide/files/aide.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-# AIDE conf
-
-database=file:/var/lib/aide/aide.db
-database_out=file:/var/lib/aide/aide.db.new
-
-# Change this to "no" or remove it to not gzip output
-# (only useful on systems with few CPU cycles to spare)
-gzip_dbout=yes
-
-# Here are all the things we can check - these are the default rules 
-#
-#p:      permissions
-#i:      inode
-#n:      number of links
-#u:      user
-#g:      group
-#s:      size
-#b:      block count
-#m:      mtime
-#a:      atime
-#c:      ctime
-#S:      check for growing size
-#md5:    md5 checksum
-#sha1:   sha1 checksum
-#rmd160: rmd160 checksum
-#tiger:  tiger checksum
-#R:      p+i+n+u+g+s+m+c+md5
-#L:      p+i+n+u+g
-#E:      Empty group
-#>:      Growing logfile p+u+g+i+n+S
-#haval:         haval checksum
-#gost:          gost checksum
-#crc32:         crc32 checksum
-
-# Defines formerly set here have been moved to /etc/default/aide.
-
-# Custom rules
-Binlib = p+i+n+u+g+s+b+m+c+md5+sha1
-ConfFiles = p+i+n+u+g+s+b+m+c+md5+sha1
-Logs = p+i+n+u+g+S
-Devices = p+i+n+u+g+s+b+c+md5+sha1
-Databases = p+n+u+g
-StaticDir = p+i+n+u+g
-ManPages = p+i+n+u+g+s+b+m+c+md5+sha1
-
-# Next decide what directories/files you want in the database
-
-# Kernel, system map, etc.
-=/boot$ Binlib
-# Binaries
-/bin Binlib
-/sbin Binlib
-/usr/bin Binlib
-/usr/sbin Binlib
-/usr/local/bin Binlib
-/usr/local/sbin Binlib
-#/usr/games Binlib
-# Libraries
-/lib Binlib
-/usr/lib Binlib
-/usr/local/lib Binlib
-# Log files
-=/var/log$ StaticDir
-#!/var/log/ksymoops
-/var/log/aide/aide.log(.[0-9])?(.gz)? Databases
-/var/log/aide/error.log(.[0-9])?(.gz)? Databases
-#/var/log/setuid.changes(.[0-9])?(.gz)? Databases
-!/var/log/aide
-/var/log Logs
-# Devices
-!/dev/pts
-# If you get spurious warnings about being unable to mmap() /dev/cpu/mtrr,
-# you may uncomment this to get rid of them. They're harmless but sometimes
-# annoying.
-#!/dev/cpu/mtrr
-#!/dev/xconsole
-/dev Devices
-# Other miscellaneous files
-/var/run$ StaticDir
-!/var/run
-# Test only the directory when dealing with /proc
-/proc$ StaticDir
-!/proc
-
-# You can look through these examples to get further ideas
-
-# MD5 sum files - especially useful with debsums -g
-#/var/lib/dpkg/info/([^\.]+).md5sums u+g+s+m+md5+sha1
-
-# Check crontabs
-#/var/spool/anacron/cron.daily Databases
-#/var/spool/anacron/cron.monthly Databases
-#/var/spool/anacron/cron.weekly Databases
-#/var/spool/cron Databases
-#/var/spool/cron/crontabs Databases
-
-# manpages can be trojaned, especially depending on *roff implementation
-#/usr/man ManPages
-#/usr/share/man ManPages
-#/usr/local/man ManPages
-
-# docs
-#/usr/doc ManPages
-#/usr/share/doc ManPages
-
-# check users' home directories
-#/home Binlib
-
-# check sources for modifications
-#/usr/src L
-#/usr/local/src L
-
-# Check headers for same
-#/usr/include L
-#/usr/local/include L