* [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/
@ 2016-01-02 21:05 Manuel Rüger
0 siblings, 0 replies; 8+ messages in thread
From: Manuel Rüger @ 2016-01-02 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 4ebb7a0d2617997a5b42187b67aabef2472f1663
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 2 21:01:38 2016 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Jan 2 21:04:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ebb7a0d
app-forensics/aide: Remove old
Package-Manager: portage-2.2.26
app-forensics/aide/Manifest | 1 -
app-forensics/aide/aide-0.13.1-r3.ebuild | 146 --------------------
app-forensics/aide/aide-0.13.1-r5.ebuild | 152 ---------------------
app-forensics/aide/aide-0.13.1.ebuild | 141 -------------------
.../aide/files/aide-0.13.1-as-needed.patch | 36 -----
.../aide/files/aide-0.13.1-configure.patch | 74 ----------
.../aide/files/aide-0.13.1-equ-matching.patch | 83 -----------
app-forensics/aide/files/aide-0.13.1-gentoo.patch | 36 -----
.../aide/files/aide-0.13.1-libgrypt_init.patch | 49 -------
app-forensics/aide/files/aide-0.13.1-zlib.patch | 12 --
10 files changed, 730 deletions(-)
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index fa9310f..6c9b019 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1,3 +1,2 @@
-DIST aide-0.13.1.tar.gz 285400 SHA256 b55065413bad3c24af51a551e6ab7cd4a9ecd9f449929261a45fc2f53e040021 SHA512 ac0e49c49d1a4229cf473a60e9acd8e7dc7c3ee7c2d436a3b3d486131753fd914a73695675de6e7f9bb5cdadb2ed64760a9e834c935fb1a5c65bae0d7efa2946 WHIRLPOOL 5d7ee3b2a062c2c91e603c72ed1d76a1fc9d16f13e8253bab0b5f6335de239ef7e44c453ffe22da86f5b0bc8a69e0bf6276a4a52a1928339899298f07f1769df
DIST aide-0.14.2.tar.gz 418098 SHA256 bf4cd417b0f4778b4f9a618d23e0b0b7db10349ba6a0129394dc82fbc2fa8b9b SHA512 4ef96078fde057a54dda467fb55711e30d947969873715a02052362c57112f5bfd3155460ef353f70ce69fea3a3c491b7925bebbdb7034dbf618c63c360347df WHIRLPOOL fa91e4493bcac4cf11a8fedfd5e3c490752936f9ea04871d812b831f33089b694892e32ed19cef273926d3a8c091fb15a7b98a5e5303f08609f164773475d142
DIST aide-0.15.1.tar.gz 424970 SHA256 303e5c186257df8c86e418193199f4ea2183fc37d3d4a9098a614f61346059ef SHA512 6afe327474858c697ba017b02bd40717c33874e69b801c171c2496ff9042b557e840bef4a151bda0e4d835ddb0d972b88790237a72f250525dc1fc6b8fa673e7 WHIRLPOOL 4c21221cfbaeff3aa00a3f22c4e31c1fffd3f00d112828540ab6ab94dd019086244de71e5d19d1120078acc7b81b9efa5a36d55937292f523bcb4e064830ba6a
diff --git a/app-forensics/aide/aide-0.13.1-r3.ebuild b/app-forensics/aide/aide-0.13.1-r3.ebuild
deleted file mode 100644
index 341e5d3..0000000
--- a/app-forensics/aide/aide-0.13.1-r3.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit autotools eutils
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="acl curl mhash nls postgres selinux static xattr zlib"
-#IUSE="acl audit curl mhash nls postgres selinux static xattr zlib"
-
-# libsandbox: Can't dlopen libc: (null)
-RESTRICT="test"
-
-DEPEND="acl? ( sys-apps/acl )
- curl? ( net-misc/curl )
- mhash? ( >=app-crypt/mhash-0.9.2 )
- !mhash? ( dev-libs/libgcrypt )
- nls? ( virtual/libintl )
- postgres? ( dev-db/postgresql )
- selinux? (
- sys-libs/libselinux
- sec-policy/selinux-aide
- )
- xattr? ( sys-apps/attr )
- zlib? ( sys-libs/zlib )"
-# audit? ( sys-process/audit )
-
-RDEPEND="!static? ( ${DEPEND} )"
-
-DEPEND="${DEPEND}
- nls? ( sys-devel/gettext )
- sys-devel/bison
- sys-devel/flex"
-
-pkg_setup() {
- if use mhash && use postgres ; then
- eerror "We cannot emerge aide with mhash and postgres USE flags at the same time."
- eerror "Please remove mhash OR postgres USE flags."
- die "Please remove either mhash or postgres USE flag."
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-gentoo.patch"
-
- # fix configure switch
- epatch "${FILESDIR}/${P}-configure.patch"
-
- # fix equal match issue, bug #204217
- epatch "${FILESDIR}/${P}-equ-matching.patch"
-
- # fix libgcrypt issue, bug #266175
- epatch "${FILESDIR}/${P}-libgrypt_init.patch"
-
- if ! use mhash ; then
- # dev-libs/libgcrypt doesn't support whirlpool algorithm
- sed -i -e 's/\+whirlpool//' doc/aide.conf.in || die
- fi
-
- if ! use selinux ; then
- sed -i -e 's/\+selinux//' doc/aide.conf.in || die
- fi
-
- if ! use xattr ; then
- sed -i -e 's/\+xattrs//' doc/aide.conf.in || die
- fi
-
- if ! use acl ; then
- sed -i -e 's/\+acl//' doc/aide.conf.in || die
- fi
-
- eautoreconf
-}
-
-src_compile() {
- local myconf="
- $(use_with acl posix-acl)
- $(use_with !mhash gcrypt)
- $(use_with mhash mhash)
- $(use_with nls locale)
- $(use_with postgres psql)
- $(use_with selinux)
- $(use_enable static)
- $(use_with xattr)
- $(use_with zlib)
- --sysconfdir=/etc/aide"
-# $(use_with audit)
-
- # curl doesn't work with static
- use curl && ! use static && myconf="${myconf} --with-curl"
-
- econf ${myconf} || die "econf failed"
- # parallel make borked
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- keepdir /var/lib/aide
- fowners root:0 /var/lib/aide
- fperms 0755 /var/lib/aide
-
- keepdir /var/log/aide
-
- insinto /etc/aide
- doins "${FILESDIR}"/aide.conf
-
- dosbin "${FILESDIR}"/aideinit
-
- dodoc ChangeLog AUTHORS NEWS README "${FILESDIR}"/aide.cron
- dohtml doc/manual.html
-}
-
-pkg_postinst() {
- elog
- elog "A sample configuration file has been installed as"
- elog "/etc/aide/aide.conf. Please edit to meet your needs."
- elog "Read the aide.conf(5) manual page for more information."
- elog "A helper script, aideinit, has been installed and can"
- elog "be used to make AIDE management easier. Please run"
- elog "aideinit --help for more information"
- elog
-
- if use postgres; then
- 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 "your aide.conf."
- elog
- fi
-}
diff --git a/app-forensics/aide/aide-0.13.1-r5.ebuild b/app-forensics/aide/aide-0.13.1-r5.ebuild
deleted file mode 100644
index 9acd68a..0000000
--- a/app-forensics/aide/aide-0.13.1-r5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit autotools eutils
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl curl mhash nls postgres selinux static xattr zlib"
-#IUSE="acl audit curl mhash nls postgres selinux static xattr zlib"
-
-# libsandbox: Can't dlopen libc: (null)
-RESTRICT="test"
-
-DEPEND="acl? ( sys-apps/acl )
- curl? ( net-misc/curl )
- mhash? ( >=app-crypt/mhash-0.9.2 )
- !mhash? ( dev-libs/libgcrypt )
- nls? ( virtual/libintl )
- postgres? ( dev-db/postgresql )
- selinux? (
- sys-libs/libselinux
- sec-policy/selinux-aide
- )
- xattr? ( sys-apps/attr )
- zlib? ( sys-libs/zlib )"
-# audit? ( sys-process/audit )
-
-RDEPEND="!static? ( ${DEPEND} )"
-
-DEPEND="${DEPEND}
- nls? ( sys-devel/gettext )
- sys-devel/bison
- sys-devel/flex"
-
-pkg_setup() {
- if use mhash && use postgres ; then
- eerror "We cannot emerge aide with mhash and postgres USE flags at the same time."
- eerror "Please remove mhash OR postgres USE flags."
- die "Please remove either mhash or postgres USE flag."
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-gentoo.patch"
-
- # fix configure switch
- epatch "${FILESDIR}/${P}-configure.patch"
-
- # fix equal match issue, bug #204217
- epatch "${FILESDIR}/${P}-equ-matching.patch"
-
- # fix libgcrypt issue, bug #266175
- epatch "${FILESDIR}/${P}-libgrypt_init.patch"
-
- # fix as-need issue, bug #271326
- epatch "${FILESDIR}/${P}-as-needed.patch"
-
- # fix zlib issue, bug #316665
- epatch "${FILESDIR}/${P}-zlib.patch"
-
- if ! use mhash ; then
- # dev-libs/libgcrypt doesn't support whirlpool algorithm
- sed -i -e 's/\+whirlpool//' doc/aide.conf.in || die
- fi
-
- if ! use selinux ; then
- sed -i -e 's/\+selinux//' doc/aide.conf.in || die
- fi
-
- if ! use xattr ; then
- sed -i -e 's/\+xattrs//' doc/aide.conf.in || die
- fi
-
- if ! use acl ; then
- sed -i -e 's/\+acl//' doc/aide.conf.in || die
- fi
-
- eautoreconf
-}
-
-src_compile() {
- local myconf="
- $(use_with acl posix-acl)
- $(use_with !mhash gcrypt)
- $(use_with mhash mhash)
- $(use_with nls locale)
- $(use_with postgres psql)
- $(use_with selinux)
- $(use_enable static)
- $(use_with xattr)
- $(use_with zlib)
- --sysconfdir=/etc/aide"
-# $(use_with audit)
-
- # curl doesn't work with static
- use curl && ! use static && myconf="${myconf} --with-curl"
-
- econf ${myconf} || die "econf failed"
- # parallel make borked
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- keepdir /var/lib/aide
- fowners root:0 /var/lib/aide
- fperms 0755 /var/lib/aide
-
- keepdir /var/log/aide
-
- insinto /etc/aide
- doins "${FILESDIR}"/aide.conf
-
- dosbin "${FILESDIR}"/aideinit
-
- dodoc ChangeLog AUTHORS NEWS README "${FILESDIR}"/aide.cron
- dohtml doc/manual.html
-}
-
-pkg_postinst() {
- elog
- elog "A sample configuration file has been installed as"
- elog "/etc/aide/aide.conf. Please edit to meet your needs."
- elog "Read the aide.conf(5) manual page for more information."
- elog "A helper script, aideinit, has been installed and can"
- elog "be used to make AIDE management easier. Please run"
- elog "aideinit --help for more information"
- elog
-
- if use postgres; then
- 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 "your aide.conf."
- elog
- fi
-}
diff --git a/app-forensics/aide/aide-0.13.1.ebuild b/app-forensics/aide/aide-0.13.1.ebuild
deleted file mode 100644
index 8b43d61..0000000
--- a/app-forensics/aide/aide-0.13.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils autotools
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="acl curl mhash nls postgres selinux static xattr zlib"
-#IUSE="acl audit curl mhash nls postgres selinux static xattr zlib"
-
-DEPEND="acl? ( sys-apps/acl )
- curl? ( net-misc/curl )
- mhash? ( >=app-crypt/mhash-0.9.2 )
- !mhash? ( dev-libs/libgcrypt )
- nls? ( virtual/libintl )
- postgres? ( dev-db/postgresql )
- selinux? (
- sys-libs/libselinux
- sec-policy/selinux-aide
- )
- xattr? ( sys-apps/attr )
- zlib? ( sys-libs/zlib )"
-# audit? ( sys-process/audit )
-
-RDEPEND="!static? ( ${DEPEND} )
- virtual/mailx"
-
-DEPEND="${DEPEND}
- nls? ( sys-devel/gettext )
- sys-devel/bison
- sys-devel/flex"
-
-pkg_setup() {
- if use mhash && use postgres ; then
- eerror "We cannot emerge aide with mhash and postgres USE flags at the same time."
- eerror "Please remove mhash OR postgres USE flags."
- die "Please remove either mhash or postgres USE flag."
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-gentoo.patch
-
- if ! use mhash ; then
- # dev-libs/libgcrypt doesn't support whirlpool algorithm
- sed -i -e 's/\+whirlpool//' doc/aide.conf.in || die
- fi
-
- if ! use selinux ; then
- sed -i -e 's/\+selinux//' doc/aide.conf.in || die
- fi
-
- if ! use xattr ; then
- sed -i -e 's/\+xattrs//' doc/aide.conf.in || die
- fi
-
- if ! use acl ; then
- sed -i -e 's/\+acl//' doc/aide.conf.in || die
- fi
- eautoreconf
-}
-
-src_compile() {
- local myconf="--sysconfdir=/etc/aide $(use_enable static)"
-
- # --without-* borked
- use zlib && myconf="${myconf} --with-zlib"
- use nls && myconf="${myconf} --with-locale"
- use postgres && myconf="${myconf} --with-psql"
- use selinux && myconf="${myconf} --with-selinux"
- use acl && myconf="${myconf} --with-posix-acl"
- use xattr && myconf="${myconf} --with-xattr"
-# use audit && myconf="${myconf} --with-audit"
-
- # curl doesn't work with static
- use curl && ! use static && myconf="${myconf} --with-curl"
-
- # If you use dev-libs/libgcrypt, --without-mhash is needed.
- use mhash \
- && myconf="${myconf} --with-mhash" \
- || myconf="${myconf} --with-gcrypt --without-mhash"
-
- econf ${myconf} || die
- # parallel make borked
- emake -j1 || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- keepdir /var/lib/aide
- keepdir /var/log/aide
-
- insinto /etc/aide
- doins "${FILESDIR}"/aide.conf
- # doins doc/aide.conf
-
- dosbin "${FILESDIR}"/aideinit
-
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/aide.cron
-
- dodoc ChangeLog AUTHORS NEWS README
- dohtml doc/manual.html
-}
-
-pkg_postinst() {
- chown root:0 /var/lib/aide
- chmod 0755 /var/lib/aide
-
- elog
- elog "A sample configuration file has been installed as"
- elog "/etc/aide/aide.conf. Please edit to meet your needs."
- elog "Read the aide.conf(5) manual page for more information."
- elog "A cron file has been installed in /etc/cron.daily/aide.cron"
- elog "A helper script, aideinit, has been installed and can"
- elog "be used to make AIDE management easier. Please run"
- elog "aideinit --help for more information"
- elog
-
- if use postgres; then
- 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 "your aide.conf."
- elog
- fi
-}
diff --git a/app-forensics/aide/files/aide-0.13.1-as-needed.patch b/app-forensics/aide/files/aide-0.13.1-as-needed.patch
deleted file mode 100644
index 9e0ec4d..0000000
--- a/app-forensics/aide/files/aide-0.13.1-as-needed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur aide-0.13.1.orig/configure.in aide-0.13.1/configure.in
---- aide-0.13.1.orig/configure.in 2006-12-09 06:49:21.000000000 +0900
-+++ aide-0.13.1/configure.in 2009-12-16 19:30:17.000000000 +0900
-@@ -546,12 +546,12 @@
- if test x$with_zlib = xyes; then
- AC_CHECK_HEADERS(zlib.h,,
- [AC_MSG_ERROR([You don't have zlib properly installed. Install it or try --without-zlib.])])
-- save_LDFLAGS=$LDFLAGS
-- LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
-+# saveLIBS=$LIBS
-+ LIBS="$LIBS -lz $LD_STATIC_FLAG"
- AC_CHECK_LIB(z,gzdopen,,
- [AC_MSG_ERROR([You don't have zlib properly installed. Install it or try --without-zlib.])]
- )
-- LDFLAGS=$save_LDFLAGS
-+# LIBS=$saveLIBS
- AC_DEFINE(WITH_ZLIB,1,[use zlib])
- fi
-
-@@ -565,13 +565,13 @@
- fi
- AC_CHECK_HEADERS(curl/curl.h,,
- [AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])])
--# save_LDFLAGS=$LDFLAGS
-+# saveLIBS=$LIBS
- CFLAGS="$CFLAGS $CURL_CFLAGS"
-- LDFLAGS="$LDFLAGS $CURL_LIBS $LD_STATIC_FLAG"
-+ LIBS="$LIBS $CURL_LIBS $LD_STATIC_FLAG"
- AC_CHECK_LIB(curl,curl_easy_init,havecurl=yes,
- [AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])]
- )
--# LDFLAGS=$save_LDFLAGS
-+# LIBS=$saveLIBS
- AC_DEFINE(WITH_CURL,1,[use curl])
- compoptionstring="${compoptionstring}WITH_CURL\\n"],
- fi
diff --git a/app-forensics/aide/files/aide-0.13.1-configure.patch b/app-forensics/aide/files/aide-0.13.1-configure.patch
deleted file mode 100644
index 75eb555..0000000
--- a/app-forensics/aide/files/aide-0.13.1-configure.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- configure.in.old 2008-01-26 15:07:28.000000000 +0100
-+++ configure.in 2008-01-26 15:14:05.000000000 +0100
-@@ -160,7 +160,9 @@
- fi
-
- # Check whether static linking has explicitly been disabled
--AC_ARG_ENABLE(static,[ --disable-static Disable static linking (lowers the security of aide)], [aide_static_choice=$enableval], [aide_static_choice=yes])
-+AC_ARG_ENABLE(static,
-+ AC_HELP_STRING([--disable-static],[Disable static linking (lowers the security of aide)]),
-+ [aide_static_choice=$enableval], [aide_static_choice=yes])
-
- if test "$aide_static_choice" != "yes"; then
- LD_STATIC_FLAG=""
-@@ -190,8 +192,8 @@
- AC_CHECK_FUNCS(stricmp strnstr strnlen)
-
- AC_ARG_WITH([mmap],
-- [AC_HELP_STRING([--with-mmap],
-- [use mmap @<:@default=check@:>@])],
-+ AC_HELP_STRING([--with-mmap],
-+ [use mmap @<:@default=check@:>@]),
- [],
- [with_mmap=check]
- )
-@@ -283,8 +285,8 @@
- AC_CHECK_HEADERS(syslog.h inttypes.h fcntl.h)
-
- AC_ARG_WITH([locale],
-- [AC_HELP_STRING([--with-locale],
-- [use locale stuff])],
-+ AC_HELP_STRING([--with-locale],
-+ [use locale stuff]),
- [],
- [with_locale=no]
- )
-@@ -369,10 +371,10 @@
- [AC_HELP_STRING([--with-posix-acl],
- [use POSIX ACLs (no checking)])],
- [],
-- [with_posix_acl_support=no]
-+ [with_posix_acl=no]
- )
-
--AS_IF([test "x$with_posix_acl_support" != xno],
-+AS_IF([test "x$with_posix_acl" != xno],
- [AC_DEFINE(WITH_POSIX_ACL,1,[use POSIX ACLs])
- AC_DEFINE(WITH_ACL,1,[use ACL])
- ACLLIB="-lacl"
-@@ -388,10 +390,10 @@
- [AC_HELP_STRING([--with-selinux],
- [use SELinux (no checking)])],
- [],
-- [with_selinux_support=no]
-+ [with_selinux=no]
- )
-
--AS_IF([test "x$with_selinux_support" != xno],
-+AS_IF([test "x$with_selinux" != xno],
- [AC_DEFINE(WITH_SELINUX,1,[use SELinux])
- if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists libselinux; then
- SELINUXLIB=$(${PKG_CONFIG} --libs libselinux --static)
-@@ -410,10 +412,10 @@
- [AC_HELP_STRING([--with-xattr],
- [use xattr (no checking)])],
- [],
-- [with_xattr_support=no]
-+ [with_xattr=no]
- )
-
--AS_IF([test "x$with_xattr_support" != xno],
-+AS_IF([test "x$with_xattr" != xno],
- [AC_DEFINE(WITH_XATTR,1,[use xattr])
- ATTRLIB=-lattr
- compoptionstring="${compoptionstring}WITH_XATTR\\n"
diff --git a/app-forensics/aide/files/aide-0.13.1-equ-matching.patch b/app-forensics/aide/files/aide-0.13.1-equ-matching.patch
deleted file mode 100644
index e5d02a5..0000000
--- a/app-forensics/aide/files/aide-0.13.1-equ-matching.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- src/gen_list.c.orig 2007-12-19 15:37:13.000000000 -0800
-+++ src/gen_list.c 2007-12-19 16:19:43.000000000 -0800
-@@ -732,33 +732,6 @@
- return retval;
- }
-
--//this is used to check if $text if equal to a node in $rxrlist
--//should be used to check equ_rx_lst only
--int check_list_for_equal(list* rxrlist,char* text,DB_ATTR_TYPE* attr)
--{
-- list* r=NULL;
-- int retval=1;
-- char *temp;
--
-- for(r=rxrlist;r;r=r->next){
-- temp=((rx_rule*)r->data)->rx;
--
-- //FIXME, if rx not begin with ^, may need to do something else
-- if(temp[0]=='^') //^ is for reg exp, we can ignore this character
-- temp++;
--
-- //we don't need to worry about buff-overflow, so strcmp is safe
-- if((retval=strcmp(temp, text))==0){
-- *attr=((rx_rule*)r->data)->attr;
-- error(231,"\"%s\" matches string from line #%ld: %s\n",text,((rx_rule*)r->data)->conf_lineno,((rx_rule*)r->data)->rx);
-- break;
-- } else {
-- error(231,"\"%s\" doesn't match string from line #%ld: %s\n",text,((rx_rule*)r->data)->conf_lineno,((rx_rule*)r->data)->rx);
-- }
-- }
-- return retval;
--}
--
- /*
- * Function check_node_for_match()
- * calls itself recursively to go to the top and then back down.
-@@ -783,35 +756,24 @@
- return retval;
- }
-
-- /* We need this to check whether this was the first one *
-- * to be called and not a recursive call */
-- if(!((retval&16)==16)){
-- retval|=16;
-+ /* if this call is not recursive we check the equals list and we set top *
-+ * and retval so we know following calls are recursive */
-+ if(!(retval&16)){
- top=1;
-- } else {
-- top=0;
-- }
--
-- /* if no deeper match found */
-- if(!((retval&8)==8)&&!((retval&4)==4)){
-+ retval|=16;
-+
- if(!check_list_for_match(node->equ_rx_lst,text,attr)){
-- /*
-- Zhi Wen Wong added this line to fix bug that equ not work for
-- compare
-- if we do "=/bin", we should only check /bin
-- so, /bin/bash or /bin/something should return 0 as neg
-- */
-- if(!check_list_for_equal(node->equ_rx_lst,text,attr))
-- retval|=(2|4);
-- };
-- };
-+ retval|=2|4;
-+ }
-+ }
- /* We'll use retval to pass information on whether to recurse
- * the dir or not */
-
-
-- if(!((retval&8)==8)&&!((retval&4)==4)){
-+ /* If 4 and 8 are not set, we will check for matches */
-+ if(!(retval&(4|8))){
- if(!check_list_for_match(node->sel_rx_lst,text,attr))
-- retval|=(1|8);
-+ retval|=1|8;
- }
-
- /* Now let's check the ancestors */
diff --git a/app-forensics/aide/files/aide-0.13.1-gentoo.patch b/app-forensics/aide/files/aide-0.13.1-gentoo.patch
deleted file mode 100644
index 9c1c07b..0000000
--- a/app-forensics/aide/files/aide-0.13.1-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur aide-0.13.1.orig/Makefile.am aide-0.13.1/Makefile.am
---- aide-0.13.1.orig/Makefile.am 2006-10-11 03:39:01.000000000 +0900
-+++ aide-0.13.1/Makefile.am 2007-09-27 01:35:39.000000000 +0900
-@@ -33,7 +33,7 @@
- src/aide -c doc/aide.conf -V20
-
- update-db: all
-- src/aide -B "database_out=file://$(top_srcdir)/doc/aide.db" -c doc/aide.conf -i
-+ src/aide -B "database_out=file://$(abs_top_srcdir)/doc/aide.db" -c doc/aide.conf -i
-
- dist-hook: configure
- mkdir $(distdir)/include
-diff -Naur aide-0.13.1.orig/doc/aide.conf.in aide-0.13.1/doc/aide.conf.in
---- aide-0.13.1.orig/doc/aide.conf.in 2006-11-25 04:53:56.000000000 +0900
-+++ aide-0.13.1/doc/aide.conf.in 2007-09-27 01:35:39.000000000 +0900
-@@ -19,7 +19,7 @@
- # corresponding line.
- #
-
--@@define TOPDIR @top_srcdir@
-+@@define TOPDIR @abs_top_srcdir@
-
- @@ifndef TOPDIR
- @@define TOPDIR /
-diff -Naur aide-0.13.1.orig/src/Makefile.am aide-0.13.1/src/Makefile.am
---- aide-0.13.1.orig/src/Makefile.am 2006-10-28 06:10:38.000000000 +0900
-+++ aide-0.13.1/src/Makefile.am 2007-09-27 01:35:39.000000000 +0900
-@@ -20,6 +20,8 @@
- # This is no longer needed
- # SUBDIRS = crypt
-
-+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-+
- bin_PROGRAMS = aide
-
- aide_SOURCES = \
diff --git a/app-forensics/aide/files/aide-0.13.1-libgrypt_init.patch b/app-forensics/aide/files/aide-0.13.1-libgrypt_init.patch
deleted file mode 100644
index 56b3969..0000000
--- a/app-forensics/aide/files/aide-0.13.1-libgrypt_init.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -urp aide-0.13.1.orig/doc/aide.1 aide-0.13.1/doc/aide.1
---- aide-0.13.1.orig/doc/aide.1 2009-04-14 15:46:20.000000000 -0700
-+++ aide-0.13.1/doc/aide.1 2009-04-14 15:49:18.000000000 -0700
-@@ -67,6 +67,7 @@ conditions:
- .IP "16 Unimplemented function error"
- .IP "17 Invalid configureline error"
- .IP "18 IO error"
-+.IP "19 Version mismatch error"
- .PP
- .SH NOTES
- Please note that due to mmap issues, aide cannot be terminated with
-diff -urp aide-0.13.1.orig/doc/aide.1.in aide-0.13.1/doc/aide.1.in
---- aide-0.13.1.orig/doc/aide.1.in 2009-04-14 15:46:20.000000000 -0700
-+++ aide-0.13.1/doc/aide.1.in 2009-04-14 15:49:56.000000000 -0700
-@@ -67,6 +67,7 @@ conditions:
- .IP "16 Unimplemented function error"
- .IP "17 Invalid configureline error"
- .IP "18 IO error"
-+.IP "19 Version mismatch error"
- .PP
- .SH NOTES
- Please note that due to mmap issues, aide cannot be terminated with
-diff -urp aide-0.13.1.orig/include/report.h aide-0.13.1/include/report.h
---- aide-0.13.1.orig/include/report.h 2009-04-14 15:46:20.000000000 -0700
-+++ aide-0.13.1/include/report.h 2009-04-14 15:46:28.000000000 -0700
-@@ -31,6 +31,7 @@
- #define UNIMPLEMENTED_FUNCTION_ERROR 16
- #define INVALID_CONFIGURELINE_ERROR 17
- #define IO_ERROR 18
-+#define VERSION_MISMATCH_ERROR 19
-
- /* Errorcodes */
- #define HASH_ALGO_ERROR 30
-diff -urp aide-0.13.1.orig/src/md.c aide-0.13.1/src/md.c
---- aide-0.13.1.orig/src/md.c 2009-04-14 15:46:20.000000000 -0700
-+++ aide-0.13.1/src/md.c 2009-04-14 15:46:28.000000000 -0700
-@@ -201,6 +201,12 @@ int init_md(struct md_container* md) {
- #endif
- #ifdef WITH_GCRYPT
- error(255,"Gcrypt library initialization\n");
-+ if(!gcry_check_version(GCRYPT_VERSION)) {
-+ error(0,"libgcrypt version mismatch\n");
-+ exit(VERSION_MISMATCH_ERROR);
-+ }
-+ gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
-+ gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
- if(gcry_md_open(&md->mdh,0,0)!=GPG_ERR_NO_ERROR){
- error(0,"gcrypt_md_open failed\n");
- exit(IO_ERROR);
diff --git a/app-forensics/aide/files/aide-0.13.1-zlib.patch b/app-forensics/aide/files/aide-0.13.1-zlib.patch
deleted file mode 100644
index 0ca5af2..0000000
--- a/app-forensics/aide/files/aide-0.13.1-zlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur aide-0.13.1.orig//src/be.c aide-0.13.1//src/be.c
---- aide-0.13.1.orig//src/be.c 2006-12-15 01:09:24.000000000 +0900
-+++ aide-0.13.1//src/be.c 2010-05-26 20:08:10.000000000 +0900
-@@ -161,7 +161,7 @@
- #endif
- #ifdef WITH_ZLIB
- if(iszipped && !inout){
-- fh=gzdopen(fd,"wb9+");
-+ fh=gzdopen(fd,"wb9");
- if(fh==NULL){
- error(0,_("Couldn't open file %s for %s"),u->value,
- inout?"reading\n":"writing\n");
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/
@ 2017-05-27 20:59 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2017-05-27 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 524cbe18b25282426edbb300615096bc96aba09a
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Tue May 23 17:41:24 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 27 20:59:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524cbe18
app-forensics/aide: remove old
Closes: https://github.com/gentoo/gentoo/pull/4735
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-forensics/aide/Manifest | 1 -
app-forensics/aide/aide-0.15.1.ebuild | 114 ----------------------
app-forensics/aide/files/aide-0.15.1-gentoo.patch | 26 -----
3 files changed, 141 deletions(-)
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index ed8aa2cff1c..a586feab16c 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1,3 +1,2 @@
DIST aide-0.14.2.tar.gz 418098 SHA256 bf4cd417b0f4778b4f9a618d23e0b0b7db10349ba6a0129394dc82fbc2fa8b9b SHA512 4ef96078fde057a54dda467fb55711e30d947969873715a02052362c57112f5bfd3155460ef353f70ce69fea3a3c491b7925bebbdb7034dbf618c63c360347df WHIRLPOOL fa91e4493bcac4cf11a8fedfd5e3c490752936f9ea04871d812b831f33089b694892e32ed19cef273926d3a8c091fb15a7b98a5e5303f08609f164773475d142
-DIST aide-0.15.1.tar.gz 424970 SHA256 303e5c186257df8c86e418193199f4ea2183fc37d3d4a9098a614f61346059ef SHA512 6afe327474858c697ba017b02bd40717c33874e69b801c171c2496ff9042b557e840bef4a151bda0e4d835ddb0d972b88790237a72f250525dc1fc6b8fa673e7 WHIRLPOOL 4c21221cfbaeff3aa00a3f22c4e31c1fffd3f00d112828540ab6ab94dd019086244de71e5d19d1120078acc7b81b9efa5a36d55937292f523bcb4e064830ba6a
DIST aide-0.16.tar.gz 391009 SHA256 a81c53a131c4fd130b169b3a26ac35386a2f6e1e014f12807524cc273ed97345 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7 WHIRLPOOL d9ecba06d8367ed2ef622ee6b3ccf6a0ed37bad52548063c5c153bd31b856ed8a3379e6057cc1d4aebd29473ded71e9190c8c17dbeaa65eec3365be1d43d5f46
diff --git a/app-forensics/aide/aide-0.15.1.ebuild b/app-forensics/aide/aide-0.15.1.ebuild
deleted file mode 100644
index 7a345f057d7..00000000000
--- a/app-forensics/aide/aide-0.15.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit autotools confutils eutils
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl audit curl mhash nls postgres prelink selinux static xattr zlib"
-
-CDEPEND="acl? ( virtual/acl )
- audit? ( sys-process/audit )
- curl? ( net-misc/curl )
- mhash? ( >=app-crypt/mhash-0.9.2 )
- !mhash? ( dev-libs/libgcrypt:0 )
- nls? ( virtual/libintl )
- postgres? ( dev-db/postgresql )
- prelink? ( sys-devel/prelink )
- selinux? (
- sys-libs/libselinux
- )
- xattr? ( sys-apps/attr )
- zlib? ( sys-libs/zlib )"
-
-RDEPEND="!static? ( ${CDEPEND} )
- selinux? ( sec-policy/selinux-aide )"
-
-DEPEND="${CDEPEND}
- nls? ( sys-devel/gettext )
- sys-devel/bison
- sys-devel/flex"
-
-pkg_setup() {
- confutils_use_conflict mhash postgres
- confutils_use_conflict static curl postgres
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-0.15.1-gentoo.patch"
-
- # fix as-need issue, bug #271326
- epatch "${FILESDIR}/${PN}-0.14-as-needed.patch"
-
- # fix configure issue, bug #323187
- epatch "${FILESDIR}/${PN}-0.14-configure.patch"
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with acl posix-acl) \
- $(use_with audit) \
- $(use_with curl) \
- $(use_with !mhash gcrypt) \
- $(use_with mhash mhash) \
- $(use_with nls locale) \
- $(use_with postgres psql) \
- $(use_with prelink) \
- $(use_with selinux) \
- $(use_enable static) \
- $(use_with xattr) \
- $(use_with zlib) \
- --sysconfdir="${EPREFIX}/etc/aide" || die "econf failed"
-# $(use_with e2fsattrs) \
-}
-
-src_install() {
- emake DESTDIR="${D}" install install-man || die "emake install failed"
-
- keepdir /var/lib/aide || die
- fowners root:0 /var/lib/aide || die
- fperms 0755 /var/lib/aide || die
-
- keepdir /var/log/aide || die
-
- insinto /etc/aide
- doins "${FILESDIR}"/aide.conf || die
-
- dosbin "${FILESDIR}"/aideinit || die
-
- dodoc AUTHORS ChangeLog NEWS README Todo "${FILESDIR}"/aide.cron || die
- dohtml doc/manual.html || die
-}
-
-pkg_postinst() {
- elog
- elog "A sample configuration file has been installed as"
- elog "/etc/aide/aide.conf. Please edit to meet your needs."
- elog "Read the aide.conf(5) manual page for more information."
- elog "A helper script, aideinit, has been installed and can"
- elog "be used to make AIDE management easier. Please run"
- elog "aideinit --help for more information"
- elog
-
- if use postgres; then
- 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 "your aide.conf."
- elog
- fi
-}
diff --git a/app-forensics/aide/files/aide-0.15.1-gentoo.patch b/app-forensics/aide/files/aide-0.15.1-gentoo.patch
deleted file mode 100644
index 01c06f72387..00000000000
--- a/app-forensics/aide/files/aide-0.15.1-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur aide-0.15.1.orig//src/Makefile.am aide-0.15.1//src/Makefile.am
---- aide-0.15.1.orig//src/Makefile.am 2010-08-02 03:23:44.000000000 +0900
-+++ aide-0.15.1//src/Makefile.am 2010-10-28 01:22:49.897871135 +0900
-@@ -26,7 +26,7 @@
- LEX_OUTPUT_ROOT = lex.yy
-
- LDADD = -lm @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @E2FSATTRSLIB@ @ELFLIB@
--AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g
-+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" @AIDE_DEFS@ -W -Wall -g
-
- CLEANFILES = conf_yacc.h conf_yacc.c conf_lex.c db_lex.c *~
-
-diff -Naur aide-0.15.1.orig//src/db.c aide-0.15.1//src/db.c
---- aide-0.15.1.orig//src/db.c 2010-08-09 02:39:31.000000000 +0900
-+++ aide-0.15.1//src/db.c 2010-10-28 01:22:12.930091842 +0900
-@@ -27,6 +27,10 @@
- #include "db_file.h"
- #include "db_disk.h"
-
-+#ifdef WITH_CURL
-+#include "fopen.h"
-+#endif
-+
- #ifdef WITH_PSQL
- #include "db_sql.h"
- #endif
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/
@ 2018-03-14 11:12 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2018-03-14 11:12 UTC (permalink / raw
To: gentoo-commits
commit: 0c475008c36af250a2b7ae7bcd24db0ed6b1f185
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Mar 4 15:36:14 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 14 11:12:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c475008
app-forensics/aide: fix build with >=sys-apps/attr-2.4.48
Closes: https://bugs.gentoo.org/648966
Closes: https://github.com/gentoo/gentoo/pull/7356
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-forensics/aide/aide-0.16-r1.ebuild | 142 +++++++++++++++++++++
.../aide/files/aide-0.16-support-attr-2.4.48.patch | 28 ++++
2 files changed, 170 insertions(+)
diff --git a/app-forensics/aide/aide-0.16-r1.ebuild b/app-forensics/aide/aide-0.16-r1.ebuild
new file mode 100644
index 00000000000..a263403776c
--- /dev/null
+++ b/app-forensics/aide/aide-0.16-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 static 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="
+ !static? ( ${COMMON_DEPEND} )
+ prelink? ( sys-devel/prelink )
+ selinux? ( sec-policy/selinux-aide )
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ static? (
+ !mhash? (
+ dev-libs/libgcrypt:0[static-libs]
+ dev-libs/libgpg-error[static-libs]
+ )
+ mhash? ( app-crypt/mhash[static-libs] )
+ dev-libs/libpcre[static-libs]
+ acl? ( virtual/acl[static-libs] )
+ e2fs? ( sys-fs/e2fsprogs[static-libs] )
+ prelink? ( dev-libs/elfutils[static-libs] )
+ selinux? ( sys-libs/libselinux[static-libs] )
+ xattr? ( sys-apps/attr[static-libs] )
+ zlib? ( sys-libs/zlib[static-libs] )
+ )
+"
+
+REQUIRED_USE="
+ postgres? ( !mhash )
+ static? ( !audit !curl !postgres )
+"
+
+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
+ $(use_enable 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/files/aide-0.16-support-attr-2.4.48.patch b/app-forensics/aide/files/aide-0.16-support-attr-2.4.48.patch
new file mode 100644
index 00000000000..8acb6e5b56b
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.16-support-attr-2.4.48.patch
@@ -0,0 +1,28 @@
+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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/
@ 2020-07-16 14:39 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2020-07-16 14:39 UTC (permalink / raw
To: gentoo-commits
commit: bb3631a2ce08b85cd1ca25d2d9b8ae803cdebb66
Author: Yury Martynov <email <AT> linxon <DOT> ru>
AuthorDate: Wed Jun 24 15:43:23 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:38:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3631a2
app-forensics/aide: bump to 0.16.2 (20200614)
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Yury Martynov <email <AT> linxon.ru>
Closes: https://github.com/gentoo/gentoo/pull/16398
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-forensics/aide/Manifest | 1 +
app-forensics/aide/aide-0.16.2_p20200614.ebuild | 156 +++++++++++++++++++++
...e-0.16.2_p20200614_define_hash_use_gcrypt.patch | 37 +++++
app-forensics/aide/files/aide.conf-r1 | 133 ++++++++++++++++++
app-forensics/aide/metadata.xml | 12 +-
5 files changed, 338 insertions(+), 1 deletion(-)
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index 1d08718bf48..adae5e37bdc 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1 +1,2 @@
+DIST aide-0.16.2_p20200614.tar.gz 144202 BLAKE2B a2533eaf0dd6caa82718eaa89878ddc101f64767788eeac3a250ceb584a2c5958ef8a5481b89eeb720e21af07da8f3576fb46d8ee9966fd2361354a35a7eaa6e SHA512 f5f83b8401465471043c60aeb6314f7bcab24c9f962f6ce550445bec8d866a5c8c00eba9e9f157f1223cde58631de139533c7de64fb3c861a5d8e7b5e367e106
DIST aide-0.16.tar.gz 391009 BLAKE2B 8769d8c6bdf72f307b75f3c1feaa2effdeaead00a0c65ab25bbb50dc6f7c7b53fda4d0a3a54dd5030de1444a34a81c294437d45193aeb8aec7ef0af83a173d47 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
diff --git a/app-forensics/aide/aide-0.16.2_p20200614.ebuild b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
new file mode 100644
index 00000000000..794fd0db7d7
--- /dev/null
+++ b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1
+
+DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
+HOMEPAGE="https://aide.github.io/ https://github.com/aide/aide"
+
+COMMIT="7949feff20501724a43929ee7894b005812ffb4f" # 20200614
+SRC_URI="https://github.com/aide/aide/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl audit curl e2fs mhash postgres prelink selinux static xattr zlib"
+
+REQUIRED_USE="
+ postgres? ( !mhash )
+ static? ( !audit !curl !postgres )"
+
+COMMON_DEPEND="
+ dev-libs/libpcre
+ acl? ( virtual/acl )
+ audit? ( sys-process/audit )
+ curl? ( net-misc/curl )
+ e2fs? ( sys-fs/e2fsprogs )
+ !mhash? (
+ dev-libs/libgcrypt:0=
+ dev-libs/libgpg-error
+ )
+ mhash? ( app-crypt/mhash )
+ postgres? ( dev-db/postgresql:= )
+ prelink? ( dev-libs/elfutils )
+ selinux? ( sys-libs/libselinux )
+ xattr? ( sys-apps/attr )
+ zlib? ( sys-libs/zlib )"
+
+RDEPEND="
+ !static? ( ${COMMON_DEPEND} )
+ selinux? ( sec-policy/selinux-aide )"
+
+DEPEND="${COMMON_DEPEND}
+ static? (
+ dev-libs/libpcre[static-libs]
+ acl? ( >=virtual/acl-0-r1[static-libs] )
+ e2fs? ( sys-fs/e2fsprogs[static-libs] )
+ !mhash? (
+ dev-libs/libgcrypt:0[static-libs]
+ dev-libs/libgpg-error[static-libs]
+ )
+ mhash? ( app-crypt/mhash[static-libs] )
+ prelink? ( dev-libs/elfutils[static-libs] )
+ selinux? ( sys-libs/libselinux[static-libs] )
+ xattr? ( sys-apps/attr[static-libs] )
+ zlib? ( sys-libs/zlib[static-libs] )
+ )"
+
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ prelink? ( sys-devel/prelink )"
+
+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}/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch"
+ "${FILESDIR}/aide-0.16-fix-acl-configure-option.patch"
+
+ # Remove not available gcrypt algorithm 7 DB_HAVAL
+ # See: https://sourceforge.net/p/aide/bugs/105/
+ "${FILESDIR}/${P}_define_hash_use_gcrypt.patch"
+)
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+pkg_setup() {
+ if use postgres; then
+ ewarn "\nWARNING!"
+ ewarn "You need to choose one of the postgres versions before building"
+ ewarn "\nPlease select a target postgres version/slot using:\n"
+ ewarn " ~# eselect postgresql list"
+ ewarn " ~# eselect postgresql set <version>\n"
+ fi
+}
+
+src_prepare() {
+ default
+ sed -i -e 's| -Werror||g' configure.ac || die
+ echo "m4_define([AIDE_VERSION], [${PV}])" > version.m4 || 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
+ $(use_enable 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
+ readme.gentoo_create_doc
+
+ insinto /etc/${PN}
+ insopts -m0600
+ newins "${FILESDIR}"/aide.conf-r1 aide.conf
+
+ dosbin "${FILESDIR}"/aideinit
+ dodoc -r contrib/ "${FILESDIR}"/aide.cron
+
+ keepdir /var/{lib,log}/${PN}
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if use postgres; then
+ elog "\nDue to a bad assumption by aide, you must issue the following"
+ elog "command after the database initialization (aide --init ...):"
+ elog '\n ~# 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 "\nwhere TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
+ elog "in your aide.conf.\n"
+ fi
+}
diff --git a/app-forensics/aide/files/aide-0.16.2_p20200614_define_hash_use_gcrypt.patch b/app-forensics/aide/files/aide-0.16.2_p20200614_define_hash_use_gcrypt.patch
new file mode 100644
index 00000000000..e643a0017de
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.16.2_p20200614_define_hash_use_gcrypt.patch
@@ -0,0 +1,37 @@
+diff -Nur aide-0.16/include/md.h aide-0.16.new/include/md.h
+--- aide-0.16/include/md.h 2016-07-25 22:56:55.000000000 +0200
++++ aide-0.16.new/include/md.h 2018-11-21 14:07:01.347479021 +0100
+@@ -48,7 +48,7 @@
+ #define HASH_GCRYPT_COUNT GCRY_MD_CRC32
+ #ifndef WITH_MHASH
+ #define HASH_USE_GCRYPT (DB_MD5|DB_SHA1|DB_RMD160|DB_TIGER|DB_CRC32|\
+- DB_HAVAL|DB_CRC32|DB_SHA256|DB_SHA512)
++ DB_CRC32B|DB_SHA256|DB_SHA512)
+ #endif
+ #endif
+
+diff -Nur aide-0.16/src/md.c aide-0.16.new/src/md.c
+--- aide-0.16/src/md.c 2016-07-25 22:56:55.000000000 +0200
++++ aide-0.16.new/src/md.c 2018-11-21 14:06:05.602295496 +0100
+@@ -55,10 +55,12 @@
+ r=DB_TIGER;
+ break;
+ }
++/* until libgcrypt-1.8.4 not implemented yet, see doc/gcrypt.info-1
+ case GCRY_MD_HAVAL: {
+ r=DB_HAVAL;
+ break;
+ }
++*/
+ case GCRY_MD_SHA256: {
+ r=DB_SHA256;
+ break;
+@@ -219,7 +221,7 @@
+ if(gcry_md_enable(md->mdh,i)==GPG_ERR_NO_ERROR){
+ md->calc_attr|=h;
+ } else {
+- error(0,"gcry_md_enable %i failed",i);
++ error(0,"gcry_md_enable %i failed, see /usr/include/gcrypt.h enum gcry_md_algos",i);
+ md->todo_attr&=~h;
+ }
+ }
diff --git a/app-forensics/aide/files/aide.conf-r1 b/app-forensics/aide/files/aide.conf-r1
new file mode 100644
index 00000000000..87df5e168c8
--- /dev/null
+++ b/app-forensics/aide/files/aide.conf-r1
@@ -0,0 +1,133 @@
+# Example configuration file for AIDE
+# See more: man 5 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
+
+# Default: 5
+#verbose=5
+
+report_url=file:/var/log/aide/aide.log
+report_url=stdout
+#report_url=stderr
+
+# Here are all the things we can check - these are the default rules
+#
+# p: permissions
+# ftype: file type
+# i: inode
+# l: link name
+# n: number of links
+# u: user
+# g: group
+# s: size
+# b: block count
+# m: mtime (modification time)
+# a: atime (access time)
+# c: ctime (change time)
+# S: check for growing size
+# I: ignore changed filename
+# ANF: allow new files
+# ARF: allow removed files
+# md5: md5 checksum
+# sha1: sha1 checksum
+# sha256: sha256 checksum
+# sha512: sha512 checksum
+# rmd160: rmd160 checksum
+# tiger: tiger checksum
+# crc32: crc32 checksum
+# R: p+ftype+i+l+n+u+g+s+m+c+md5+X
+# L: p+ftype+i+l+n+u+g+X
+# E: Empty group
+# X: acl+selinux+xattrs+e2fsattrs (if groups are explicitly enabled)
+# >: Growing file p+ftype+l+u+g+i+n+S+X
+
+# Defines formerly set here have been moved to /etc/default/aide.
+
+# Custom rules
+Binlib = p+i+n+u+g+s+b+m+c+md5+sha256+rmd160
+ConfFiles = p+i+n+u+g+s+b+m+c+md5+sha256+rmd160
+Logs = p+i+n+u+g+S
+Devices = p+i+n+u+g+s+b+c+md5+sha256+rmd160
+Databases = p+n+u+g
+StaticDir = p+i+n+u+g
+ManPages = p+i+n+u+g+s+b+m+c+md5+sha256+rmd160
+
+# Next decide what directories/files you want in the database
+
+# Kernel, system map, etc.
+=/boot$ Binlib
+# Configs
+/etc ConfFiles
+!/etc/mtab
+# Binaries
+/bin Binlib
+/sbin Binlib
+/usr/bin Binlib
+/usr/sbin Binlib
+/usr/libexec Binlib
+/usr/local/bin Binlib
+/usr/local/sbin Binlib
+#/usr/games Binlib
+# Libraries
+/lib(64)? Binlib
+/usr/lib(64)? Binlib
+/usr/local/lib(64)? 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
diff --git a/app-forensics/aide/metadata.xml b/app-forensics/aide/metadata.xml
index f661f6e69f0..c7da79793a7 100644
--- a/app-forensics/aide/metadata.xml
+++ b/app-forensics/aide/metadata.xml
@@ -1,12 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>email@linxon.ru</email>
+ <name>Yury Martynov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="e2fs">Enable support for checking file attributes on ext2/ext3/ext4 filesystems</flag>
+ <flag name="curl">Use curl for http,https and ftp backends</flag>
+ <flag name="postgres">Use postgresql library for storing databases</flag>
<flag name="prelink">Bypass prelinking when calculating checksums</flag>
</use>
<upstream>
+ <remote-id type="github">aide/aide</remote-id>
<remote-id type="sourceforge">aide</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/
@ 2021-05-04 8:17 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-05-04 8:17 UTC (permalink / raw
To: gentoo-commits
commit: 1c4f0c458a33a1f5beb5bda9fe54e9931a6b6e24
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 08:16:09 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 08:17:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4f0c45
app-forensics/aide: Drop 0.16-r1, EAPI6--
Bug: https://bugs.gentoo.org/787983
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-forensics/aide/Manifest | 1 -
app-forensics/aide/aide-0.16-r1.ebuild | 127 ---------------------
.../aide/files/aide-0.16-add-missing-include.patch | 24 ----
.../aide/files/aide-0.16-support-attr-2.4.48.patch | 28 -----
app-forensics/aide/files/aide.conf | 115 -------------------
5 files changed, 295 deletions(-)
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index adae5e37bdc..3123f6ddcfd 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1,2 +1 @@
DIST aide-0.16.2_p20200614.tar.gz 144202 BLAKE2B a2533eaf0dd6caa82718eaa89878ddc101f64767788eeac3a250ceb584a2c5958ef8a5481b89eeb720e21af07da8f3576fb46d8ee9966fd2361354a35a7eaa6e SHA512 f5f83b8401465471043c60aeb6314f7bcab24c9f962f6ce550445bec8d866a5c8c00eba9e9f157f1223cde58631de139533c7de64fb3c861a5d8e7b5e367e106
-DIST aide-0.16.tar.gz 391009 BLAKE2B 8769d8c6bdf72f307b75f3c1feaa2effdeaead00a0c65ab25bbb50dc6f7c7b53fda4d0a3a54dd5030de1444a34a81c294437d45193aeb8aec7ef0af83a173d47 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
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 56e81d58727..00000000000
--- 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/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 75f0403c968..00000000000
--- 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 8acb6e5b56b..00000000000
--- 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 cef1813db9f..00000000000
--- 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/
@ 2022-03-11 11:01 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-03-11 11:01 UTC (permalink / raw
To: gentoo-commits
commit: 06cefe1606470b4b93e12aef21b1e9733c7e55c9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 11:00:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 11:01:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06cefe16
app-forensics/aide: add 0.17.4
Closes: https://bugs.gentoo.org/771924
Bug: https://bugs.gentoo.org/829268
Bug: https://bugs.gentoo.org/831658
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-forensics/aide/Manifest | 1 +
app-forensics/aide/aide-0.17.4.ebuild | 103 +++++++++++++++++++++
app-forensics/aide/files/aide-0.17.4-bashism.patch | 58 ++++++++++++
3 files changed, 162 insertions(+)
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index 3123f6ddcfde..a281dab635fd 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1 +1,2 @@
DIST aide-0.16.2_p20200614.tar.gz 144202 BLAKE2B a2533eaf0dd6caa82718eaa89878ddc101f64767788eeac3a250ceb584a2c5958ef8a5481b89eeb720e21af07da8f3576fb46d8ee9966fd2361354a35a7eaa6e SHA512 f5f83b8401465471043c60aeb6314f7bcab24c9f962f6ce550445bec8d866a5c8c00eba9e9f157f1223cde58631de139533c7de64fb3c861a5d8e7b5e367e106
+DIST aide-0.17.4.tar.gz 331783 BLAKE2B 584a385d0a0e80edf0b89eef202431adfea7fe8ba04c774e49dfb7230e766e19a48572e9d6c80386668572e459db9770b04978df484bd49c7de6433657500e13 SHA512 b6dba54fd204e1899d47b0b4139786cbeaa51c388027e2cfc1bb839297a70ae8ad6f37429594a730fac8007d62b4ba5b61a4aa22edbc55cbe986ccfaf5197f31
diff --git a/app-forensics/aide/aide-0.17.4.ebuild b/app-forensics/aide/aide-0.17.4.ebuild
new file mode 100644
index 000000000000..7666d39604f9
--- /dev/null
+++ b/app-forensics/aide/aide-0.17.4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1
+
+DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
+HOMEPAGE="https://aide.github.io/ https://github.com/aide/aide"
+SRC_URI="https://github.com/aide/aide/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="acl audit curl e2fs mhash selinux xattr zlib"
+
+DEPEND="dev-libs/libpcre
+ acl? ( virtual/acl )
+ audit? ( sys-process/audit )
+ curl? ( net-misc/curl )
+ e2fs? ( sys-fs/e2fsprogs )
+ !mhash? (
+ dev-libs/libgcrypt:0=
+ dev-libs/libgpg-error
+ )
+ mhash? ( app-crypt/mhash )
+ selinux? ( sys-libs/libselinux )
+ xattr? ( sys-apps/attr )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-aide )"
+BDEPEND="sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig"
+
+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}"/aide-0.17.4-bashism.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's| -Werror||g' configure.ac || die
+
+ # Only needed for snapshots.
+ if [[ ${PV} == *_p* ]] ; then
+ echo "m4_define([AIDE_VERSION], [${PV}])" > version.m4 || die
+ fi
+
+ # Can be dropped once Bashism patch is gone
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --sysconfdir="${EPREFIX}"/etc/${PN}
+
+ # Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/
+ # This doesn't affect anything because there are no localizations yet.
+ --without-locale
+
+ --without-prelink
+ $(use_with zlib)
+ $(use_with curl)
+ $(use_with acl posix-acl)
+ $(use_with selinux)
+ $(use_with xattr)
+ $(use_with e2fs e2fsattrs)
+ $(use_with mhash mhash)
+ $(use_with !mhash gcrypt)
+ $(use_with audit)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ readme.gentoo_create_doc
+
+ insinto /etc/${PN}
+ insopts -m0600
+ newins "${FILESDIR}"/aide.conf-r1 aide.conf
+
+ dosbin "${FILESDIR}"/aideinit
+ dodoc -r contrib/ "${FILESDIR}"/aide.cron
+
+ keepdir /var/{lib,log}/${PN}
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-forensics/aide/files/aide-0.17.4-bashism.patch b/app-forensics/aide/files/aide-0.17.4-bashism.patch
new file mode 100644
index 000000000000..050d218cf1ba
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.17.4-bashism.patch
@@ -0,0 +1,58 @@
+Fixed upstream, so backport to 0.17.4 of
+https://github.com/aide/aide/commit/5161886c49060228811eee6da319844ef62dff6d
+https://github.com/aide/aide/commit/007eb4f32e8874ce457b4f15d9789c2a9d61731b
+--- a/configure.ac
++++ b/configure.ac
+@@ -329,7 +329,7 @@ fi
+ AC_CHECK_HEADERS(syslog.h inttypes.h fcntl.h ctype.h)
+
+ PCRELIB="-lpcre"
+-if test "$aide_static_choice" == "yes"; then
++if test "$aide_static_choice" = "yes"; then
+ PCRELIB="$PCRELIB -pthread"
+ fi
+ AC_CHECK_LIB(pcre, pcre_exec, [
+@@ -426,14 +426,14 @@ AS_IF([test "x$with_selinux_support" != xno],
+ AC_DEFINE(WITH_SELINUX,1,[use SELinux])
+ [AC_MSG_RESULT(yes)
+ if test "x$PKG_CONFIG" != xno && $PKG_CONFIG --exists libselinux; then
+- if test "$aide_static_choice" == "yes"; then
++ if test "$aide_static_choice" = "yes"; then
+ SELINUXLIB=$(${PKG_CONFIG} --libs libselinux --static)
+ else
+ SELINUXLIB=$(${PKG_CONFIG} --libs libselinux)
+ fi
+ else
+ SELINUXLIB="-lselinux"
+- if test "$aide_static_choice" == "yes"; then
++ if test "$aide_static_choice" = "yes"; then
+ saveLIBS=$LIBS
+ LIBS="-static $SELINUXLIB"
+ AC_SEARCH_LIBS([lgetfilecon_raw], [], [], [SELINUXLIB="$SELINUXLIB -lpthread"])
+@@ -555,7 +555,7 @@ AC_ARG_ENABLE([default_db],
+ [do not set default values for database_in and database_out config options]),
+ [enable_default_db=$enableval],[enable_default_db=yes])
+
+-if test "$enable_default_db" == "yes"; then
++if test "$enable_default_db" = "yes"; then
+
+ if test "x$sysconfdir" != x'${prefix}/etc'; then
+ evalled_sysconfdir=`eval echo "$sysconfdir"`
+@@ -592,7 +592,7 @@ AC_ARG_WITH([curl],
+ [use curl library for http, https and ftp database backend (default: no)]),
+ [with_curl=$withval], [with_curl=no])
+ AS_IF([test "x$with_curl" = "xyes"], [
+- if test "$aide_static_choice" == "yes"; then
++ if test "$aide_static_choice" = "yes"; then
+ PKG_CHECK_MODULES_STATIC(CURL, [libcurl], , [AC_MSG_RESULT([libcurl not found by pkg-config - Try --without-curl or add directory containing libcurl.pc to PKG_CONFIG_PATH environment variable])])
+ else
+ PKG_CHECK_MODULES(CURL, [libcurl], , [AC_MSG_RESULT([libcurl not found by pkg-config - Try --without-curl or add directory containing libcurl.pc to PKG_CONFIG_PATH environment variable])])
+@@ -671,7 +671,7 @@ AS_IF([test "x$with_audit" != xno],
+ AC_MSG_ERROR(You don't have libaudit properly installed. Install it if you need it.)
+ )
+ AUDITLIB="-laudit"
+- if test "$aide_static_choice" == "yes"; then
++ if test "$aide_static_choice" = "yes"; then
+ saveLIBS=$LIBS
+ LIBS="-static $AUDITLIB"
+ AC_CHECK_LIB([audit], [audit_log_user_message], [], [
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/
@ 2022-03-11 12:14 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-03-11 12:14 UTC (permalink / raw
To: gentoo-commits
commit: 7d395e30e9536dee74451322d0f6daf6635e54af
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 12:13:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 12:13:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d395e30
app-forensics/aide: restore automagic ACL patch
Still needed for 0.17.x, just not master.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-forensics/aide/{aide-0.17.4.ebuild => aide-0.17.4-r1.ebuild} | 3 ++-
app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch | 2 ++
app-forensics/aide/files/aide-0.17.4-bashism.patch | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app-forensics/aide/aide-0.17.4.ebuild b/app-forensics/aide/aide-0.17.4-r1.ebuild
similarity index 95%
rename from app-forensics/aide/aide-0.17.4.ebuild
rename to app-forensics/aide/aide-0.17.4-r1.ebuild
index 7666d39604f9..6b3fb2f5f72d 100644
--- a/app-forensics/aide/aide-0.17.4.ebuild
+++ b/app-forensics/aide/aide-0.17.4-r1.ebuild
@@ -43,7 +43,8 @@ A helper script, aideinit, was installed and can be used to make AIDE
management easier. Please run 'aideinit --help' for more information."
PATCHES=(
- "${FILESDIR}"/aide-0.17.4-bashism.patch
+ "${FILESDIR}"/${PN}-0.16-fix-acl-configure-option.patch
+ "${FILESDIR}"/${PN}-0.17.4-bashism.patch
)
src_prepare() {
diff --git a/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch b/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
index a989e379039c..b860b39d73ee 100644
--- a/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
+++ b/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
@@ -1,3 +1,5 @@
+Fixes upstream in master but not 0.17.x.
+
commit 3d9746bccbb50809e4c3de90ab5145a17af39aeb
Author: Ilya Tumaykin <itumaykin@gmail.com>
Date: Thu May 25 14:38:02 2017 +0300
diff --git a/app-forensics/aide/files/aide-0.17.4-bashism.patch b/app-forensics/aide/files/aide-0.17.4-bashism.patch
index 050d218cf1ba..e25463dbf772 100644
--- a/app-forensics/aide/files/aide-0.17.4-bashism.patch
+++ b/app-forensics/aide/files/aide-0.17.4-bashism.patch
@@ -1,6 +1,8 @@
Fixed upstream, so backport to 0.17.4 of
https://github.com/aide/aide/commit/5161886c49060228811eee6da319844ef62dff6d
https://github.com/aide/aide/commit/007eb4f32e8874ce457b4f15d9789c2a9d61731b
+
+Fixed in master but not 0.17.x.
--- a/configure.ac
+++ b/configure.ac
@@ -329,7 +329,7 @@ fi
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/
@ 2022-11-18 0:48 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-11-18 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 3de25d3465112238f01cc780acdffca9ff40344e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 00:18:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 00:43:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de25d34
app-forensics/aide: fix configure w/ clang 16
Closes: https://bugs.gentoo.org/881707
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-forensics/aide/aide-0.17.4-r3.ebuild | 104 ++++++++++++++++
.../aide/files/aide-0.17.4-configure.patch | 131 +++++++++++++++++++++
2 files changed, 235 insertions(+)
diff --git a/app-forensics/aide/aide-0.17.4-r3.ebuild b/app-forensics/aide/aide-0.17.4-r3.ebuild
new file mode 100644
index 000000000000..98e483d06975
--- /dev/null
+++ b/app-forensics/aide/aide-0.17.4-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1
+
+DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
+HOMEPAGE="https://aide.github.io/ https://github.com/aide/aide"
+SRC_URI="https://github.com/aide/aide/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="acl audit curl e2fs mhash selinux xattr zlib"
+
+DEPEND="dev-libs/libpcre
+ acl? ( virtual/acl )
+ audit? ( sys-process/audit )
+ curl? ( net-misc/curl )
+ e2fs? ( sys-fs/e2fsprogs )
+ !mhash? (
+ dev-libs/libgcrypt:0=
+ dev-libs/libgpg-error
+ )
+ mhash? ( app-crypt/mhash )
+ selinux? ( sys-libs/libselinux )
+ xattr? ( sys-apps/attr )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-aide )"
+BDEPEND="sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig"
+
+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}"/${PN}-0.16-fix-acl-configure-option.patch
+ "${FILESDIR}"/${PN}-0.17.4-configure.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's| -Werror||g' configure.ac || die
+
+ # Only needed for snapshots.
+ if [[ ${PV} == *_p* ]] ; then
+ echo "m4_define([AIDE_VERSION], [${PV}])" > version.m4 || die
+ fi
+
+ # Can be dropped once Bashism patch is gone
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --sysconfdir="${EPREFIX}"/etc/${PN}
+
+ # Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/
+ # This doesn't affect anything because there are no localizations yet.
+ --without-locale
+
+ --without-prelink
+ $(use_with zlib)
+ $(use_with curl)
+ $(use_with acl posix-acl)
+ $(use_with selinux)
+ $(use_with xattr)
+ $(use_with e2fs e2fsattrs)
+ $(use_with mhash mhash)
+ $(use_with !mhash gcrypt)
+ $(use_with audit)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ readme.gentoo_create_doc
+
+ insinto /etc/${PN}
+ insopts -m0600
+ newins "${FILESDIR}"/aide.conf-r2 aide.conf
+
+ dosbin "${FILESDIR}"/aideinit
+ dodoc -r contrib/ "${FILESDIR}"/aide.cron-r2
+
+ keepdir /var/{lib,log}/${PN}
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-forensics/aide/files/aide-0.17.4-configure.patch b/app-forensics/aide/files/aide-0.17.4-configure.patch
new file mode 100644
index 000000000000..adf9925d9458
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.17.4-configure.patch
@@ -0,0 +1,131 @@
+https://github.com/aide/aide/pull/145
+https://bugs.gentoo.org/881707
+
+From 0a7f36406f3f21e4fcdc0c410ff626c352f2d080 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 18 Nov 2022 00:04:10 +0000
+Subject: [PATCH 1/2] Fix bashisms in build system
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -329,7 +329,7 @@ fi
+ AC_CHECK_HEADERS(syslog.h inttypes.h fcntl.h ctype.h)
+
+ PCRELIB="-lpcre"
+-if test "$aide_static_choice" == "yes"; then
++if test "$aide_static_choice" = "yes"; then
+ PCRELIB="$PCRELIB -pthread"
+ fi
+ AC_CHECK_LIB(pcre, pcre_exec, [
+@@ -426,14 +426,14 @@ AS_IF([test "x$with_selinux_support" != xno],
+ AC_DEFINE(WITH_SELINUX,1,[use SELinux])
+ [AC_MSG_RESULT(yes)
+ if test "x$PKG_CONFIG" != xno && $PKG_CONFIG --exists libselinux; then
+- if test "$aide_static_choice" == "yes"; then
++ if test "$aide_static_choice" = "yes"; then
+ SELINUXLIB=$(${PKG_CONFIG} --libs libselinux --static)
+ else
+ SELINUXLIB=$(${PKG_CONFIG} --libs libselinux)
+ fi
+ else
+ SELINUXLIB="-lselinux"
+- if test "$aide_static_choice" == "yes"; then
++ if test "$aide_static_choice" = "yes"; then
+ saveLIBS=$LIBS
+ LIBS="-static $SELINUXLIB"
+ AC_SEARCH_LIBS([lgetfilecon_raw], [], [], [SELINUXLIB="$SELINUXLIB -lpthread"])
+@@ -555,7 +555,7 @@ AC_ARG_ENABLE([default_db],
+ [do not set default values for database_in and database_out config options]),
+ [enable_default_db=$enableval],[enable_default_db=yes])
+
+-if test "$enable_default_db" == "yes"; then
++if test "$enable_default_db" = "yes"; then
+
+ if test "x$sysconfdir" != x'${prefix}/etc'; then
+ evalled_sysconfdir=`eval echo "$sysconfdir"`
+@@ -592,7 +592,7 @@ AC_ARG_WITH([curl],
+ [use curl library for http, https and ftp database backend (default: no)]),
+ [with_curl=$withval], [with_curl=no])
+ AS_IF([test "x$with_curl" = "xyes"], [
+- if test "$aide_static_choice" == "yes"; then
++ if test "$aide_static_choice" = "yes"; then
+ PKG_CHECK_MODULES_STATIC(CURL, [libcurl], , [AC_MSG_RESULT([libcurl not found by pkg-config - Try --without-curl or add directory containing libcurl.pc to PKG_CONFIG_PATH environment variable])])
+ else
+ PKG_CHECK_MODULES(CURL, [libcurl], , [AC_MSG_RESULT([libcurl not found by pkg-config - Try --without-curl or add directory containing libcurl.pc to PKG_CONFIG_PATH environment variable])])
+@@ -671,7 +671,7 @@ AS_IF([test "x$with_audit" != xno],
+ AC_MSG_ERROR(You don't have libaudit properly installed. Install it if you need it.)
+ )
+ AUDITLIB="-laudit"
+- if test "$aide_static_choice" == "yes"; then
++ if test "$aide_static_choice" = "yes"; then
+ saveLIBS=$LIBS
+ LIBS="-static $AUDITLIB"
+ AC_CHECK_LIB([audit], [audit_log_user_message], [], [
+
+From 67ad6efc7596c9b3ffdeb411bae942d757e2d96f Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 18 Nov 2022 00:04:53 +0000
+Subject: [PATCH 2/2] Fix configure.ac compatibility with Clang 16
+
+Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default.
+
+Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
+tests may then return the wrong result.
+
+We also fix -Wstrict-prototypes while here as it's easy to do and it prepares
+us for C23.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -295,8 +295,11 @@ AC_CHECK_FUNCS(fcntl ftruncate posix_fadvise asprintf snprintf \
+ AC_CACHE_CHECK([for open/O_NOATIME], db_cv_open_o_noatime, [
+ echo "test for working open/O_NOATIME" > __o_noatime_file
+ AC_TRY_RUN([
+-#include <sys/types.h>
+ #include <fcntl.h>
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
+ #ifndef O_NOATIME
+ #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
+ #define O_NOATIME 01000000
+@@ -304,13 +307,14 @@ AC_TRY_RUN([
+ #define O_NOATIME 0
+ #endif
+ #endif
+-main() {
++int main(void) {
+ int c, fd = open("__o_noatime_file", O_RDONLY | O_NOATIME, 0);
+ exit ((!O_NOATIME) || (fd == -1) || (read(fd, &c, 1) != 1));
+ }], [db_cv_open_o_noatime=yes], [db_cv_open_o_noatime=no],
+ AC_TRY_LINK([
+-#include <sys/types.h>
+ #include <fcntl.h>
++#include <sys/types.h
++#include <sys/stat.h>
+ #ifndef O_NOATIME
+ #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
+ #define O_NOATIME 01000000
+
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-11-18 0:48 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-02 21:05 [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/ Manuel Rüger
-- strict thread matches above, loose matches on Subject: below --
2017-05-27 20:59 Michał Górny
2018-03-14 11:12 Michał Górny
2020-07-16 14:39 Joonas Niilola
2021-05-04 8:17 Andreas Sturmlechner
2022-03-11 11:01 Sam James
2022-03-11 12:14 Sam James
2022-11-18 0:48 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox