Revbump to fix bug #320633

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 166 insertions, 1 deletions

diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index a175c3efc5e7..84150e179785 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/tripwire
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.33 2010/05/17 18:41:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.34 2010/09/02 00:24:24 xmw Exp $
+
+*tripwire-2.4.2-r1 (02 Sep 2010)
+
+  02 Sep 2010; Michael Weber <xmw@gentoo.org> +tripwire-2.4.2-r1.ebuild,
+  +files/tripwire-2.4.2-version.patch:
+  Revbump to fix bug #320633, thanks to Richard <richgentoo@pacbell.net> and
+  David Abbott <dabbott@gentoo.org>.
 
 *tripwire-2.4.2 (17 May 2010)
 
diff --git a/app-admin/tripwire/files/tripwire-2.4.2-version.patch b/app-admin/tripwire/files/tripwire-2.4.2-version.patch
new file mode 100644
index 000000000000..d3de447747c4
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-2.4.2-version.patch
@@ -0,0 +1,82 @@
+diff -urp tripwire-2.4.2-src.orig/configure tripwire-2.4.2-src/configure
+--- tripwire-2.4.2-src.orig/configure	2007-03-31 13:13:13.000000000 +0900
++++ tripwire-2.4.2-src/configure	2010-04-23 13:58:55.000000000 +0900
+@@ -1901,7 +1901,7 @@ test -n "$target_alias" &&
+   test "$program_prefix$program_suffix$program_transform_name" = \
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+-am__api_version="1.8"
++am__api_version="1.9"
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -2179,7 +2179,7 @@ fi
+ 
+ # Define the identity of the package.
+  PACKAGE=tripwire
+- VERSION=2.4.1
++ VERSION=2.4.2
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+diff -urp tripwire-2.4.2-src.orig/configure.in tripwire-2.4.2-src/configure.in
+--- tripwire-2.4.2-src.orig/configure.in	2007-03-31 13:03:27.000000000 +0900
++++ tripwire-2.4.2-src/configure.in	2010-04-23 13:59:14.000000000 +0900
+@@ -5,7 +5,7 @@ dnl
+ AC_INIT
+ AC_CONFIG_SRCDIR([src/tw/tw.cpp])
+ AC_CANONICAL_TARGET([])
+-AM_INIT_AUTOMAKE(tripwire, 2.4.1)
++AM_INIT_AUTOMAKE(tripwire, 2.4.2)
+ AM_CONFIG_HEADER(config.h)
+ 
+ dnl #################################
+diff -urp tripwire-2.4.2-src.orig/contrib/make-bin-dist tripwire-2.4.2-src/contrib/make-bin-dist
+--- tripwire-2.4.2-src.orig/contrib/make-bin-dist	2007-04-19 02:39:29.000000000 +0900
++++ tripwire-2.4.2-src/contrib/make-bin-dist	2010-04-23 13:59:36.000000000 +0900
+@@ -4,7 +4,7 @@
+ #
+ 
+ PRODUCT=tripwire
+-VERSION=2.4.1.2
++VERSION=2.4.2
+ ARCH=x86
+ TYPE=bin
+ ROOT_DIR=$PRODUCT-$VERSION-$ARCH-$TYPE
+diff -urp tripwire-2.4.2-src.orig/src/buildnum.h tripwire-2.4.2-src/src/buildnum.h
+--- tripwire-2.4.2-src.orig/src/buildnum.h	2007-03-31 13:39:36.000000000 +0900
++++ tripwire-2.4.2-src/src/buildnum.h	2010-04-24 07:13:25.000000000 +0900
+@@ -1,2 +1,2 @@
+-#define BUILD_NUM _T("2")
++#define BUILD_NUM _T("0")
+ 
+diff -urp tripwire-2.4.2-src.orig/src/tw/twstrings.cpp tripwire-2.4.2-src/src/tw/twstrings.cpp
+--- tripwire-2.4.2-src.orig/src/tw/twstrings.cpp	2007-03-31 14:19:59.000000000 +0900
++++ tripwire-2.4.2-src/src/tw/twstrings.cpp	2010-04-23 14:01:15.000000000 +0900
+@@ -56,7 +56,7 @@
+ #	define DEBUG_STR _T("")
+ #endif
+ 
+-#define TSS_PRODUCT_NAME _T("Open Soure Tripwire(R) 2.4.1.") 
++#define TSS_PRODUCT_NAME _T("Open Source Tripwire(R) 2.4.2.") 
+ 
+ #define TSS_COPYRIGHT_NOTICE \
+ _T("Open Source Tripwire 2.4 Portions copyright 2000 Tripwire, Inc. Tripwire is a registered\n\
+@@ -158,7 +158,7 @@ TSS_BeginStringtable( cTW )
+ 	TSS_StringEntry( tw::STR_WRITE_REPORT_FILE,		_T("Wrote report file: ") ),
+ 	TSS_StringEntry( tw::STR_WRITE_CONFIG_FILE,		_T("Wrote configuration file: ") ),
+ 
+-    TSS_StringEntry( tw::STR_REPORT_TITLE,            _T("Open Source Tripwire(R) 2.4.1 Integrity Check Report") ),    
++    TSS_StringEntry( tw::STR_REPORT_TITLE,            _T("Open Source Tripwire(R) 2.4.2 Integrity Check Report") ),    
+     TSS_StringEntry( tw::STR_R_GENERATED_BY,          _T("Report generated by: ") ),
+     TSS_StringEntry( tw::STR_R_CREATED_ON,            _T("Report created on: ") ),
+ 	TSS_StringEntry( tw::STR_DB_CREATED_ON,			  _T("Database generated on: ") ),
+@@ -219,7 +219,7 @@ TSS_BeginStringtable( cTW )
+     TSS_StringEntry( tw::STR_REMOVED_SHORT,           _T("R") ),
+     TSS_StringEntry( tw::STR_CHANGED_SHORT,           _T("C") ),
+         
+-	TSS_StringEntry( tw::STR_DBPRINT_TITLE,			  _T("Open Source Tripwire(R) 2.4.1 Database") ),
++	TSS_StringEntry( tw::STR_DBPRINT_TITLE,			  _T("Open Source Tripwire(R) 2.4.2 Database") ),
+ 	TSS_StringEntry( tw::STR_DB_GENERATED_BY,		  _T("Database generated by: ") ),
+     TSS_StringEntry( tw::STR_TOTAL_NUM_FILES,         _T("Total number of objects: ") ),
+     TSS_StringEntry( tw::STR_END_OF_DB,               _T("*** End of database ***") ),
diff --git a/app-admin/tripwire/tripwire-2.4.2-r1.ebuild b/app-admin/tripwire/tripwire-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..7ce8447f45e8
--- /dev/null
+++ b/app-admin/tripwire/tripwire-2.4.2-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/09/02 00:24:24 xmw Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic autotools
+
+TW_VER=${PV}
+DESCRIPTION="Open Source File Integrity Checker and IDS"
+HOMEPAGE="http://www.tripwire.org/"
+SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}-src.tar.bz2
+	mirror://gentoo/twpol.txt.gz
+	mirror://gentoo/tripwire.gif"
+
+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-${TW_VER}-src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-version.patch
+
+	eautoreconf || die "eautoreconf failed"
+}
+
+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 run \"/etc/tripwire/twinstall.sh\""
+	elog "to generate cryptographic keys, and \"tripwire --init\" to initialize the"
+	elog "database Tripwire uses."
+	elog
+	elog "A quickstart guide is included with the documentation."
+	elog
+}