Bump revision wrt bug #421715.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 129 insertions, 1 deletions

diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index db0b275b58e3..fa2b48c8fc93 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/tripwire
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.42 2012/05/18 09:02:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.43 2012/06/20 08:29:19 nimiux Exp $
+
+*tripwire-2.4.2.2-r1 (20 Jun 2012)
+
+  20 Jun 2012; Chema Alonso <nimiux@gentoo.org> +tripwire-2.4.2.2-r1.ebuild,
+  +files/tripwire-2.4.2.2-gcc-4.7.patch, metadata.xml:
+  Bump revision to fix compilation with gcc-4.7 wrt bug #421715. Add
+  spanish longdescription and missing use flags to metadata
 
   18 May 2012; Jeff Horelick <jdhore@gentoo.org> tripwire-2.4.2.2.ebuild:
   marked x86 per bug 414487
diff --git a/app-admin/tripwire/files/tripwire-2.4.2.2-gcc-4.7.patch b/app-admin/tripwire/files/tripwire-2.4.2.2-gcc-4.7.patch
new file mode 100644
index 000000000000..e8d35fb2ae39
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-2.4.2.2-gcc-4.7.patch
@@ -0,0 +1,25 @@
+diff -Nur a/src/cryptlib/algebra.h b/src/cryptlib/algebra.h
+--- a/src/cryptlib/algebra.h	2011-11-21 16:06:56.000000000 +0000
++++ b/src/cryptlib/algebra.h	2012-06-19 14:13:13.930019454 +0000
+@@ -273,7 +273,7 @@
+ 	Element g[3]={b, a};
+ 	unsigned int i0=0, i1=1, i2=2;
+ 
+-	while (!Equal(g[i1], this->Zero()))
++	while (!this->Equal(g[i1], this->Zero()))
+ 	{
+ 		g[i2] = Mod(g[i0], g[i1]);
+ 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
+diff -Nur a/src/twadmin/twadmincl.cpp b/src/twadmin/twadmincl.cpp
+--- a/src/twadmin/twadmincl.cpp	2011-11-21 16:06:56.000000000 +0000
++++ b/src/twadmin/twadmincl.cpp	2012-06-19 14:13:40.270019532 +0000
+@@ -33,6 +33,9 @@
+ // twadmincl.cpp -- command line parsing for twadmin
+ //
+ 
++
++#include <unistd.h>
++
+ #include "stdtwadmin.h"
+ 
+ #include "twadmincl.h"
diff --git a/app-admin/tripwire/metadata.xml b/app-admin/tripwire/metadata.xml
index 418a042396bc..e67373d48d33 100644
--- a/app-admin/tripwire/metadata.xml
+++ b/app-admin/tripwire/metadata.xml
@@ -12,4 +12,17 @@
 		administrators of corrupted or tampered files, so damage control
 		measures can be taken in a timely manner.
 	</longdescription>
+	<longdescription lang="en">
+		Tripwire es una herramienta que ayuda a los administradores y
+		usuarios en la monitorización de los cambios en un conjunto de
+		ficheros. Se utiliza particularmente en los ficheros de sistema
+		de un modo regular (por ejemplo diariamente). Tripwire puede
+		notificar a los administradores de sistema sobre ficheros que
+		se han corrompido o han sido modificados maliciosamente, por lo
+		que se pueden adoptar medidas de control de forma periódica.
+	</longdescription>
+	<use>
+		<flag name="ssl">Adds support for Secure Socket Layer connections</flag>
+		<flag name="static">Builds the package statically</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild b/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild
new file mode 100644
index 000000000000..464d8ff6e0aa
--- /dev/null
+++ b/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 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.1 2012/06/20 08:29:19 nimiux Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Open Source File Integrity Checker and IDS"
+HOMEPAGE="http://www.tripwire.org/"
+SRC_URI="mirror://sourceforge/tripwire/tripwire-${PV}-src.tar.bz2
+	mirror://gentoo/twpol.txt.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="ssl static"
+
+DEPEND="sys-devel/automake
+	sys-devel/autoconf
+	dev-util/patchutils
+	ssl? ( dev-libs/openssl )"
+RDEPEND="virtual/cron
+	virtual/mta
+	ssl? ( dev-libs/openssl )"
+
+S="${WORKDIR}"/tripwire-"${PV}"-src
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${P}"-buildnum.patch
+	epatch "${FILESDIR}"/"${P}"-gcc-4.7.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# tripwire can be sensitive to compiler optimisation.
+	# see #32613, #45823, and others.
+	# 	-taviso@gentoo.org
+	strip-flags
+	append-flags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
+	einfo "Done."
+	chmod +x configure
+	econf $(use_enable ssl openssl) $(use_enable static)
+}
+
+src_install() {
+	dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
+	doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
+	dodir /etc/tripwire /var/lib/tripwire{,/report}
+	keepdir /var/lib/tripwire{,/report}
+
+	exeinto /etc/cron.daily
+	doexe "${FILESDIR}"/tripwire.cron
+
+	dodoc ChangeLog policy/policyguide.txt TRADEMARK \
+		"${FILESDIR}"/tripwire.txt
+
+	insinto /etc/tripwire
+	doins "${WORKDIR}"/twpol.txt "${FILESDIR}"/twcfg.txt
+
+	exeinto /etc/tripwire
+	doexe "${FILESDIR}"/twinstall.sh
+
+	fperms 755 /etc/tripwire/twinstall.sh /etc/cron.daily/tripwire.cron
+}
+
+pkg_postinst() {
+	elog "After installing this package, you should check the policy"
+	elog "file (twpol.txt) shipped with the package to see if it"
+	elog "suits your needs, and modify it accordingly."
+	elog
+	elog "Check bug #34662 to find a bash script which generates a"
+	elog "policy file from the Gentoo packages installed in your system."
+	elog
+	elog "Once the policy file is ready, you can run the"
+	elog "\"/etc/tripwire/twinstall.sh\" script to generate the "
+	elog "cryptographic keys, and \"tripwire --init\" to initialize"
+	elog "the Tripwire's database."
+	elog
+	elog "A quickstart guide is included with the documentation."
+	elog
+}