diff options
| author |   José María Alonso <nimiux@gentoo.org> | 2013-05-01 12:51:17 +0000 |
|---|---|---|
| committer | José María Alonso <nimiux@gentoo.org> | 2013-05-01 12:51:17 +0000 |
| commit | 2156fbcd8bde192ae4f8027525a2dd9058cad601 (patch) | |
| tree | 02c1f18a39fa147907299d5a2826aa6064bfa6b3 /app-admin/tripwire | |
| parent | old (diff) | |
| download | gentoo-2-2156fbcd8bde192ae4f8027525a2dd9058cad601.tar.gz gentoo-2-2156fbcd8bde192ae4f8027525a2dd9058cad601.tar.bz2 gentoo-2-2156fbcd8bde192ae4f8027525a2dd9058cad601.zip | |
Fix configFix configure for automake-1.13 wrt bug #467542 by axs
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key D628E536)
Diffstat (limited to 'app-admin/tripwire')
| -rw-r--r-- | app-admin/tripwire/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch | 12 | ||||
| -rw-r--r-- | app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild | 14 | ||||
| -rw-r--r-- | app-admin/tripwire/tripwire-2.4.2.2.ebuild | 14 |
4 files changed, 31 insertions, 15 deletions
diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog index 6e7dea0580fd..a714bdc9a967 100644 --- a/app-admin/tripwire/ChangeLog +++ b/app-admin/tripwire/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/tripwire # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.48 2013/04/25 19:40:49 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.49 2013/05/01 12:51:17 nimiux Exp $ + + 01 May 2013; Chema Alonso <nimiux@gentoo.org> tripwire-2.4.2.2.ebuild, + tripwire-2.4.2.2-r1.ebuild, +files/tripwire-2.4.2.2-fix-configure.patch: + Fix configure for automake-1.13 wrt bug #467542 by axs 25 Apr 2013; Chema Alonso <nimiux@gentoo.org> -tripwire-2.4.2.ebuild, -tripwire-2.4.2-r1.ebuild, -files/tripwire-2.4.2-version.patch: diff --git a/app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch b/app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch new file mode 100644 index 000000000000..b72aaef681af --- /dev/null +++ b/app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch @@ -0,0 +1,12 @@ +diff -Nur a/configure.in b/configure.in +--- a/configure.in 2011-11-21 17:06:56.000000000 +0100 ++++ b/configure.in 2013-05-01 13:48:30.599978971 +0200 +@@ -6,7 +6,7 @@ + AC_CONFIG_SRCDIR([src/tw/tw.cpp]) + AC_CANONICAL_TARGET([]) + AM_INIT_AUTOMAKE(tripwire, 2.4.2.2) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + dnl ################################# + dnl Cleanup Cruft Leftover From Patch diff --git a/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild b/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild index d3e466b6a821..aaad4acc1f02 100644 --- a/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild +++ b/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild,v 1.4 2012/08/15 14:12:16 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild,v 1.5 2013/05/01 12:51:17 nimiux Exp $ -EAPI=4 +EAPI=5 -inherit eutils flag-o-matic autotools +inherit autotools eutils flag-o-matic DESCRIPTION="Open Source File Integrity Checker and IDS" HOMEPAGE="http://www.tripwire.org/" @@ -27,6 +27,7 @@ RDEPEND="virtual/cron S="${WORKDIR}"/tripwire-"${PV}"-src src_prepare() { + epatch "${FILESDIR}"/"${P}"-fix-configure.patch epatch "${FILESDIR}"/"${P}"-buildnum.patch epatch "${FILESDIR}"/"${P}"-gcc-4.7.patch @@ -38,9 +39,8 @@ src_configure() { # see #32613, #45823, and others. # -taviso@gentoo.org strip-flags - append-flags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing - einfo "Done." - chmod +x configure + append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing + chmod +x configure || die econf $(use_enable ssl openssl) $(use_enable static) } diff --git a/app-admin/tripwire/tripwire-2.4.2.2.ebuild b/app-admin/tripwire/tripwire-2.4.2.2.ebuild index b6750c30006a..97101df07ee5 100644 --- a/app-admin/tripwire/tripwire-2.4.2.2.ebuild +++ b/app-admin/tripwire/tripwire-2.4.2.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2.ebuild,v 1.5 2012/05/18 09:02:43 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2.ebuild,v 1.6 2013/05/01 12:51:17 nimiux Exp $ -EAPI=4 +EAPI=5 -inherit eutils flag-o-matic autotools +inherit autotools eutils flag-o-matic DESCRIPTION="Open Source File Integrity Checker and IDS" HOMEPAGE="http://www.tripwire.org/" @@ -27,6 +27,7 @@ RDEPEND="virtual/cron S="${WORKDIR}"/tripwire-"${PV}"-src src_prepare() { + epatch "${FILESDIR}"/"${P}"-fix-configure.patch epatch "${FILESDIR}"/"${P}"-buildnum.patch eautoreconf @@ -37,9 +38,8 @@ src_configure() { # see #32613, #45823, and others. # -taviso@gentoo.org strip-flags - append-flags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing - einfo "Done." - chmod +x configure + append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing + chmod +x configure || die econf $(use_enable ssl openssl) $(use_enable static) } |