Version bump to 0.4.1 to fix CVE-2014-2567, wrt bug #505146

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x7194459F

3 files changed, 92 insertions, 15 deletions

diff --git a/mail-client/trojita/ChangeLog b/mail-client/trojita/ChangeLog
index 0065a01c5f9e..067001e95db4 100644
--- a/mail-client/trojita/ChangeLog
+++ b/mail-client/trojita/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/trojita
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.30 2014/03/06 12:13:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.31 2014/03/21 16:33:59 ago Exp $
+
+*trojita-0.4.1 (21 Mar 2014)
+
+  21 Mar 2014; Agostino Sarubbo <ago@gentoo.org> +trojita-0.4.1.ebuild:
+  Version bump to 0.4.1 to fix CVE-2014-2567, wrt bug #505146
 
 *trojita-0.4 (06 Mar 2014)
 
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 450fe437980d..33b52843c451 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST trojita-0.4.1.tar.bz2 1219460 SHA256 68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de SHA512 f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a WHIRLPOOL 47652af26fe24c6fb7fb0dbb1ef7c00710d087903787a847b59dc80d61dcd1725b5c7444aa77e36b357c3bbd6bc64f0566a995ac5b3c53842c3744b1a82127c0
 DIST trojita-0.4.tar.bz2 1220078 SHA256 742a72b5dbd43163e06fd54c936d642609629f96a4ed51563f18e56b07d760fd SHA512 fbf608b4ea93d7851caf768382afc12a7489d0bd395e76f1381f289762fcbe0f876e11ed7b9004e3537d72cdcc554585b879a436e9bb6f37ba23006dcefd3f90 WHIRLPOOL 16ec3f37056096dd63ea6ec78a3e036efdfb95b4e3756276a336d002774190caaafc17b076a268eab060c51be0d9e4f361bbb6a5821fb7b74b87ef02d04cb548
+EBUILD trojita-0.4.1.ebuild 1760 SHA256 c3e912e1c9bab8fff2c58fd26f453c2e1819e61208c4af21716d3894462468ec SHA512 fe6f44baf2ac49537f3de8ba9df34e4860457a7c71eed3b70b7f64e72d159150d8d54c4262356f61b0fc6f73dd798593df74fb96a63bdcfd8021fff749ef8afe WHIRLPOOL 161ad12f1f013ba9ee7f0edbf8778367a7eedc8c99a4480fed04c90ac72c2250b60623fcb2f3f4b53cd8dba2ac823fa1f79f1377608c2300435240f9bf0a8581
 EBUILD trojita-0.4.ebuild 1764 SHA256 98a7ef3bbb72ba2e79f87903df429846d5454f061a5c02a4a0a342f5ca5a0eef SHA512 55252734221c628d8a02184770fc7e2ec352d783a65275a6cff79eaa3e3c8c8acf3d399101ac6a58cfdc8983f8d5c75c50da3c1a8a0a20936bfd403f8a7c7b7a WHIRLPOOL 393a77745f813dda540130a0df68d4a9e81b84055958288a4d31095ff3f2786218c02e5cc1fc67720215c7b3e3849bb42d50f57c0ca0e7fc51ed53e02aac7250
 EBUILD trojita-9999.ebuild 1766 SHA256 f123b9bdbd48a333d7dbf125d4a63b39b7f9a22f2aa864bbe1a2f40b79a703ae SHA512 cb08d0d866c33940444127097441d2c1d8efb03f3fe3dac75b81ac6684e033cc492ff926ae356c7f27a1f9961d742feffb4c995f0625a19c7c77c6cf55b6493e WHIRLPOOL 704a3b6905fdba85c6934bf2ed05e252a3eab7415fb0d7536f41abf01021f0acb5727c0ddceaf188b9d77166b90de67de3df51951a6111091e1aa7bbbf407b3e
-MISC ChangeLog 5190 SHA256 97966ed895724c22ed2a6d0fb12104bf20c9d1fe7a1c4177847b4ad4cfbfca86 SHA512 e7524df50853a6b2e09819eccaa10af98078cbc852b0ed7d80f4ea11b48a4efa17dbd957bea70cf273e2b11a3beb8a64bffc07ae62eaef30fd617b410c7f768f WHIRLPOOL 58b6ba24941c05aa71243617345792b81256cc2efecd73ad0ac9321bee3e9ed7e70186039a3c8f115b0716ea4a9a0b06f0e3120e3f83f3a87dadaaa220761aa3
+MISC ChangeLog 5349 SHA256 87e46525113c4bb9ce90e99f2f4e90efeeebe2f8d09ebcf5de6c879e3339285c SHA512 4f1da659b0c8ed05776632921947d90c39c4305f9593559ed1378a2e9814384005eca68523720981883019a361cbb822d2c7482224815c395445f2e4496ad6cc WHIRLPOOL 94914d0c07b339757561394af370fe1446426c051fb5cbdd4496cadc3d2a018a6b85f2ecfc0ad5db3aea98b5246eddfac2893d3f04bbb065bdb7626b8be873e2
 MISC metadata.xml 257 SHA256 a2f4f0fc5d3c9a2d36dbeb6653969f3499f66b864f4c784b3a2922f8223be1b5 SHA512 dbdd0e936a704d17b913046c28b19217b33c667d0d201f06d63188d849f47b376458e9ee2063f6240f7b762e25647e52c0364c0cd56536d678eb5372be6cc7bf WHIRLPOOL 2130b81f77f6a1e4f5220aec8f70b9d82e304f7b3a4805649548408a66a0266fb1b7b1c7f851690d4dd3b5c0a8d91e4065f634df83976607863ba19e363d6b54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTGGZ0AAoJEOSiRoyO7jvo9ngQALKAj3DD3i92leCMCif4WizM
-BEUVmyCiARHHRAEOuQlK+T6AJZCk/S21gfqi4Md9639GqCNCUKbxPfKUcIanpzS4
-BpqegWqBUkXS+sJ9yPKuCs6rDABZuUcPou4CVLre9WVsOJFJgN99o0vlb065/LwZ
-sO3zYwjnlM2narMLLj51xn198fXx0dskTsVS8ZxosA3R5SYPEk1gAq7QgrvvIsiN
-pA0mY0ExAE+4srtjxzlVvPQVGottGrlLz1oaete/JfV7kfPXEGosCMRhJI3LFasE
-WlQZfQQy+eK1NxsJp8f547cS8o9yh8PbpN4cxq/UC3HiYnHuuzF4uwYQ9MhmL9M/
-UffBwG6SfqlpTGhWqKfgWUE3Oq8anBVOUnjAuiVYkokuVEz45Hry0HAamyPZS8sD
-9nskaftPoHKMyTxr+GwzFKw4469bkUWNrBv0jAhM8T46Y70IRu/xD4IRqIKX3qG9
-CKqK+19aw0uMmCyXFPehl8x4s0sGeyeF0ShKcMKbbU2XSajq/nc1x6qprc5aTuVF
-MHWshoBi2aYuN/zjs+ry1hmFzjnTXenCq0B18GpL+JpYkQwxFcAw9beeUfUqAILE
-Qy1weBN9afJwlR7WotQd+gXP4KdJvCETn6yFUjdmfTcjw/pndsCOJMIzHwRRZ0hC
-wdepved49aGsmtWn7Smv
-=hlJM
+iQIcBAEBCAAGBQJTLGn5AAoJELp701BxlEWffDAQAMgdQ3EBEovtEZFVvvynK1gA
+ZmyX0RjOnIIwWPhh/doch7Xbej6k5LMNTkWj5hc6UaP806g0ImoqkG1/S72J26t6
+tVIHgY109gGH8wIB++jf8nN7iSZ0LiilfchdHa27JZjylLU9YUoQgGPId/ZE3I+n
+RLfftnRXoJpJNXyT3wkJbV6P3yxLcGdNZZ7LkWLUBKXqnBUOSlwXCp4nUEQEXnlZ
+upW7PyEZk/jwYXGG7hQdgDCQWGlsH8Pe0CkMQ9jCIG2eCq0ANvNP5yqO7P2+hbvp
+lvbAhlYkCLGf7JRWACJFt42/5iFnajL65hw1TxqNMkBG7WG946+VmgiDLS+i2oWm
+X0tOt4MMO+IWOnXYVcQve+8JtlWxEjzhKVSYXvyDdpa0bGbm1nk/6EJkNFVX3Jgh
+ZBLf9f9U7UGDt6bildjZWFgztI5dAlmZowUWnzaXvf4KmVZ8CuXiIw4/4pqsufsM
+d0TFkXlZ45/51wHJmSZpOyvixgA5ndk9sN4eq0TfxE2HH9/AQxcrcJUj5rGpajzu
+giltXmfnnUdY1Yx8BNFegKSVR7KV+Y7FGeyC320hI2zkytAGG/1FejYCWbKa+Vdd
+bmJJ6lhdVfIwQt21FSJh8vBh+iIDBJxyXJKXMynozFEhLsDZ3A76KS3XU85lAz0o
+SogYF7STeHE9p7enPThG
+=bxTT
 -----END PGP SIGNATURE-----
diff --git a/mail-client/trojita/trojita-0.4.1.ebuild b/mail-client/trojita/trojita-0.4.1.ebuild
new file mode 100644
index 000000000000..796be9d59135
--- /dev/null
+++ b/mail-client/trojita/trojita-0.4.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-0.4.1.ebuild,v 1.1 2014/03/21 16:33:59 ago Exp $
+
+EAPI=5
+
+QT_REQUIRED="4.8.0"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+[[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
+
+inherit cmake-utils virtualx ${GIT_ECLASS}
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+if [[ ${PV} == "9999" ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+	MY_LANGS="bs cs da de el es et fr ga gl hu ia it lt mr nb nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="debug test +zlib"
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+done
+
+RDEPEND="
+	>=dev-qt/qtbearer-${QT_REQUIRED}:4
+	>=dev-qt/qtgui-${QT_REQUIRED}:4
+	>=dev-qt/qtsql-${QT_REQUIRED}:4[sqlite]
+	>=dev-qt/qtwebkit-${QT_REQUIRED}:4
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qttest-${QT_REQUIRED}:4 )
+	zlib? (
+		virtual/pkgconfig
+		sys-libs/zlib
+	)
+"
+
+DOCS="README LICENSE"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with test TESTS)
+		$(cmake-utils_use_with zlib ZLIB)
+	)
+	if [[ ${MY_LANGS} ]]; then
+		rm po/trojita_common_x-test.po
+		for x in po/*.po; do
+			mylang=${x#po/trojita_common_}
+			mylang=${mylang%.po}
+			use linguas_$mylang || rm $x
+		done
+	fi
+
+	# the build system is taking a look at `git describe ... --dirty` and
+	# gentoo's modifications to CMakeLists.txt break these
+	sed -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check"
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+}