Version bump, wrt bug #548184. Drop old vulnerable version, wrt bug #533654. Thanks to Jack Miller <jack AT codezen.org> for discovering this issue

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

6 files changed, 59 insertions, 45 deletions

diff --git a/net-news/canto-curses/ChangeLog b/net-news/canto-curses/ChangeLog
index 278b64868bf1..c194f87d0ac3 100644
--- a/net-news/canto-curses/ChangeLog
+++ b/net-news/canto-curses/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-news/canto-curses
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/canto-curses/ChangeLog,v 1.3 2015/04/08 18:17:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/canto-curses/ChangeLog,v 1.4 2015/05/01 06:52:27 pinkbyte Exp $
+
+*canto-curses-0.9.3 (01 May 2015)
+
+  01 May 2015; Sergey Popov <pinkbyte@gentoo.org> -canto-curses-0.8.4.ebuild,
+  +canto-curses-0.9.3.ebuild:
+  Version bump, wrt bug #548184. Drop old vulnerable version, wrt bug #533654.
+  Thanks to Jack Miller <jack AT codezen.org> for discovering this issue
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> canto-curses-0.8.4.ebuild:
   Drop old Python implementations
diff --git a/net-news/canto-curses/Manifest b/net-news/canto-curses/Manifest
index 8ae26c0724dc..f8d1253979e6 100644
--- a/net-news/canto-curses/Manifest
+++ b/net-news/canto-curses/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST canto-curses-0.8.4.tar.gz 55302 SHA256 61b6c432d0d51247d2a03958c96e0822432ac0cebdee275f7d6fde98cdb99760 SHA512 8d29b1e58ff94656e942f2c60511468b8f3b5fd72656ebf6262d5023f8fa805306ee5c62b3e453ec9d86810a0b1d6acd1f0df92bb57ab3f617988bb067130d31 WHIRLPOOL c3eafa62df5444d722ee9f8ab397ccd58c198cb08adeba5074b7573025f26f5ad4abf90ac2fa8e1caa450e0425914ca1baf12fdad376d4cb0d522dd1cbd3755f
-EBUILD canto-curses-0.8.4.ebuild 567 SHA256 dcb8557d63c63b1cee985e7c99e36be35c2bdf7daa12a7094637673c00299a0b SHA512 ee2dfa57657535a3997e36bc74813bafde0fccb94c45f89d56895dae28f05f3211a2a08f0c0b3c66b78ae1d314603a0da91e21e261e581f7647d1124d844eb92 WHIRLPOOL a60584904c4cdcffaf7191819959cf52f82a5589f71e6fe156293bacdcd6ab367d909e94649bd55821786c729841f45921fc6426b240cbf4be2401e07d3463a2
-MISC ChangeLog 586 SHA256 c20b749460341375c83f386d8b122e1737ffc4db2fce4b5b5d06889b52893ee4 SHA512 058dd89f347532262f9576fc5dff13a1863aeec117695426763306ba22f719978634778be6f712fe36e173918fc76eee5187bed1481be14582e0a165573e517b WHIRLPOOL 599ad479c98c8cf1317f9e589d544daba1209b0baef41c7d82ebdb73d085c5452183a50f56309a707d611752edb0b25d69c2ce582465ee4d31ff90c8993b26c8
+DIST canto-curses-0.9.3.tar.gz 77748 SHA256 942828e96608a8af58cb3002ac1d50edd60697d87c3da5ce815278b27ed7707d SHA512 547061439e5d5a7f2bcb1643cc597578161f3c3c284520326fe483f79a60650e9b8b1c7cf5a5e1f165f13510e7cab893b77968b5995c66b572c0bb605b6ebaaa WHIRLPOOL 0836ff8cdd687cbf1b751507e95a409d268449ef5963340d7016362abcb31dd541bfe35c55587afeb38df2cf5b137cd57b74ef8177b5f6d50bab8e9189caef74
+EBUILD canto-curses-0.9.3.ebuild 760 SHA256 f410fd43144bafc9b9e972a4c62f1369a0a2b79901cb31154e0736e324bdf095 SHA512 d1bbb3c0750e5b0a581d179653d8507eda3fcba98aa4e567a74c714db92d3b5c9762ce29741c0bb79aa16c64ad59226f49c0ccb3d26b6a2ac0a844bd4f7e9d75 WHIRLPOOL 6997701a9b270c327f4ed46279eb0413e79bf8e865b04b7a5acd22d62d79ed1987a05dc5c49a8ba060ada93aeb2109fb0dfb44a4143876179b070ccfe4f28e98
+MISC ChangeLog 884 SHA256 93c40289890121b004b390f4a3395c675d183054a9fc47bcda11807e955a5ade SHA512 fa0234072e55266dd2c1252d9a1af419ee8faa69ce2cdf009b55a14565018e2a6a1e8a1e3eabdc6bbaf50f9bbddf2e57934326e7de2c2d8016fe97a86d8c7b0a WHIRLPOOL a57cfdd80501be8b53df784e7eab1efd8bba2b8a56100ce093633977f86ada1de4a15de67f64a819afd6d2d1b1b76611e959182e2893b6d29a02563d0fc79441
 MISC metadata.xml 319 SHA256 0146dd83b27171d9e305c35cbf0ff721ee1c1731fafa43f2667d4ed7d91bed64 SHA512 6f7c4887de940f46da0f94e75bd0a7f36c775d5193bf6b1d59a549237224c6dca9e9a92cdcae9d83e29baa30bb72bf2d608d9e7caf3fd668296737910413684d WHIRLPOOL 0485502b6fcb979f9e0e1112fb24cf476abffff212c71c89cc2c5fdd04be1d1a09a1890ea22254c344e42f94475620d6bcaae63602b2e775c094806b45aeecf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJXCrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKnoP/36arEynp3fO5ouzAuBiIh5j
-rh4ZhZZkHYL1BP59/btCrMHaLzRBhq84lhOYPOE2rI25t9jjplLkoHetfhYE4ZLG
-Y7dMeyM9aGZqPtdT8aWrWhn8nxtWCd94+zOkpaSnZ070xcNms95KR8mbISPinfKW
-MdParFpFGe4uR9mk1X9ZHSEc4ceLoAUEqTRMn4rm4IuBZIDNlNwdiQqZ3obCcs1N
-1Pg+m7rqVf7USujADNmNjBPr0E7uXYoqpQZOHbDUDK+rT1iBcWRG1O/C4D31jx4n
-Msg4TBJgcwwmvXINvjUniuzxTcBe9Sm8oKgeeHMYEZTkXiZiNLq9fFUWQQTeOXR/
-1DOqldbeC1qBGz7myTGC7lh5WU+vzcx3ElHUmK8DBEmz8ntgrkzK1cAKtSK1YeNx
-jdjhVqtROG5w9/VlQhTK7LS02pQ19vJd9euLMrISCVtn+xrL8Y7+j6QMUMisZdXA
-Q7B+NKjIYAWYfAPdgBzDxDjXYdOQuxcE02kf04u3jEGvVqwOpjJkD1YcnZzXPYx+
-DxL6/F1uQf7RtoUAJNugm8Vq0YU5L2gDBlQ035QkISOIsmdPdp2zqaRpZbgYzw9Q
-aeUuh9t88Cjt8H9kvfSLlJE7bSMDf/bEWeTUwP9RA3KQTzWgsOwpejBqcyQeeqDv
-GAualVyIQk2n1ut0rQHr
-=V/04
+iQEcBAEBCAAGBQJVQyKsAAoJECo/aRed9267un0H/jOo3TnaW69XaSPPB6+FAKOd
+rHw3rb/mbH2s/85h6MVD45c1nBa7/ECz2DWuCDhN06AxWkYBOtF4pibPfwIh31f1
+KH5zgLxMgs88h/azejfeurxTgzedac1cSx7G0GhKZGE0qVmlCXAXBZvKdSDibAHp
+esUlHURJqd7BVzrQQIoyNRwojzjGvu6zv4aM1LBmDIH6Sg+1pa/+jo5Gf1sHJNin
+6CKaNhuhUmuBoPV5eGGW2ralDWL3s5BkSdQiWMv3GYp6F1R4mI+rcsestvKA56Z5
+ua9QsburkPtEEqq16ge7xHc/UhnR48p5AAAv1JqTdX8N6zSK0VWOiHnaTPbCTNg=
+=HlRu
 -----END PGP SIGNATURE-----
diff --git a/net-news/canto-curses/canto-curses-0.8.4.ebuild b/net-news/canto-curses/canto-curses-0.9.3.ebuild
index cd9803945749..8d49be4848d7 100644
--- a/net-news/canto-curses/canto-curses-0.8.4.ebuild
+++ b/net-news/canto-curses/canto-curses-0.9.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/canto-curses/canto-curses-0.8.4.ebuild,v 1.3 2015/04/08 18:17:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/canto-curses/canto-curses-0.9.3.ebuild,v 1.1 2015/05/01 06:52:27 pinkbyte Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python{3_3,3_4} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
+PYTHON_REQ_USE="ncurses(+),threads(+)"
+inherit distutils-r1 multilib
 
 DESCRIPTION="The ncurses client for canto-daemon"
 HOMEPAGE="http://codezen.org/canto-ng/"
@@ -16,4 +16,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=net-news/canto-daemon-0.8.2[${PYTHON_USEDEP}]"
+RDEPEND=">=net-news/canto-daemon-0.9.1[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Respect libdir during plugins installation
+	sed -i -e "s:lib/canto:$(get_libdir)/canto:" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/net-news/canto-daemon/ChangeLog b/net-news/canto-daemon/ChangeLog
index 0b91ce4bf7ed..7515dfdaf161 100644
--- a/net-news/canto-daemon/ChangeLog
+++ b/net-news/canto-daemon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-news/canto-daemon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/canto-daemon/ChangeLog,v 1.3 2015/04/08 18:17:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/canto-daemon/ChangeLog,v 1.4 2015/05/01 06:51:05 pinkbyte Exp $
+
+*canto-daemon-0.9.1 (01 May 2015)
+
+  01 May 2015; Sergey Popov <pinkbyte@gentoo.org> -canto-daemon-0.8.2.ebuild,
+  +canto-daemon-0.9.1.ebuild:
+  Version bump, wrt bug #548184. Drop old vulnerable version, wrt bug #533654.
+  Thanks to Jack Miller <jack AT codezen.org> for discovering this issue
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> canto-daemon-0.8.2.ebuild:
   Drop old Python implementations
diff --git a/net-news/canto-daemon/Manifest b/net-news/canto-daemon/Manifest
index 9ecc311c13af..71748617b180 100644
--- a/net-news/canto-daemon/Manifest
+++ b/net-news/canto-daemon/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST canto-daemon-0.8.2.tar.gz 39792 SHA256 e80da06acf574214fb239c7e50dbceb64fb52b689fc574a0c2b7be2dedd1fa19 SHA512 5f8772d06ff085437e37fbfbc09ede26dce9ed42947eca3033a54b349b49c482e5deeb6ed533c082e17dbd6c209248fe31121d54b8b01eb6edb921dda5776e35 WHIRLPOOL c5fd6b02027982aa4c81ba6b2f79b69c8d5cdd251fc7849bc8f0504e22b38d07c328691c944dd78f7dedfaf979f65445fe97d0207580d43201a705b80f04d97a
-EBUILD canto-daemon-0.8.2.ebuild 554 SHA256 c4cb44947f8ae783447bea2dd9ffdcd1794a071ca0fc80af64ea718d600d206f SHA512 447d290a2d4b3abb01518a11e3c5dc20aff6c195a05186aa2c1e55bb4f0cf38150b5b414fc1015c6a1b0d89ade6a4fe66558d12fe0c0bbffd63a99134e243206 WHIRLPOOL e7c0f61198d0fcb464f74c12c273338f8eb2997b302a7e9e567415f6ac610760c2aa7e49e3e54c8d3aaea98350ceb234d7356f08038f3063265f392bfbab77e6
-MISC ChangeLog 586 SHA256 34a411865e0a7fb0320a58db2407a16513293c580b69825aa480da0a33ebbf90 SHA512 36878d23e2ce9a0f66defab17a4db7a8cf370db422cd804edbadbd7d48afc283b22ca3459e2a55429e2ded56b33d61c1f3ed595cd4b628b4e4c4cfe429303291 WHIRLPOOL 63085aaf7e8fe2f186d45671ef0eef04296cb5e6c436f8d6b542e57e030ee9b4b943411c282f171fc42a9b9620cdd1413094a4a141ae3c6733ab1c4a12143247
+DIST canto-daemon-0.9.1.tar.gz 49316 SHA256 7eff52315a921d29944be4ba6fcadca1b4757ee940f567e44403e08029dbf333 SHA512 88e708c92813ddda44a8ea6a5d21722510822f22ebc0a4fb4165e6793ea50d89b139a51a4b1e06f811d7073c6b103590b52e4299c674f904e8b5aae7645484fd WHIRLPOOL 6646712a2e106c9a74cb37bde87653ad836cc075897a0f5707bcf2c78cbd348d5955527cc4bdff52813835ef69d5d4114ef334c8537ea477b7e0d8a4dfeb67b1
+EBUILD canto-daemon-0.9.1.ebuild 780 SHA256 aad360f413d941d0e19a04d30cf4f0b62f9ccb53cd1311d562a07cbb8d4104f4 SHA512 ed15c2b1cdb9afc947b519f1f9d61cf5c6156976ce6bd7d5c93a968c74c8e54010f8791f5ddb94013446fa867b75cc5defd4e4e9078e68ac74af2316d96f2c96 WHIRLPOOL b8378140da474c621cb76796a3c30f2a9a254198f53b393639ce27078920961bf49a0f238e6dd407c57487e67a4825206d44c4cbd27eda60a57362aea1623449
+MISC ChangeLog 884 SHA256 019d124935a74536e5b5984f6a3e879b68d03b315a639d5be0f6856e16d91699 SHA512 ba8bde5f7939868eae2ab16b1147c258c6e75050d5c457804fa1b53e87e28dad264b6080db7aad41d4468ae6c3b261f8bdb0dbeba83026d582417c2120888b31 WHIRLPOOL b9fe30776662656914d7ddbc0dc9ff9d75c7add134e2163c610fcd25d4580af847d51ac8f5d6e1c034c97f76087ed1a95f3470af35a2ea2906c99aa939ce9158
 MISC metadata.xml 317 SHA256 ff219abdf46ba187f95b29ff3aa0ef1e5e7f8c07ab68d03253f4deba61e66b3c SHA512 818f212b74dd9d134b3f950ad77a8a16a026f1b20a4538e7d850975841a4c23765262ab98ed28132c7360c4b8f22504db18fdbb9300af94b2c0d5c493aedd50d WHIRLPOOL 47b770a9bbb1f6e67d74e59653e3f3a60d54649a00c55e9ff45f03f62db11d33fc30144089b0e19fc6c8ce0da5ebb19ad900a92baf6371fe652612e7e90c5b89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJXCrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOG0cQANJUsMw0IRAbdBUjlbBkWzPp
-AJiSLLDTPalMKCvtnyS4tfMQ+npJ55Wa9dcqOx56rlOgmO6ZCpCJw1dTWZQf//nf
-ODiv2Pnp6pk0aZeG3GZenome4LoxLvS4fij9AtmSzILyFfJOWtjq1PE097ndlf7b
-l/kNT0EoIBUpVW97D8p/VcLsinSFQZswl1Oto5kPhIMWKUO2S+upM3hIAby4YaUK
-+WKAE/hhxXLMOtxXc21HM45/o4Pr1aLz9lkjgRxAyRJSeGAZtCt4jGDEmadR383/
-MEMYo/5zSKFlgzVH0r9v3raDhs9Q/kIxkwUlt9v9LMFBtnI2/qvt479+U3NIcsvf
-wpVzFVVMUnBlsboYN2RVSpteguSho6pG3Oiu+78ept4Lb2MvTRIhM5rxc6NGFg1Z
-0Sk3dGYSQeCi3/l/r/v+owWguET+79/CC2anXbSSOLDjWX+fF1fiaXilg0UsgwY2
-2RNgx+tyAmzOUwN1BtBQS5SQ0LwnEHHm6bUkfAP0EFtS6q6acRlA+JrtydOkxOfF
-sVLDd3fF3So7M1npWaHilFM+DHnkieBezHuD+gr1Q3zPbhhCOROyrlXiyydX3rwy
-sxNesgjjWgThLjwDvp8IweLhB4xqQO+cr2DohUt7S4LI6JjHXq+/aoFb6GPs8qlx
-EzzyB9i2oRuxXrD8oJLm
-=PpPz
+iQEcBAEBCAAGBQJVQyJiAAoJECo/aRed9267QWwIAJA4VEZW2LbWImphH4jbgGHs
+FScAcJRceGbdbaTIEwFKQH5yN3dIX860QndfyNYGGmoS0LzibSutPTDGn688qDI9
+psc2bqFEe9SNx2LXtCHmNz+P6j+Ii7nBM/ik3X2It99Opnwx/W9sKRxbJPmZ1ICF
+jG2PNWJJm6NYxYdzuq58U8ZzQWHpgsZhLq0Q0dgn5hcYf5qsB9yCAle9qX+nJ87G
+jQPeH3lhkB5zWarKxgxFwaMKmaTNboe3pTlRcM7tUCCfCSBzGCq+f56KPdzpqZuA
+wSsWEXAr+xM2vSru4tAQY4emSvjkFoWN5DnQ6ONRyZhuhN9UuyXBWyGkQnXeKqg=
+=ontm
 -----END PGP SIGNATURE-----
diff --git a/net-news/canto-daemon/canto-daemon-0.8.2.ebuild b/net-news/canto-daemon/canto-daemon-0.9.1.ebuild
index 9d1e8a0c7a93..f422df1e24e5 100644
--- a/net-news/canto-daemon/canto-daemon-0.8.2.ebuild
+++ b/net-news/canto-daemon/canto-daemon-0.9.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/canto-daemon/canto-daemon-0.8.2.ebuild,v 1.3 2015/04/08 18:17:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/canto-daemon/canto-daemon-0.9.1.ebuild,v 1.1 2015/05/01 06:51:05 pinkbyte Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python{3_3,3_4} )
-PYTHON_REQ_USE="xml"
-inherit distutils-r1
+PYTHON_REQ_USE="xml(+),threads(+)"
+inherit distutils-r1 multilib
 
 DESCRIPTION="Daemon part of Canto-NG RSS reader"
 HOMEPAGE="http://codezen.org/canto-ng/"
@@ -17,3 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/canto-next-${PV}"
+
+python_prepare_all() {
+	# Respect libdir during plugins installation
+	sed -i -e "s:lib/canto:$(get_libdir)/canto:" setup.py || die
+
+	distutils-r1_python_prepare_all
+}