mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 18:47:16 -08:00
app-forensics/aide: Remove old
Package-Manager: portage-2.2.26
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
@@ -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"
|
||||
@@ -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 */
|
||||
@@ -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 = \
|
||||
@@ -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);
|
||||
@@ -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");
|
||||
Reference in New Issue
Block a user