Bump to fix bug #495204. Thank to Gabriel Marcano

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF253DB15

4 files changed, 119 insertions, 16 deletions

diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index d2f0fd7c98c8..03dde216c95f 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/tripwire
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.56 2014/08/03 18:34:45 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.57 2015/02/13 17:55:18 nimiux Exp $
+
+*tripwire-2.4.2.2-r3 (13 Feb 2015)
+
+  13 Feb 2015; Chema Alonso <nimiux@gentoo.org> +tripwire-2.4.2.2-r3.ebuild,
+  +files/tripwire-2.4.2.2-exception-shadowing.patch:
+  Bump to fix bug #495204. Thank to Gabriel Marcano
 
   03 Aug 2014; Agostino Sarubbo <ago@gentoo.org> tripwire-2.4.2.2-r2.ebuild:
   Stable for ppc, wrt bug #509764
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 6d2dbb57df72..34d41a85df9c 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX tripwire 466 SHA256 222c078588d03394c4502a884d6049f210b25d7f826e9bb29a69d68a01b40eac SHA512 1df37364a84ab26ca0a3f2637e9f4938333c394979c2ccadb69401b7e6a93d03911ce737b25bb6e76c1963e4b7eaffd35b3551aa141b51bc9b3a8a00d9c828cf WHIRLPOOL afb61e9885b1c7d0214f03e35af6f02a5dca77a68f74441d6c84091ef7a7f9ee0d5a6b70e1a0ac2cf5f75f4739185ab3c2eaf7f47b2795f1c7a7bdaf347de36d
 AUX tripwire-2.4.2.2-buildnum.patch 230 SHA256 820535353f2b0b4003929b7db4478412a4552fb69d11c46260d6d373faa98d53 SHA512 2b88c9366d2e922f8c18d128d92c2c8cdab2f8b5871d1666e27afabd0c5fc58bc218d662d9c71b64f93ce3ef238eee0a3ffb7b9bba227f2914ba72e680dbb360 WHIRLPOOL a8c7a65771840975c1bdcbe5355ef1c0200850ce6cf5189d02f2bcf2500c3ba08b5283bf17766a878f972b2d0047a0d82b3a3fca2ae386eb1c4ea57bbfca39ff
+AUX tripwire-2.4.2.2-exception-shadowing.patch 536 SHA256 0bfe805f966ba71c360fedf679f566ebd52ac28a7ccd1df7d9d367786b189b4d SHA512 742899735dc3c3247dc83e47c70bf234c920510f657cd80072331128859cfdd943685eee343ca07a74440921c3a6ade26d7b7f8026786d44573fd3956be85f90 WHIRLPOOL 1fbd3f5c15deb99cf869fb28876036ddd1968db96a6bbeeca65a3e1bf7a7f4c853f67a7ea760af06e13ab69df1035e694f52733dcc85904bff862980f57cff5c
 AUX tripwire-2.4.2.2-fix-configure.patch 400 SHA256 424f2806f1dcdfdae945248127b9d699d59aed73c232a21abcde797e26337121 SHA512 d4e4964e6d61efe7181a71eef3447d1ce50cec9377c11bde52ce9a2926624e9a82821fc9426c9dbf5e6ccafb402b9494ec99a7172f75cfdf374a277b46f4a79b WHIRLPOOL 0eb027efa7029ba8dfd23afab852ee871411ad5a370e6257c2e2fbaa4192e21fff6691431e9f04d9560ccf9f8f00ed456bc74acbe017ed5244dfdbebf5de706a
 AUX tripwire-2.4.2.2-gcc-4.7.patch 790 SHA256 4d86f4db8361bec19cffef6986af68f61c4062e273ebd13f0f082bd513a2cacc SHA512 e05bbe96371e1c21a14ec72c6d2ced7a9f39da43cf8ac59c8ee6a8da58b86727d42e0311a8a924c39816cfdb8334f405543c77b423e7be47488e6a47a75c2ceb WHIRLPOOL 704099d31c20254da591dcca93591ddc262b6185a21c4945af6853cd510fb630c053379b123a713d6c550ab284f551c58553e1b1b846d34a5cde83c03dad8379
 AUX tripwire-twpol-GENERIC.patch 613 SHA256 714c235ed24704ae522e64b5aa1faf2a5bf861fd8562748c3c8d8165ac1ab080 SHA512 15551e6d9e0895e7a5c37d267e0de4b06ade55bba772ec18c4c7ebd19bc76ae6ae88d2ad62d8ab3f5dd4059c688d771253b285725159082844faee9ea4b1d53b WHIRLPOOL f7c9b019380231b26268b670ef58cc66a77367eb898ed0ca27d10820fd506db91afcefdc3d3957fc18d82bc7a458aa2226f0b90851d4015a318bfd3c62fe1a2c
@@ -14,23 +15,24 @@ DIST tripwire-2.4.2.2-src.tar.bz2 716616 SHA256 e09a7bdca9302e704cc62067399e0b58
 DIST twpol.txt.gz 7586 SHA256 22a815584d8586dc5fd737749ca53435088d5867355bb6b73ec152b2ef53b5fe SHA512 70fd91a5b32d0a8f8272a0462e6e2af9090f8917de2f2c4357cc71e175d49bba5a64e40ab94ba12986ddeec6132f7cb3a034fb665fa43b8377b548ba877e478e WHIRLPOOL de7ad93c1927c2cd4d7be35668bdfcce6055e8cfadf1e76425b8e62b7847c6c139aaff54b0c5b874d506cb0ef3a8c5e125adf7391bcc6b0aebd84ea9c93713ab
 EBUILD tripwire-2.4.2.2-r1.ebuild 2381 SHA256 79be65afd466c3a1577f865f1385c5545916623dc7d75c35dd3f2f50486fb3ee SHA512 35dff5bb072bd78968bddfa0eb5db8cdd39a46607ea1dbc194a87ef5019c22984a28bb8a7cfdf15c621acb0e2daf6f40498bb272a8da302543eaa87f5396b975 WHIRLPOOL 9b5831a688fc523ed53658abcdcc153d3f90e3255812d6a837169946485f78c1337ea6ce6776824e792b8280044070a2fd1b2050ccc773bc22ead4aa1d3eac99
 EBUILD tripwire-2.4.2.2-r2.ebuild 2550 SHA256 d84c6efe3e55210093ad5aebbfe357208c546e45c822a3211022f692e55b302c SHA512 7a9b818239915cdca1505f16fd2f9c53260cdd2abd17136f8aa5ebe15a5e566620d3dde78b8cc85aa756d73c9a92b4782da4ed317ed91061e93cdc6c25235181 WHIRLPOOL 0342012c3051650249ac6cab259a3e389c259eeead593ebd45af2f7800132afa886755ecf0291c44efa81d9194088064c4e0bedde84f50cd1f827048dc1cd63e
+EBUILD tripwire-2.4.2.2-r3.ebuild 2648 SHA256 413995ca891c1528b6ca539bef65015c84718bbad72344769574db6c4b0a7a8c SHA512 b6392fad2a85d473771bca9c617e5bd3afd2061aa8947696279193734480d7024713e854f0b4a3ef2cacbe6d2a6ba639eb494f80ad5777080ec55be2fb7d0c4f WHIRLPOOL b62b2e2c932b851fbcec335ed3b8b9073ab826da7b7cb3fc4e382faaf00b7322471a4b8e22e2015009fa1252c2a4085d493adb6ae2f9d2445b9bd16d31a68161
 EBUILD tripwire-2.4.2.2.ebuild 2335 SHA256 e6efe3768196fbdfb1493c57811bfa2cd5432cfd6b24ce18a040011711df5597 SHA512 92f3fa637d4d88b0f547b530fe8b5247667a0381031e1db003730bd38b33cb98ef3804dc13f2a99599e0ddb94ffb4a1e6a981d9bbf224b70a1198327b3294267 WHIRLPOOL 66e45daa633d302e05d75dee71dd00a9e78f32c1ade62fefd51a57768a7f90d8019b1670f5ea0a68185bf8f3dbad6ca1574b6f81c6724e4c6b292180cc453285
-MISC ChangeLog 9698 SHA256 0f69518011532d710e481cf710198933713bd2d11668f8c0911eff520ae4493a SHA512 717d26aa3d30b09acdede8e572ccffb3e19152f515066eb30fe28cc570142d1ab78f5d0caa2959ff2148edd5f04d483cb0cfe814081c2acf4f48e119293731f5 WHIRLPOOL 994745a89a0c3121c847f514de32b2ac7e45baf445a064d2f08180cc5559be59435efa4f1fcce4876e4219f31038ad2533ebb69382995e65108fea7992837ed2
+MISC ChangeLog 9920 SHA256 e7dade49aae558cc34fb7a815e304543feb3c260318409c7335dd970e78e951b SHA512 d61a1f8e1e15ee247ce1f816daeeb945c077e7fdc877381c23365ff8159d8bffce772cf93a70d4a214cdf92563737c3897982ff5c3a5f15780a09a24014b9e38 WHIRLPOOL 301b82c190b86b2a88700127ede6ab5dc52e6d75e68f2ff607f350210566c8d9accec37c61e495362472a40afd2eb0c2de174298d0a2de23f3a457b5cca7773e
 MISC metadata.xml 1455 SHA256 cb245edc5cb594145833a3da82079c1c0a0fb8d1f6da486e8bf2641418e0bff1 SHA512 ac151a11e43d598ba99f6482cb19c8dc7a9fdf2bc5b2ae39bb201960a30f3c240193a1db290dcfa996123acb5ba1fbc6b19ba8411e5b4cc355f25d72fa8a2bf1 WHIRLPOOL b50933172fa3c78add29b2732068c9e500810c5b4bff016b98394f6f67292ba0f1f8e731e3aac643d3f19c181279179894e7e53df59ed0b32b36d0d72e42d06e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT3oDHAAoJELp701BxlEWff9QQAK9jEAOhWQFOXfymsyZEBc5U
-MuWB1zW7E20ZpeNQa6Q6etIW5hsHTSTlUd5vHgYv4JJSMppmlVGFKz77igkpm1MD
-r+b+N+sVWxrIPOk/Uwqkp+BWt6HEtuMEI3SGdI1HTN5ZhWoMe1KYbYFaiqo6oZa5
-K8gvpI1lMHUQD8mlZQSVui/gyyewF7fBx2fQ2V4gDMvgnyI5NTGAx+tJCYk7PAUz
-BvgRMluUvgudZRVioUQu2E5er4NgTTFur/EHguZPASLRuqKlz6jHiJIK2ziBIyPq
-dv18qpJgNvvRXckAg/xUOKn4uL2oEFYO+yuwHW5mdYlPNECvwa7cB6Tu4gPpqsPJ
-HSAjB/Q2MHhnidXlIfjQonSQhYNDyfmug5YSQHBXRrpx9FFlr8Rk+9YBH5XEJDI0
-O1hiR0w2MLqtxfPLs+7jOToWuVYA/ZsDV5QyOU+K3cMHRTRPqIkIzqxEMqNv4/ew
-oCi03Alpb7MnKolv8ocwIPdg3DnIYv8msyaIdzqLflgJ5WDWklwV/QPnMsORrHx4
-YjP4/vQ3Uct8lTFnDSpBFGxKnozLn5gF+MyagsOyuMt9KbYo1vssuz5d1VokqQ0D
-VnZt4wXDZ9ua8a+HK8l+0I4qvNOOkL3cyboyD2n2qmT/AmrhWAPD3fDM06juTax2
-zpqWlr/HVR19pDDMFXHB
-=/dJs
+iQIcBAEBCAAGBQJU3jsYAAoJEH/rgyzyU9sVrjkP/Rdd6VXIRJgY3jAvP6Fu0x56
+oKfAvVPidYvinLkd62OC/k/c/F6/fWvyJ4R2ImmmcmRBbuRnjpHuQImq7nFkrRJL
+OLrbXxefpEUdDOyFECPu6BLSm0aUzfnn0uQM4ZZqT2fDlLm6bIEqEgReQ4SXbsd5
+yClhy5K3nY/RKVwLLzcIqHfLjmKHW8uWJ5EkuD2xRr08iRlSjnnPPI7jddf9u7P6
+knPrXi/T1nkfs8VIYwYO/F72Vij5pagMwHRa1CPlxZJkG90SviqS1n5p46jBeXka
+ePmNElxWTFY7hAQaIRdTmabUMYQlOxvJucvKbadFd7U+G+qzJ56yW4kPb0iA+0Q4
+I6jV1uGTKuwaOIyTSEidxHX2oQTQJ6JMIuZhXw6nB9ImbT2kTbTiDZ2UJsdIGUUX
+fJqbghfZ7TtSA+Q/51eMxmmpygRV1YaDLWiRsEmKcfIz8UKbZCgQLqkcQiAhDbrA
+siN4PA1wdf1inXe4CEkpoA0u5DK75RP+J7AqExH03AiswRgyFr21xfVU4qTB4+uN
+BmndmlroM4cA8QNpoUSeDk8fuUr/UXc16aSRlnMC4+r1UXfp/aXq0CZMKDS2dEXQ
+3d899Qh35Yp8iSorz8c2WapQw0MocnQ2sWQYFbrgUVuWQs/gXmWfAsdOnKQRRUcm
+s/I5OuoM1SWaheRSvUTL
+=nnvb
 -----END PGP SIGNATURE-----
diff --git a/app-admin/tripwire/files/tripwire-2.4.2.2-exception-shadowing.patch b/app-admin/tripwire/files/tripwire-2.4.2.2-exception-shadowing.patch
new file mode 100644
index 000000000000..1347590ef462
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-2.4.2.2-exception-shadowing.patch
@@ -0,0 +1,13 @@
+--- a/src/core/archive.cpp
++++ b/src/core/archive.cpp
+@@ -886,8 +886,8 @@ void cLockedTemporaryFileArchive::OpenReadWrite( const TCHAR* filename, uint32 o
+         catch( eFSServices& e)
+           {
+             TSTRING errStr = TSS_GetString( cCore, core::STR_BAD_TEMPDIRECTORY );
+-            eArchiveOpen e(strTempFile, errStr);
+-            throw e;
++            eArchiveOpen ex(strTempFile, errStr);
++            throw ex;
+           }
+       }
+     ///////////////////////////////////////////////////////////////////////////////
diff --git a/app-admin/tripwire/tripwire-2.4.2.2-r3.ebuild b/app-admin/tripwire/tripwire-2.4.2.2-r3.ebuild
new file mode 100644
index 000000000000..6041a46a1ec6
--- /dev/null
+++ b/app-admin/tripwire/tripwire-2.4.2.2-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 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-r3.ebuild,v 1.1 2015/02/13 17:55:18 nimiux Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Open Source File Integrity Checker and IDS"
+HOMEPAGE="http://www.tripwire.org/"
+SRC_URI="mirror://sourceforge/tripwire/tripwire-${PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="ssl static +tools"
+
+DEPEND="sys-devel/automake
+	sys-devel/autoconf
+	ssl? ( dev-libs/openssl )"
+RDEPEND="virtual/cron
+	virtual/mta
+	ssl? ( dev-libs/openssl )"
+PDEPEND="tools? ( app-admin/mktwpol )"
+
+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
+	epatch "${FILESDIR}"/"${PN}"-twpol-GENERIC.patch
+	epatch "${FILESDIR}"/"${P}"-exception-shadowing.patch
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# tripwire can be sensitive to compiler optimisation.
+	# see #32613, #45823, and others.
+	# 	-taviso@gentoo.org
+	strip-flags
+	append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
+	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
+
+	dodoc ChangeLog policy/policyguide.txt TRADEMARK \
+		"${FILESDIR}"/tripwire.txt
+
+	insinto /etc/tripwire
+	doins "${FILESDIR}"/twcfg.txt policy/twpol-GENERIC.txt
+
+	fperms 750 /etc/cron.daily/tripwire
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Tripwire needs to be configured before its first run. You can"
+		elog "do this by manually editing the twpol-GENERIC.txt file shipped with"
+		elog "the package to suit your needs. A quickstart guide is provided"
+		elog "in tripwire.txt file to help you with this."
+		elog "To configure tripwire automatically, you can use the twsetup.sh"
+		elog "script provided by the app-admin/mktwpol package. This package is"
+		elog "installed for you by the \"tools\" USE flag (which is enabled by"
+		elog "default."
+else
+		elog "Maintenance of tripwire policy files as packages are added"
+		elog "and deleted from your system can be automated by the mktwpol.sh"
+		elog "script provided by the app-admin/mktwpol package. This package"
+		elog "is installed for you if you append \"tools\" to your USE flags"
+	fi
+}