Fixed --as-needed issue, bug #271326.

(Portage version: 2.1.7.14/cvs/Linux x86_64)

3 files changed, 189 insertions, 1 deletions

diff --git a/app-forensics/aide/ChangeLog b/app-forensics/aide/ChangeLog
index e5d2fd693d89..569663574b79 100644
--- a/app-forensics/aide/ChangeLog
+++ b/app-forensics/aide/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-forensics/aide
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.44 2009/07/22 22:32:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.45 2009/12/16 14:13:14 matsuu Exp $
+
+*aide-0.13.1-r4 (16 Dec 2009)
+
+  16 Dec 2009; MATSUU Takuto <matsuu@gentoo.org> +aide-0.13.1-r4.ebuild,
+  +files/aide-0.13.1-as-needed.patch:
+  Fixed --as-needed issue, bug #271326.
 
   22 Jul 2009; MATSUU Takuto <matsuu@gentoo.org> files/aideinit:
   Fixed aideinit -b issue, bug #277282.
diff --git a/app-forensics/aide/aide-0.13.1-r4.ebuild b/app-forensics/aide/aide-0.13.1-r4.ebuild
new file mode 100644
index 000000000000..39d326d5ca44
--- /dev/null
+++ b/app-forensics/aide/aide-0.13.1-r4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.13.1-r4.ebuild,v 1.1 2009/12/16 14:13:14 matsuu Exp $
+
+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="~alpha ~amd64 ~ppc ~sparc ~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? ( virtual/postgresql-base )
+	selinux? ( sys-libs/libselinux )
+	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_config() {
+	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"
+
+	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/files/aide-0.13.1-as-needed.patch b/app-forensics/aide/files/aide-0.13.1-as-needed.patch
new file mode 100644
index 000000000000..9e0ec4d73aff
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.13.1-as-needed.patch
@@ -0,0 +1,36 @@
+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