diff options
author | Michael Weber <xmw@gentoo.org> | 2010-09-02 00:24:24 +0000 |
---|---|---|
committer | Michael Weber <xmw@gentoo.org> | 2010-09-02 00:24:24 +0000 |
commit | 4b85665a526ada013ecea8d04f3e78b50b1822af (patch) | |
tree | ac7a468ad4bde420a452517b060cc93f4276aab8 /app-admin | |
parent | Version bump for duplicate row handling. Remove old versions. (diff) | |
download | historical-4b85665a526ada013ecea8d04f3e78b50b1822af.tar.gz historical-4b85665a526ada013ecea8d04f3e78b50b1822af.tar.bz2 historical-4b85665a526ada013ecea8d04f3e78b50b1822af.zip |
Revbump to fix bug #320633
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/tripwire/ChangeLog | 9 | ||||
-rw-r--r-- | app-admin/tripwire/Manifest | 4 | ||||
-rw-r--r-- | app-admin/tripwire/files/tripwire-2.4.2-version.patch | 82 | ||||
-rw-r--r-- | app-admin/tripwire/tripwire-2.4.2-r1.ebuild | 76 |
4 files changed, 169 insertions, 2 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/Manifest b/app-admin/tripwire/Manifest index 0241e0e79960..49bdd58a735c 100644 --- a/app-admin/tripwire/Manifest +++ b/app-admin/tripwire/Manifest @@ -2,6 +2,7 @@ AUX tripwire-2.3.0-50-rfc822.patch 557 RMD160 923f7c71e9d04313a8d788a9ddce9b9060 AUX tripwire-2.3.1-2-fhs.patch 577 RMD160 60aa81a2e530ab4506326414cb3cf9acf1b3436a SHA1 79e293380954c33092b14880e0357fff17de8586 SHA256 19ab8e5d04ec81a62770d0e6aba725ba74356f9f10e5265706812b9811db8431 AUX tripwire-2.3.1-2-gcc-3.3.patch 227 RMD160 159a0ad6877ede8d4f87657e7909ef671062e20a SHA1 e061a9d54c6990c5c787d42364298f3c5c3af337 SHA256 888bf46f1b187a7f2067faad6013005cc48d7bb5e1365ec9b363542f683777ca AUX tripwire-2.3.1-gcc3.patch 10099 RMD160 97520328897ca6494878d22c4385620ab1872117 SHA1 b08083cc99618e2f2d5c7a60acf115e9a00fe01b SHA256 c9908821e8db4e4be0bae927b1d0a090e39a76c79d4542f617c98f9d9af65a40 +AUX tripwire-2.4.2-version.patch 3809 RMD160 2a493a7946ef53a073adffb4a2dd97f4f848beb3 SHA1 9527746b5ce2f9da3dd5362e4cc5d49f8f2002bd SHA256 0803b9432159f8197c4d5ac1bacd2e1e1ae0be79c68b3bca27203509652c8701 AUX tripwire-format-string-email-report.diff 472 RMD160 bb73ceec4e3c467691aced7a64f307c2a221dd89 SHA1 952e94b54ff411fa66ac3095d638566eb5f312bc SHA256 f1810f65bc0060539891ce46390c34ef276f68017b82f008b8b423f3f2e6a312 AUX tripwire-friend-classes.patch 1246 RMD160 cd3ab48294fa6ae6c00cb449813d793d908cb9cc SHA1 e79c627a5e165dd59722b2c5cf9eee7f36c06238 SHA256 5fbe5a2b9a477cfa5f7ccca0bb962c216f350f6c491644bcdf44891b684f4080 AUX tripwire-jbj.patch 2301 RMD160 27c2dcc48f7856e1716956e2b254cbebe768e157 SHA1 c0c9f04e980c6282acc335ccaf254e751bdb43c3 SHA256 bb688eb669f7d818853e0d225cf77b3cb915f03272b737861556c48d455c2afe @@ -18,6 +19,7 @@ DIST tripwire_2.3.1.2-6.1.diff.gz 608867 RMD160 dcc8bc8ed41022c31ca932c86a0998ff DIST twpol.txt.gz 7586 RMD160 16ef7751a45fe8dd4656e1834919a314ece64ba2 SHA1 ff65130adcf144b0b4777b78858ddf790504eede SHA256 22a815584d8586dc5fd737749ca53435088d5867355bb6b73ec152b2ef53b5fe EBUILD tripwire-2.3.1.2-r1.ebuild 2867 RMD160 2edd79bff9fbbe134ab591f61713b843fcd789e4 SHA1 14f75a1898ae09914d546cfd9c45783ce85eddf1 SHA256 f5a6dfbd9da5b06cec9f3e2c625a7b76ea444add02233b19f319d59523847292 EBUILD tripwire-2.3.1.2-r2.ebuild 2636 RMD160 61ccb145c7a255214f53bf81bcf4fbe314f23573 SHA1 a7b048c62f2acd0d72a0fabf70516d2374bd2dc7 SHA256 4fda3ab3ab15b3d21c77cedc941a015aaa0b60681c9d52c705bf876bd49fe4cc +EBUILD tripwire-2.4.2-r1.ebuild 2040 RMD160 4530092ea2a77cb92dca64cbdb59d5ffaceb52b1 SHA1 f23da666022a4e5b19ecfdff314b3362ce6d41b3 SHA256 d78ca15c4aa7d25566d3e4c73f29793f380587712a4ee13c44ca813e8ad27a94 EBUILD tripwire-2.4.2.ebuild 1999 RMD160 83edc60c1e4fb81dbb3f13cd8a39ee0eb2596870 SHA1 4a82942cbd52c6319c2dd9375160c5f58741ec23 SHA256 cd5090f27cdf0d6f604fcfc1a0aae9da4b0a1257c3051fb1f33221399c6705c5 -MISC ChangeLog 5508 RMD160 527f9299f00907183f18c028547e0512f8d5da29 SHA1 2f252dcda1f1c3edc3dbd424edf5735d85a1a13c SHA256 aeee35264afb3462d23e367871cf7a905d851b8de34fc13ec64bee322418043a +MISC ChangeLog 5765 RMD160 d34be6dfb87f5b68fbfd9dc3cceb5cbb1d57ee65 SHA1 fe556794f73abc602566b60129bcec96066d2996 SHA256 944791d2fb38f06823dc30570e1f30b1b31ff1b7edab993787f7f1d36d0c6cec MISC metadata.xml 604 RMD160 01d2deb554b218a28b5af398111c44aa932ac2ef SHA1 1e8a1147bbb96033bcf57db9007343c02dd73d07 SHA256 003e3a92b43f01e161bf9af4a28416a4285976c685c0fa41a4065efaa7c5d8b3 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 +} |