From 47ec3bae92c9f029e064b5cbe6287583c986479d Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Wed, 16 Dec 2009 14:13:14 +0000 Subject: Fixed --as-needed issue, bug #271326. Package-Manager: portage-2.1.7.14/cvs/Linux x86_64 --- app-forensics/aide/ChangeLog | 8 +- app-forensics/aide/Manifest | 4 +- app-forensics/aide/aide-0.13.1-r4.ebuild | 146 +++++++++++++++++++++ .../aide/files/aide-0.13.1-as-needed.patch | 36 +++++ 4 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 app-forensics/aide/aide-0.13.1-r4.ebuild create mode 100644 app-forensics/aide/files/aide-0.13.1-as-needed.patch (limited to 'app-forensics') 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 +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 files/aideinit: Fixed aideinit -b issue, bug #277282. diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest index af74a1aa7918..03022f243837 100644 --- a/app-forensics/aide/Manifest +++ b/app-forensics/aide/Manifest @@ -1,3 +1,4 @@ +AUX aide-0.13.1-as-needed.patch 1332 RMD160 94864a43a04b29396979e1c2d53e9302f17ec83c SHA1 156491dfaed31fa06fc71c4e2d30e913c984e3c3 SHA256 778892968020b0a420372fedde4949cc58fff8fa6851473a507944d4d6b9f3c5 AUX aide-0.13.1-configure.patch 2201 RMD160 46f6cf31c0446ce238733d0434c4e3b1126b87fc SHA1 68bb2ced2ebd17ab1f5c5a940e0804f71cd903af SHA256 aa1b35d3d692d6844b3fc1b39e9ae3ed1779d7699f111bd6852a01dde228457d AUX aide-0.13.1-equ-matching.patch 2451 RMD160 515a0762483224fdfdca4197ee318f1048a7573a SHA1 e4606aaf4935955d0c4f144b415485ad5871248e SHA256 1eddf47fe7f1fb5a7868b22e2af00c2ab7b89b807c4e696621a6e74443d1e323 AUX aide-0.13.1-gentoo.patch 1218 RMD160 a696dfa3819a9be30e34de1d87dcd218283bfd44 SHA1 44085e22669cc2a616979d559afccd3deff37724 SHA256 c78aed624a51f683b83f2cc45239748861e14fe9e3a94277b0e1040b9a87eb00 @@ -7,6 +8,7 @@ AUX aide.cron 5997 RMD160 07a10b1bae5373eb186d72ec9b0e9c0987dd1cee SHA1 09f8f66e AUX aideinit 2949 RMD160 a2cb2f5bd69e560e2d76b61b2173608435b50857 SHA1 8fcbb4d6c136cf1b2cbac3de91b3963974a6b826 SHA256 1b4a01b8f50eb0b9217df55686ccd103ea92fca3892fe3a6a0364f83cae3548f DIST aide-0.13.1.tar.gz 285400 RMD160 802ac5bd817032bf3a696db7f547bef322b2487a SHA1 0112ee0a974020b99f09d1f2a9fb05433a7b9681 SHA256 b55065413bad3c24af51a551e6ab7cd4a9ecd9f449929261a45fc2f53e040021 EBUILD aide-0.13.1-r3.ebuild 3782 RMD160 f93882c017dd19546c0d16a825a7169ac50b5993 SHA1 9a26d39322a4798237e18f986448d8b3173ade7a SHA256 5e862f78654fa96da6b4bddef670f2264ca98422a965898c64781f8211f3888a +EBUILD aide-0.13.1-r4.ebuild 3864 RMD160 9004d8e99e7eb78465d58bbb3d2785b19354a4d1 SHA1 6442d364a2b37ca274f1356b73799f191307d9fa SHA256 78f53ca0c5c3534456e75a42b9edf1451101ca5cdfc5b6b0b3c257e76e1ba356 EBUILD aide-0.13.1.ebuild 3909 RMD160 1055b7d279b3e9306dda868c5edee309ee780545 SHA1 8a1cd7dfd7bdbf19147a6e5ada9a7671ced1094d SHA256 3fcfcbcc5c6499dc09cb37bcd60903827df37d5c56ce48221c18a2d2c17f3320 -MISC ChangeLog 8764 RMD160 4e3ccf5c649e17adc438437587c23196f2e67c7e SHA1 5d38219ce82f904becc6cd7bb153a75cdf34b3a9 SHA256 31c1dabfa9e199d22a72ca7e96b1fbc6a9feb3feffbfbd77384350127687ecf9 +MISC ChangeLog 8947 RMD160 6de055201d11986682d8699d597d1ef143512f9b SHA1 c0e2551f7f090c907ed3f6ee2ffb210970020609 SHA256 5e3b489c4aa99e67c1bd7fd1c7b2aac5c6da0cc0a9b12668284a521035f2a9da MISC metadata.xml 227 RMD160 8fd92f1523d63aec4ec954abee49accf1064c6e6 SHA1 d1d36ec61b481027477edfb7a93cb1c42fb83ff6 SHA256 bb6f7d60ac5d9f18aaea588265033a77bfdeb50676739866d80241cfb869c77c 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 -- cgit v1.2.3-65-gdbad